=================================================================== RCS file: /cvs/funnyos/arch/sam7s64/config.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- funnyos/arch/sam7s64/config.c 2007/11/24 15:13:33 1.10 +++ funnyos/arch/sam7s64/config.c 2007/11/24 17:10:07 1.11 @@ -1,5 +1,5 @@ /* - * $Id: config.c,v 1.10 2007/11/24 15:13:33 nbrk Exp $ + * $Id: config.c,v 1.11 2007/11/24 17:10:07 nbrk Exp $ */ #include #include @@ -71,6 +71,9 @@ /* set FLASH to high-speed */ *AT91C_MC_FMR = AT91C_MC_FWS_0FWS; + /* enable user RESET (magic button on board) */ + *AT91C_RSTC_RMR = AT91C_RSTC_URSTEN | AT91C_RSTC_KEY; + /* * Initialize oscillators. * Taken from Atmel's examples. @@ -119,7 +122,8 @@ ; /* enable clock to PIO and USART0 */ - *AT91C_PMC_PCER = AT91C_ID_PIOA | AT91C_ID_US0; + //*AT91C_PMC_PCER = AT91C_ID_PIOA | AT91C_ID_US0; + *AT91C_PMC_PCER = AT91C_ALL_INT; *AT91C_PIOA_PER = (1 << 17 | 1 << 18); *AT91C_PIOA_OER = (1 << 17 | 1 << 18); @@ -130,11 +134,6 @@ *AT91C_PIOA_PDR = AT91C_PA5_RXD0 | /* Enable RxD0 Pin */ AT91C_PA6_TXD0; /* Enalbe TxD0 Pin */ - *AT91C_US0_CR = AT91C_US_RSTRX | /* Reset Receiver */ - AT91C_US_RSTTX | /* Reset Transmitter */ - AT91C_US_RXDIS | /* Receiver Disable */ - AT91C_US_TXDIS; /* Transmitter Disable */ - *AT91C_US0_MR = AT91C_US_USMODE_NORMAL | /* Normal Mode */ AT91C_US_CLKS_CLOCK | /* Clock = MCK */ AT91C_US_CHRL_8_BITS | /* 8-bit Data */ @@ -151,9 +150,6 @@ /* redefine putchar */ putchar = sausart_early_putchar; -// putchar(0); -// putchar(0x46); -// putchar(0x46); }