summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-03-14 22:25:36 +0000
committerwdenk <wdenk>2004-03-14 22:25:36 +0000
commit42dfe7a1844cbad7114038aaf03828acb7a84414 (patch)
treed33893d34d2a97aa23257703733dbc9d86d48278 /drivers
parent855a496fe9ba431772f1ff1aef21a5c001288bb0 (diff)
downloadu-boot-imx-42dfe7a1844cbad7114038aaf03828acb7a84414.zip
u-boot-imx-42dfe7a1844cbad7114038aaf03828acb7a84414.tar.gz
u-boot-imx-42dfe7a1844cbad7114038aaf03828acb7a84414.tar.bz2
Code cleanup; make several boards compile & link.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cs8900.h2
-rw-r--r--drivers/pci.c2
-rw-r--r--drivers/serial_pl010.c189
-rw-r--r--drivers/serial_pl011.c174
-rw-r--r--drivers/serial_pl011.h20
-rw-r--r--drivers/smc91111.c74
-rw-r--r--drivers/usbtty.c2
7 files changed, 229 insertions, 234 deletions
diff --git a/drivers/cs8900.h b/drivers/cs8900.h
index d772cad..f886d10 100644
--- a/drivers/cs8900.h
+++ b/drivers/cs8900.h
@@ -47,7 +47,7 @@
#define CS8900_OFF 0x02
#define CS8900_BUS16_0 *(volatile u8 *)(CS8900_BASE+0x00)
#define CS8900_BUS16_1 *(volatile u8 *)(CS8900_BASE+0x01)
-#elif CS8900_BUS32
+#elif defined(CS8900_BUS32)
/* 32 bit aligned registers, 16 bit wide (we ignore upper 16 bits) */
#define CS8900_REG u32
#define CS8900_OFF 0x04
diff --git a/drivers/pci.c b/drivers/pci.c
index e014f91..5a9dae4 100644
--- a/drivers/pci.c
+++ b/drivers/pci.c
@@ -163,7 +163,7 @@ pci_dev_t pci_find_devices(struct pci_device_id *ids, int index)
for (hose = hose_head; hose; hose = hose->next)
{
-#if CFG_SCSI_SCAN_BUS_REVERSE
+#ifdef CFG_SCSI_SCAN_BUS_REVERSE
for (bus = hose->last_busno; bus >= hose->first_busno; bus--)
#else
for (bus = hose->first_busno; bus <= hose->last_busno; bus++)
diff --git a/drivers/serial_pl010.c b/drivers/serial_pl010.c
index 01b5f0a..7ff4b85 100644
--- a/drivers/serial_pl010.c
+++ b/drivers/serial_pl010.c
@@ -41,137 +41,134 @@
#define NUM_PORTS 2
#define CONSOLE_PORT CONFIG_CONS_INDEX
#define baudRate CONFIG_BAUDRATE
-static volatile unsigned char * const port[NUM_PORTS] = {(void*)(CFG_SERIAL0),
- (void*)(CFG_SERIAL1)};
+static volatile unsigned char *const port[NUM_PORTS] = {
+ (void *) (CFG_SERIAL0),
+ (void *) (CFG_SERIAL1)
+};
-static void pl010_putc(int portnum, char c);
-static int pl010_getc(int portnum);
-static int pl010_tstc(int portnum);
+static void pl010_putc (int portnum, char c);
+static int pl010_getc (int portnum);
+static int pl010_tstc (int portnum);
int serial_init (void)
{
- unsigned int temp;
- unsigned int divisor;
-
- /*
- ** First, disable everything.
- */
- IO_WRITE(port[CONSOLE_PORT] + UART_PL010_CR, 0x0);
-
- /*
- ** Set baud rate
- **
- */
- switch (baudRate) {
- case 9600:
- divisor = UART_PL010_BAUD_9600;
- break;
-
- case 19200:
- divisor = UART_PL010_BAUD_9600;
- break;
-
- case 38400:
- divisor = UART_PL010_BAUD_38400;
- break;
-
- case 57600:
- divisor = UART_PL010_BAUD_57600;
- break;
-
- case 115200:
- divisor = UART_PL010_BAUD_115200;
- break;
-
- default:
- divisor = UART_PL010_BAUD_38400;
- }
-
- IO_WRITE(port[CONSOLE_PORT] + UART_PL010_LCRM, ((divisor & 0xf00) >> 8));
- IO_WRITE(port[CONSOLE_PORT] + UART_PL010_LCRL, (divisor & 0xff));
-
- /*
- ** Set the UART to be 8 bits, 1 stop bit, no parity, fifo enabled.
- */
- IO_WRITE(port[CONSOLE_PORT] + UART_PL010_LCRH,
- (UART_PL010_LCRH_WLEN_8 | UART_PL010_LCRH_FEN));
-
- /*
- ** Finally, enable the UART
- */
- IO_WRITE(port[CONSOLE_PORT] + UART_PL010_CR, (UART_PL010_CR_UARTEN));
-
- return (0);
+ unsigned int divisor;
+
+ /*
+ ** First, disable everything.
+ */
+ IO_WRITE (port[CONSOLE_PORT] + UART_PL010_CR, 0x0);
+
+ /*
+ ** Set baud rate
+ **
+ */
+ switch (baudRate) {
+ case 9600:
+ divisor = UART_PL010_BAUD_9600;
+ break;
+
+ case 19200:
+ divisor = UART_PL010_BAUD_9600;
+ break;
+
+ case 38400:
+ divisor = UART_PL010_BAUD_38400;
+ break;
+
+ case 57600:
+ divisor = UART_PL010_BAUD_57600;
+ break;
+
+ case 115200:
+ divisor = UART_PL010_BAUD_115200;
+ break;
+
+ default:
+ divisor = UART_PL010_BAUD_38400;
+ }
+
+ IO_WRITE (port[CONSOLE_PORT] + UART_PL010_LCRM,
+ ((divisor & 0xf00) >> 8));
+ IO_WRITE (port[CONSOLE_PORT] + UART_PL010_LCRL, (divisor & 0xff));
+
+ /*
+ ** Set the UART to be 8 bits, 1 stop bit, no parity, fifo enabled.
+ */
+ IO_WRITE (port[CONSOLE_PORT] + UART_PL010_LCRH,
+ (UART_PL010_LCRH_WLEN_8 | UART_PL010_LCRH_FEN));
+
+ /*
+ ** Finally, enable the UART
+ */
+ IO_WRITE (port[CONSOLE_PORT] + UART_PL010_CR, (UART_PL010_CR_UARTEN));
+
+ return (0);
}
-void
-serial_putc(const char c)
+void serial_putc (const char c)
{
if (c == '\n')
- pl010_putc(CONSOLE_PORT, '\r');
+ pl010_putc (CONSOLE_PORT, '\r');
- pl010_putc(CONSOLE_PORT, c);
+ pl010_putc (CONSOLE_PORT, c);
}
-void
-serial_puts (const char *s)
+void serial_puts (const char *s)
{
while (*s) {
serial_putc (*s++);
}
}
-int
-serial_getc(void)
+int serial_getc (void)
{
- return pl010_getc(CONSOLE_PORT);
+ return pl010_getc (CONSOLE_PORT);
}
-int
-serial_tstc(void)
+int serial_tstc (void)
{
- return pl010_tstc(CONSOLE_PORT);
+ return pl010_tstc (CONSOLE_PORT);
}
-void
-serial_setbrg (void)
+void serial_setbrg (void)
{
}
-static void pl010_putc(int portnum, char c)
+static void pl010_putc (int portnum, char c)
{
- /* Wait until there is space in the FIFO */
- while (IO_READ(port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_TXFF);
-
- /* Send the character */
- IO_WRITE(port[portnum] + UART_PL01x_DR, c);
+ /* Wait until there is space in the FIFO */
+ while (IO_READ (port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_TXFF);
+
+ /* Send the character */
+ IO_WRITE (port[portnum] + UART_PL01x_DR, c);
}
-static int pl010_getc(int portnum)
+static int pl010_getc (int portnum)
{
- unsigned int data;
-
- /* Wait until there is data in the FIFO */
- while (IO_READ(port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_RXFE);
-
- data = IO_READ(port[portnum] + UART_PL01x_DR);
-
- /* Check for an error flag */
- if (data & 0xFFFFFF00)
- {
- /* Clear the error */
- IO_WRITE(port[portnum] + UART_PL01x_ECR, 0xFFFFFFFF);
- return -1;
- }
-
- return (int)data;
+ unsigned int data;
+
+ /* Wait until there is data in the FIFO */
+ while (IO_READ (port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_RXFE);
+
+ data = IO_READ (port[portnum] + UART_PL01x_DR);
+
+ /* Check for an error flag */
+ if (data & 0xFFFFFF00) {
+ /* Clear the error */
+ IO_WRITE (port[portnum] + UART_PL01x_ECR, 0xFFFFFFFF);
+ return -1;
+ }
+
+ return (int) data;
}
-static int pl010_tstc(int portnum)
+static int pl010_tstc (int portnum)
{
- return !(IO_READ(port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_RXFE);
+ return !(IO_READ (port[portnum] + UART_PL01x_FR) &
+ UART_PL01x_FR_RXFE);
}
#endif
diff --git a/drivers/serial_pl011.c b/drivers/serial_pl011.c
index 60fcc91..0e13226 100644
--- a/drivers/serial_pl011.c
+++ b/drivers/serial_pl011.c
@@ -38,138 +38,136 @@
#define IO_READ(addr) (*(volatile unsigned int *)(addr))
/*
- * IntegratorCP has two UARTs, use the first one, at 38400-8-N-1
+ * IntegratorCP has two UARTs, use the first one, at 38400-8-N-1
* Versatile PB has four UARTs.
*/
#define NUM_PORTS 2
#define CONSOLE_PORT CONFIG_CONS_INDEX
#define baudRate CONFIG_BAUDRATE
-static volatile unsigned char * const port[NUM_PORTS] = {(void*)(CFG_SERIAL0),
- (void*)(CFG_SERIAL1)};
+static volatile unsigned char *const port[NUM_PORTS] = {
+ (void *) (CFG_SERIAL0),
+ (void *) (CFG_SERIAL1)
+};
-static void pl011_putc(int portnum, char c);
-static int pl011_getc(int portnum);
-static int pl011_tstc(int portnum);
+static void pl011_putc (int portnum, char c);
+static int pl011_getc (int portnum);
+static int pl011_tstc (int portnum);
int serial_init (void)
{
- unsigned int temp;
- unsigned int divider;
- unsigned int remainder;
- unsigned int fraction;
-
- /*
- ** First, disable everything.
- */
- IO_WRITE(port[CONSOLE_PORT] + UART_PL011_CR, 0x0);
-
- /*
- ** Set baud rate
- **
- ** IBRD = UART_CLK / (16 * BAUD_RATE)
- ** FBRD = ROUND((64 * MOD(UART_CLK,(16 * BAUD_RATE))) / (16 * BAUD_RATE))
- */
+ unsigned int temp;
+ unsigned int divider;
+ unsigned int remainder;
+ unsigned int fraction;
+
+ /*
+ ** First, disable everything.
+ */
+ IO_WRITE (port[CONSOLE_PORT] + UART_PL011_CR, 0x0);
+
+ /*
+ ** Set baud rate
+ **
+ ** IBRD = UART_CLK / (16 * BAUD_RATE)
+ ** FBRD = ROUND((64 * MOD(UART_CLK,(16 * BAUD_RATE))) / (16 * BAUD_RATE))
+ */
#ifdef CONFIG_VERSATILE
- temp = 16 * baudRate;
- divider = 24000000 / temp;
- remainder = 24000000 % temp;
- temp = (8 * remainder) / baudRate;
- fraction = (temp >> 1) + (temp & 1);
+ temp = 16 * baudRate;
+ divider = 24000000 / temp;
+ remainder = 24000000 % temp;
+ temp = (8 * remainder) / baudRate;
+ fraction = (temp >> 1) + (temp & 1);
#endif
#ifdef CONFIG_INTEGRATOR
- temp = 16 * baudRate;
- divider = 14745600 / temp;
- remainder = 14745600 % temp;
- temp = (8 * remainder) / baudRate;
- fraction = (temp >> 1) + (temp & 1);
+ temp = 16 * baudRate;
+ divider = 14745600 / temp;
+ remainder = 14745600 % temp;
+ temp = (8 * remainder) / baudRate;
+ fraction = (temp >> 1) + (temp & 1);
#endif
-
- IO_WRITE(port[CONSOLE_PORT] + UART_PL011_IBRD, divider);
- IO_WRITE(port[CONSOLE_PORT] + UART_PL011_FBRD, fraction);
-
- /*
- ** Set the UART to be 8 bits, 1 stop bit, no parity, fifo enabled.
- */
- IO_WRITE(port[CONSOLE_PORT] + UART_PL011_LCRH,
- (UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN));
-
- /*
- ** Finally, enable the UART
- */
- IO_WRITE(port[CONSOLE_PORT] + UART_PL011_CR,
- (UART_PL011_CR_UARTEN | UART_PL011_CR_TXE | UART_PL011_CR_RXE));
-
- return (0);
+
+ IO_WRITE (port[CONSOLE_PORT] + UART_PL011_IBRD, divider);
+ IO_WRITE (port[CONSOLE_PORT] + UART_PL011_FBRD, fraction);
+
+ /*
+ ** Set the UART to be 8 bits, 1 stop bit, no parity, fifo enabled.
+ */
+ IO_WRITE (port[CONSOLE_PORT] + UART_PL011_LCRH,
+ (UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN));
+
+ /*
+ ** Finally, enable the UART
+ */
+ IO_WRITE (port[CONSOLE_PORT] + UART_PL011_CR,
+ (UART_PL011_CR_UARTEN | UART_PL011_CR_TXE |
+ UART_PL011_CR_RXE));
+
+ return (0);
}
-void
-serial_putc(const char c)
+void serial_putc (const char c)
{
if (c == '\n')
- pl011_putc(CONSOLE_PORT, '\r');
+ pl011_putc (CONSOLE_PORT, '\r');
- pl011_putc(CONSOLE_PORT, c);
+ pl011_putc (CONSOLE_PORT, c);
}
-void
-serial_puts (const char *s)
+void serial_puts (const char *s)
{
while (*s) {
serial_putc (*s++);
}
}
-int
-serial_getc(void)
+int serial_getc (void)
{
- return pl011_getc(CONSOLE_PORT);
+ return pl011_getc (CONSOLE_PORT);
}
-int
-serial_tstc(void)
+int serial_tstc (void)
{
- return pl011_tstc(CONSOLE_PORT);
+ return pl011_tstc (CONSOLE_PORT);
}
-void
-serial_setbrg (void)
+void serial_setbrg (void)
{
}
-static void pl011_putc(int portnum, char c)
+static void pl011_putc (int portnum, char c)
{
- /* Wait until there is space in the FIFO */
- while (IO_READ(port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_TXFF);
-
- /* Send the character */
- IO_WRITE(port[portnum] + UART_PL01x_DR, c);
+ /* Wait until there is space in the FIFO */
+ while (IO_READ (port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_TXFF);
+
+ /* Send the character */
+ IO_WRITE (port[portnum] + UART_PL01x_DR, c);
}
-static int pl011_getc(int portnum)
+static int pl011_getc (int portnum)
{
- unsigned int data;
-
- /* Wait until there is data in the FIFO */
- while (IO_READ(port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_RXFE);
-
- data = IO_READ(port[portnum] + UART_PL01x_DR);
-
- /* Check for an error flag */
- if (data & 0xFFFFFF00)
- {
- /* Clear the error */
- IO_WRITE(port[portnum] + UART_PL01x_ECR, 0xFFFFFFFF);
- return -1;
- }
-
- return (int)data;
+ unsigned int data;
+
+ /* Wait until there is data in the FIFO */
+ while (IO_READ (port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_RXFE);
+
+ data = IO_READ (port[portnum] + UART_PL01x_DR);
+
+ /* Check for an error flag */
+ if (data & 0xFFFFFF00) {
+ /* Clear the error */
+ IO_WRITE (port[portnum] + UART_PL01x_ECR, 0xFFFFFFFF);
+ return -1;
+ }
+
+ return (int) data;
}
-static int pl011_tstc(int portnum)
+static int pl011_tstc (int portnum)
{
- return !(IO_READ(port[portnum] + UART_PL01x_FR) & UART_PL01x_FR_RXFE);
+ return !(IO_READ (port[portnum] + UART_PL01x_FR) &
+ UART_PL01x_FR_RXFE);
}
#endif
diff --git a/drivers/serial_pl011.h b/drivers/serial_pl011.h
index 2117848..5f20fdd 100644
--- a/drivers/serial_pl011.h
+++ b/drivers/serial_pl011.h
@@ -23,11 +23,11 @@
*/
/*
- * ARM PrimeCell UART's (PL010 & PL011)
+ * ARM PrimeCell UART's (PL010 & PL011)
* ------------------------------------
- *
+ *
* Definitions common to both PL010 & PL011
- *
+ *
*/
#define UART_PL01x_DR 0x00 /* Data read or written from the interface. */
#define UART_PL01x_RSR 0x04 /* Receive status register (Read). */
@@ -46,9 +46,9 @@
#define UART_PL01x_FR_BUSY 0x08
#define UART_PL01x_FR_TMSK (UART_PL01x_FR_TXFF + UART_PL01x_FR_BUSY)
-/*
+/*
* PL010 definitions
- *
+ *
*/
#define UART_PL010_LCRH 0x08 /* Line control register, high byte. */
#define UART_PL010_LCRM 0x0C /* Line control register, middle byte. */
@@ -57,7 +57,7 @@
#define UART_PL010_IIR 0x1C /* Interrupt indentification register (Read). */
#define UART_PL010_ICR 0x1C /* Interrupt clear register (Write). */
#define UART_PL010_ILPR 0x20 /* IrDA low power counter register. */
-
+
#define UART_PL010_CR_LPE (1 << 7)
#define UART_PL010_CR_RTIE (1 << 6)
#define UART_PL010_CR_TIE (1 << 5)
@@ -66,7 +66,7 @@
#define UART_PL010_CR_IIRLP (1 << 2)
#define UART_PL010_CR_SIREN (1 << 1)
#define UART_PL010_CR_UARTEN (1 << 0)
-
+
#define UART_PL010_LCRH_WLEN_8 (3 << 5)
#define UART_PL010_LCRH_WLEN_7 (2 << 5)
#define UART_PL010_LCRH_WLEN_6 (1 << 5)
@@ -89,9 +89,9 @@
#define UART_PL010_BAUD_4800 191
#define UART_PL010_BAUD_2400 383
#define UART_PL010_BAUD_1200 767
-/*
+/*
* PL011 definitions
- *
+ *
*/
#define UART_PL011_IBRD 0x24
#define UART_PL011_FBRD 0x28
@@ -99,7 +99,7 @@
#define UART_PL011_CR 0x30
#define UART_PL011_IMSC 0x38
#define UART_PL011_PERIPH_ID0 0xFE0
-
+
#define UART_PL011_LCRH_SPS (1 << 7)
#define UART_PL011_LCRH_WLEN_8 (3 << 5)
#define UART_PL011_LCRH_WLEN_7 (2 << 5)
diff --git a/drivers/smc91111.c b/drivers/smc91111.c
index 486c11c..45bc248 100644
--- a/drivers/smc91111.c
+++ b/drivers/smc91111.c
@@ -7,7 +7,7 @@
. Rolf Offermanns <rof@sysgo.de>
.
. Copyright (C) 2001 Standard Microsystems Corporation (SMSC)
- . Developed by Simple Network Magic Corporation (SNMC)
+ . Developed by Simple Network Magic Corporation (SNMC)
. Copyright (C) 1996 by Erik Stahlman (ES)
.
. This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,12 @@
.
. This program is distributed in the hope that it will be useful,
. but WITHOUT ANY WARRANTY; without even the implied warranty of
- . MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ . MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
. GNU General Public License for more details.
.
. You should have received a copy of the GNU General Public License
. along with this program; if not, write to the Free Software
- . Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ . Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
.
. Information contained in this file was obtained from the LAN91C111
. manual from SMC. To get a copy, if you really want one, you can find
@@ -36,27 +36,27 @@
. EEPROM interface for configuration
.
. Arguments:
- . io = for the base address
+ . io = for the base address
. irq = for the IRQ
.
. author:
- . Erik Stahlman ( erik@vt.edu )
- . Daris A Nevil ( dnevil@snmc.com )
+ . Erik Stahlman ( erik@vt.edu )
+ . Daris A Nevil ( dnevil@snmc.com )
.
.
. Hardware multicast code from Peter Cammaert ( pc@denkart.be )
.
. Sources:
- . o SMSC LAN91C111 databook (www.smsc.com)
- . o smc9194.c by Erik Stahlman
- . o skeleton.c by Donald Becker ( becker@cesdis.gsfc.nasa.gov )
+ . o SMSC LAN91C111 databook (www.smsc.com)
+ . o smc9194.c by Erik Stahlman
+ . o skeleton.c by Donald Becker ( becker@cesdis.gsfc.nasa.gov )
.
. History:
- . 06/19/03 Richard Woodruff Made u-boot environment aware and added mac addr checks.
+ . 06/19/03 Richard Woodruff Made u-boot environment aware and added mac addr checks.
. 10/17/01 Marco Hasewinkel Modify for DNP/1110
- . 07/25/01 Woojung Huh Modify for ADS Bitsy
- . 04/25/01 Daris A Nevil Initial public release through SMSC
- . 03/16/01 Daris A Nevil Modified smc9194.c for use with LAN91C111
+ . 07/25/01 Woojung Huh Modify for ADS Bitsy
+ . 04/25/01 Daris A Nevil Initial public release through SMSC
+ . 03/16/01 Daris A Nevil Modified smc9194.c for use with LAN91C111
----------------------------------------------------------------------------*/
#include <common.h>
@@ -113,7 +113,7 @@ static const char version[] =
/*------------------------------------------------------------------------
.
- . The internal workings of the driver. If you are changing anything
+ . The internal workings of the driver. If you are changing anything
. here with the SMC stuff, you should have the datasheet and know
. what you are doing.
.
@@ -138,7 +138,7 @@ static const char version[] =
#define ETH_ZLEN 60
-#ifdef CONFIG_SMC_USE_32_BIT
+#ifdef CONFIG_SMC_USE_32_BIT
#define USE_32_BIT 1
#else
#undef USE_32_BIT
@@ -253,7 +253,7 @@ void smc_get_macaddr( byte *addr ) {
#endif /* 0 */
/***********************************************
- * Show available memory *
+ * Show available memory *
***********************************************/
void dump_memory_info(void)
{
@@ -337,8 +337,8 @@ static inline void smc_wait_mmu_release_complete (void)
/*
. Function: smc_reset( void )
. Purpose:
- . This sets the SMC91111 chip to its normal state, hopefully from whatever
- . mess that any other DOS driver has put it in.
+ . This sets the SMC91111 chip to its normal state, hopefully from whatever
+ . mess that any other DOS driver has put it in.
.
. Maybe I should reset more registers to defaults in here? SOFTRST should
. do that for me.
@@ -436,7 +436,7 @@ static void smc_enable()
. (1) maybe utilize power down mode.
. Why not yet? Because while the chip will go into power down mode,
. the manual says that it will wake up in response to any I/O requests
- . in the register space. Empirical results do not show this working.
+ . in the register space. Empirical results do not show this working.
*/
static void smc_shutdown()
{
@@ -459,7 +459,7 @@ static void smc_shutdown()
. This sends the actual packet to the SMC9xxx chip.
.
. Algorithm:
- . First, see if a saved_skb is available.
+ . First, see if a saved_skb is available.
. ( this should NOT be called if there is no 'saved_skb'
. Now, find the packet number that the chip allocated
. Point the data pointers at it in memory
@@ -467,9 +467,9 @@ static void smc_shutdown()
. Dump the packet to chip memory
. Check if a last byte is needed ( odd length packet )
. if so, set the control flag right
- . Tell the card to send it
+ . Tell the card to send it
. Enable the transmit interrupt, so I know if it failed
- . Free the kernel data if I actually sent it.
+ . Free the kernel data if I actually sent it.
*/
static int smc_send_packet (volatile void *packet, int packet_length)
{
@@ -512,9 +512,9 @@ static int smc_send_packet (volatile void *packet, int packet_length)
SMC_outw (MC_ALLOC | numPages, MMU_CMD_REG);
/* FIXME: the ALLOC_INT bit never gets set *
- * so the following will always give a *
- * memory allocation error. *
- * same code works in armboot though *
+ * so the following will always give a *
+ * memory allocation error. *
+ * same code works in armboot though *
* -ro
*/
@@ -583,7 +583,7 @@ again:
/* send the actual data
. I _think_ it's faster to send the longs first, and then
. mop up by sending the last word. It depends heavily
- . on alignment, at least on the 486. Maybe it would be
+ . on alignment, at least on the 486. Maybe it would be
. a good idea to check which is optimal? But that could take
. almost as much time as is saved?
*/
@@ -596,7 +596,7 @@ again:
SMC_outsw (SMC91111_DATA_REG, buf, (length) >> 1);
#endif /* USE_32_BIT */
- /* Send the last byte, if there is one. */
+ /* Send the last byte, if there is one. */
if ((length & 1) == 0) {
SMC_outw (0, SMC91111_DATA_REG);
} else {
@@ -690,7 +690,7 @@ static int smc_open (bd_t * bd)
err = smc_get_ethaddr (bd); /* set smc_mac_addr, and sync it with u-boot globals */
if (err < 0) {
- memset (bd->bi_enetaddr, 0, 6); /* hack to make error stick! upper code will abort if not set */
+ memset (bd->bi_enetaddr, 0, 6); /* hack to make error stick! upper code will abort if not set */
return (-1); /* upper code ignores this, but NOT bi_enetaddr */
}
#ifdef USE_32_BIT
@@ -723,10 +723,10 @@ static int smc_open (bd_t * bd)
*/
static int smc_rcv()
{
- int packet_number;
+ int packet_number;
word status;
word packet_length;
- int is_error = 0;
+ int is_error = 0;
#ifdef USE_32_BIT
dword stat_len;
#endif
@@ -749,8 +749,8 @@ static int smc_rcv()
status = stat_len & 0xffff;
packet_length = stat_len >> 16;
#else
- status = SMC_inw( SMC91111_DATA_REG );
- packet_length = SMC_inw( SMC91111_DATA_REG );
+ status = SMC_inw( SMC91111_DATA_REG );
+ packet_length = SMC_inw( SMC91111_DATA_REG );
#endif
packet_length &= 0x07ff; /* mask off top bits */
@@ -773,7 +773,7 @@ static int smc_rcv()
/* QUESTION: Like in the TX routine, do I want
to send the DWORDs or the bytes first, or some
mixture. A mixture might improve already slow PIO
- performance */
+ performance */
SMC_insl( SMC91111_DATA_REG , NetRxPackets[0], packet_length >> 2 );
/* read the left over bytes */
if (packet_length & 3) {
@@ -825,7 +825,7 @@ static int smc_rcv()
. smc_close
.
. this makes the board clean up everything that it can
- . and not talk to the outside world. Caused by
+ . and not talk to the outside world. Caused by
. an 'ifconfig ethX down'
.
-----------------------------------------------------*/
@@ -1380,7 +1380,7 @@ int smc_get_ethaddr (bd_t * bd)
s = s_env_mac;
}
- for (reg = 0; reg < 6; ++reg) { /* turn string into mac value */
+ for (reg = 0; reg < 6; ++reg) { /* turn string into mac value */
v_env_mac[reg] = s ? simple_strtoul (s, &e, 16) : 0;
if (s)
s = (*e) ? e + 1 : e;
@@ -1403,7 +1403,7 @@ int smc_get_ethaddr (bd_t * bd)
v_mac = v_env_mac; /* always use a good env over a ROM */
}
- if (env_present && rom_valid) { /* if both env and ROM are good */
+ if (env_present && rom_valid) { /* if both env and ROM are good */
if (memcmp (v_env_mac, v_rom_mac, 6) != 0) {
printf ("\nWarning: MAC addresses don't match:\n");
printf ("\tHW MAC address: "
@@ -1422,7 +1422,7 @@ int smc_get_ethaddr (bd_t * bd)
memcpy (bd->bi_enetaddr, v_mac, 6); /* update global address to match env (allows env changing) */
smc_set_mac_addr (v_mac); /* use old function to update smc default */
PRINTK("Using MAC Address %02X:%02X:%02X:%02X:%02X:%02X\n", v_mac[0], v_mac[1],
- v_mac[2], v_mac[3], v_mac[4], v_mac[5]);
+ v_mac[2], v_mac[3], v_mac[4], v_mac[5]);
return (0);
}
diff --git a/drivers/usbtty.c b/drivers/usbtty.c
index 7e553b3..ce4a12e 100644
--- a/drivers/usbtty.c
+++ b/drivers/usbtty.c
@@ -314,7 +314,7 @@ int drv_usbtty_init (void)
int rc;
char * sn;
int snlen;
-
+
if (!(sn = getenv("serial#"))) {
sn = "000000000000";
}