diff options
| author | Hamish Guthrie <hcg@openwrt.org> | 2007-06-11 14:54:14 +0000 |
|---|---|---|
| committer | Hamish Guthrie <hcg@openwrt.org> | 2007-06-11 14:54:14 +0000 |
| commit | bcf211ceaf32505e50bc81afdbaac59394fadb4a (patch) | |
| tree | 4ca397d44d41d3137bfbae14e8534a5ba916fe9c /target/linux/at91-2.6/image/dfboot/src | |
| parent | f78de295005ef1ea4ba3229802e30cc7d8c16b7b (diff) | |
| download | upstream-bcf211ceaf32505e50bc81afdbaac59394fadb4a.tar.gz upstream-bcf211ceaf32505e50bc81afdbaac59394fadb4a.tar.bz2 upstream-bcf211ceaf32505e50bc81afdbaac59394fadb4a.zip | |
Corrected dfboot issue with ttyS2 and ttyS3
SVN-Revision: 7566
Diffstat (limited to 'target/linux/at91-2.6/image/dfboot/src')
| -rw-r--r-- | target/linux/at91-2.6/image/dfboot/src/com.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/target/linux/at91-2.6/image/dfboot/src/com.c b/target/linux/at91-2.6/image/dfboot/src/com.c index 38a2898f7e..aacfb55558 100644 --- a/target/linux/at91-2.6/image/dfboot/src/com.c +++ b/target/linux/at91-2.6/image/dfboot/src/com.c @@ -21,7 +21,10 @@ static char erase_seq[] = "\b \b"; /* erase sequence */ -unsigned int usa[2] = {(unsigned int)AT91C_BASE_DBGU, (unsigned int)AT91C_ALTERNATE_USART}; +#define MAX_UARTS 1 + +//unsigned int usa[2] = {(unsigned int)AT91C_BASE_DBGU, (unsigned int)AT91C_ALTERNATE_USART}; +unsigned int usa[1] = {(unsigned int)AT91C_BASE_DBGU}; unsigned int us; int port_detected; @@ -34,7 +37,7 @@ void at91_init_uarts(void) AT91F_US0_CfgPIO(); AT91F_US0_CfgPMC(); - for(i=0; i<2; i++) { + for(i=0; i<MAX_UARTS; i++) { us = usa[i]; AT91F_US_ResetRx((AT91PS_USART)us); AT91F_US_ResetTx((AT91PS_USART)us); @@ -74,6 +77,7 @@ int at91_serial_putc(int ch) int at91_serial_getc() { while(1) { +#if 0 if (!port_detected) { if (us == usa[0]) { us = usa[1]; @@ -82,8 +86,11 @@ int at91_serial_getc() us = usa[0]; } } +#endif if(AT91F_US_RxReady((AT91PS_USART)us)) { +#if 0 port_detected = 1; +#endif return((int)AT91F_US_GetChar((AT91PS_USART)us)); } } |