=================================================================== RCS file: /cvs/funnyos/arch/sam7s64/config.c,v retrieving revision 1.12 retrieving revision 1.18 diff -u -r1.12 -r1.18 --- funnyos/arch/sam7s64/config.c 2007/11/24 17:45:19 1.12 +++ funnyos/arch/sam7s64/config.c 2008/01/02 02:32:27 1.18 @@ -1,5 +1,5 @@ /* - * $Id: config.c,v 1.12 2007/11/24 17:45:19 nbrk Exp $ + * $Id: config.c,v 1.18 2008/01/02 02:32:27 nbrk Exp $ */ #include #include @@ -17,8 +17,14 @@ extern struct driver saapbus_dr; extern struct driver sapio_dr; extern struct driver gpioled_dr; +extern struct driver saaic_dr; +extern struct driver sartt_dr; +extern struct driver gpiobtn_dr; +extern struct driver saspi_dr; +extern struct driver spisdmmc_dr; +extern struct driver sdmmc_dr; +extern struct driver gpio7seg_dr; - extern void (*putchar)(char); extern void sausart_early_putchar(char ch); @@ -30,12 +36,20 @@ */ struct attachinfo config_attachinfo[] = { /* child, parent, pminor, loc, intrno, flags */ - { "cpu" , "root", 0, 0, 0, 0 }, - { "saapbus","root", 0, 0, 0, 0 }, - { "sapio", "saapbus", 0, 0, 0, 0 }, - { "gpioled","sapio", 0, 17, 0, 0 }, - { "gpioled","sapio", 0, 18, 0, 0 }, - { NULL, NULL, 0, 0, 0, 0 } + { "cpu" , "root", 0, 0, -1, 0 }, + { "saapbus","root", 0, 0, -1, 0 }, + { "sapio", "saapbus", 0, 0, -1, 0 }, + { "gpioled","sapio", 0, 17, -1, 0 }, + { "gpioled","sapio", 0, 18, -1, 0 }, + { "gpiobtn","sapio", 0, 19, 0, 0 /*controls gpioled/0*/}, + { "gpiobtn","sapio", 0, 20, 30, 0 /*controls gpioled/1*/}, + { "gpio7seg","sapio", 0, 0, -1, 0 }, +// { "sartt", "saapbus", 0, 0, 1, 0 }, + { "saspi", "saapbus", 0, 0, 0, 0 }, +// { "spisdmmc","saspi", 0, 0, 0, 0 }, +// { "sdmmc", "spisdmmc", 0, 0, 0, 0 }, +// { "saaic", "saapbus", 0, 0, -1, 0 }, + { NULL, NULL, 0, 0, -1, 0 } }; @@ -49,6 +63,13 @@ { "saapbus" , &saapbus_dr, -1 }, { "sapio", &sapio_dr, -1 }, { "gpioled", &gpioled_dr, -1 }, + { "saaic", &saaic_dr, -1 }, + { "sartt", &sartt_dr, -1 }, + { "gpiobtn", &gpiobtn_dr, -1 }, + { "saspi", &saspi_dr, -1 }, + { "spisdmmc", &spisdmmc_dr, -1 }, + { "sdmmc", &sdmmc_dr, -1 }, + { "gpio7seg", &gpio7seg_dr, -1 }, { NULL, NULL, 0 } };