From 6128a4aa5e791ed4e0a655bfd346a52d92da7883 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Apr 2004 10:43:04 +0000 Subject: Remove stray white spaces. --- .../libbsp/powerpc/ppcn_60x/network/amd79c970.c | 30 +++++------ .../libbsp/powerpc/ppcn_60x/network/amd79c970.h | 58 +++++++++++----------- 2 files changed, 44 insertions(+), 44 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/ppcn_60x/network') diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.c b/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.c index 2ad0b8e02a..c09bf2a1d5 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.c @@ -39,7 +39,7 @@ * The number of transmit buffer descriptors has to be quite large * since a single frame often uses four or more buffer descriptors. * - * Set the number of Tx and Rx buffers, using Log_2(# buffers). + * Set the number of Tx and Rx buffers, using Log_2(# buffers). */ #define LANCE_LOG2_TX_BUFFERS 4 #define LANCE_LOG2_RX_BUFFERS 4 @@ -76,11 +76,11 @@ #define RD_CSR32(dp, index, value) \ PCNET_IO_WR32(dp, rap, index); \ PCNET_IO_RD32(dp, rdp, value) - + #define WR_CSR32(dp, index, value) \ PCNET_IO_WR32(dp, rap, index); \ PCNET_IO_WR32(dp, rdp, value) - + #define RD_BCR32(dp, index, value) \ PCNET_IO_WR32(dp, rap, index); \ PCNET_IO_RD32(dp, bdp, value) @@ -363,21 +363,21 @@ amd79c970_initialize_hardware (int instance, int broadcastFlag) } /* - * Set the receive descriptor ring length + * Set the receive descriptor ring length */ dp->initBlk.ib_rlen=RX_RING_LEN_BITS; /* - * Set the receive descriptor ring address + * Set the receive descriptor ring address */ dp->initBlk.ib_rdra=Swap32((uint32_t)&dp->rxBdBase[0]+ PCI_SYS_MEM_BASE); /* - * Set the transmit descriptor ring length + * Set the transmit descriptor ring length */ dp->initBlk.ib_tlen=TX_RING_LEN_BITS; /* - * Set the tranmit descriptor ring address + * Set the tranmit descriptor ring address */ dp->initBlk.ib_tdra=Swap32((uint32_t)&dp->txBdBase[0]+ PCI_SYS_MEM_BASE); @@ -386,7 +386,7 @@ amd79c970_initialize_hardware (int instance, int broadcastFlag) { dp->initBlk.ib_padr[i]=dp->iface->hwaddr[i]; } - + /* * Ensure that we are in DWIO mode */ @@ -405,13 +405,13 @@ amd79c970_initialize_hardware (int instance, int broadcastFlag) ulInitClkPCIAddr=(uint32_t)&dp->initBlk+PCI_SYS_MEM_BASE; /* - * CSR2 must contain the high order 16 bits of the first word in - * the initialization block + * CSR2 must contain the high order 16 bits of the first word in + * the initialization block */ WR_CSR32(dp, CSR2, (ulInitClkPCIAddr >> 16) & 0xffff); /* - * CSR1 must contain the low order 16 bits of the first word in - * the initialization block + * CSR1 must contain the low order 16 bits of the first word in + * the initialization block */ WR_CSR32(dp, CSR1, (ulInitClkPCIAddr & 0xffff)); @@ -752,7 +752,7 @@ amd79c970_rx (int dev, void *p1, void *p2) /* * Give the network code a chance to digest the - * packet. This guards against a flurry of + * packet. This guards against a flurry of * incoming packets (usually an ARP storm) from * using up all the available memory. */ @@ -876,7 +876,7 @@ amd79c970_show (struct iface *iface) * Following arguments are optional, but if present, must appear in * the following order: * Following arguments are optional, but if Ethernet address is - * specified, Internet address must also be specified. + * specified, Internet address must also be specified. * ###.###.###.### -- IP address * ##:##:##:##:##:## -- Ethernet address */ @@ -946,7 +946,7 @@ rtems_ka9q_driver_attach (int argc, char *argv[], void *p) * Set receive buffer descriptor count */ dp->rxBdCount=RX_RING_SIZE; - + /* * Set transmit buffer descriptor count */ diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.h b/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.h index f600611418..8f81ebf568 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.h @@ -17,7 +17,7 @@ #define _PCNET_H /* - * IO space structure for the AMD79C970 device + * IO space structure for the AMD79C970 device */ typedef volatile struct pc_net @@ -69,10 +69,10 @@ typedef struct pc_net_eeprom { } pc_net_eeprom_t; /* - * PCnet-PCI Single Chip Ethernet Controller for PCI Local Bus + * PCnet-PCI Single Chip Ethernet Controller for PCI Local Bus */ /* - * Register and bit definitions + * Register and bit definitions */ #define CSR0 0 @@ -104,7 +104,7 @@ typedef struct pc_net_eeprom { #define APROM2 0x08 /* - * CSR0: Bit definitions + * CSR0: Bit definitions */ #define CSR0_ERR 0x8000 /* error summary */ #define CSR0_BABL 0x4000 /* babble error */ @@ -181,10 +181,10 @@ typedef struct pc_net_eeprom { #define CSR80_XMTFW16 (0<<8) /* fifo level to stop dma */ #define CSR80_XMTFW32 (1<<8) #define CSR80_XMTFW64 (2<<8) -/* must also clear csr4 CSR4_DMAPLUS: */ +/* must also clear csr4 CSR4_DMAPLUS: */ #define CSR80_DMATC(x) ((x)&0xff) /* max transfers per burst. deflt 16 */ /* - * must also set csr4 CSR4_TIMER: + * must also set csr4 CSR4_TIMER: */ #define CSR82_DMABAT(x) ((x)&0xffff) /* max burst time nanosecs*100 */ @@ -198,12 +198,12 @@ typedef struct pc_net_eeprom { #define BCR19_PVALID 0x8000 /* aprom (eeprom) read checksum ok */ /* - * initial setting of csr0 + * initial setting of csr0 */ #define CSR0_IVALUE (CSR0_IDON | CSR0_IENA | CSR0_STRT | CSR0_INIT) /* - * our setting of csr3 + * our setting of csr3 */ #define CSR3_VALUE (CSR3_ACON | CSR3_BSWP) @@ -226,7 +226,7 @@ typedef volatile struct initblk { * The bytes must be swapped within the word, so that, for example, * the address 8:0:20:1:25:5a is written in the order * 0 8 1 20 5a 25 - * For PCI970 that is long word swapped: so no swapping needed, since + * For PCI970 that is long word swapped: so no swapping needed, since * the bus will swap. */ uint8_t ib_padr[8]; /* physical address */ @@ -237,11 +237,11 @@ typedef volatile struct initblk { /* - * bits in mode register: allows alteration of the chips operating parameters + * bits in mode register: allows alteration of the chips operating parameters */ #define IBM_PROM 0x8000 /* promiscuous mode */ /* - * mode is also in cr15 + * mode is also in cr15 */ #define MODE_DRCVBC 0x4000 /* disable receive broadcast */ #define MODE_DRCVPA 0x2000 /* disable receive physical address */ @@ -259,15 +259,15 @@ typedef volatile struct initblk { #define IBM_DTX 0x0002 /* disable transmitter */ #define IBM_DRX 0x0001 /* disable receiver */ -/* +/* * Buffer Management is accomplished through message descriptors organized * in ring structures in main memory. There are two rings allocated for the - * device: a receive ring and a transmit ring. The following defines the + * device: a receive ring and a transmit ring. The following defines the * structure of the descriptor rings. */ /* - * Receive List type definition + * Receive List type definition * * This essentially consists of 4, 32 bit LE words. In the following the * fields are ordered so that they map correctly in BE mode, however each @@ -277,7 +277,7 @@ typedef volatile struct initblk { typedef volatile struct rmde { uint32_t rmde_addr; /* buf addr */ - uint16_t rmde_bcnt; + uint16_t rmde_bcnt; uint16_t rmde_flags; uint16_t rmde_mcnt; @@ -288,7 +288,7 @@ typedef volatile struct rmde { /* - * bits in the flags field + * bits in the flags field */ #define RFLG_OWN 0x8000 /* ownership bit, 1==LANCE */ #define RFLG_ERR 0x4000 /* error summary */ @@ -300,19 +300,19 @@ typedef volatile struct rmde { #define RFLG_ENP 0x0100 /* end of packet */ /* - * bits in the buffer byte count field + * bits in the buffer byte count field */ #define RBCNT_ONES 0xf000 /* must be ones */ #define RBCNT_BCNT 0x0fff /* buf byte count, in 2's compl */ /* - * bits in the message byte count field + * bits in the message byte count field */ #define RMCNT_RES 0xf000 /* reserved, read as zeros */ #define RMCNT_BCNT 0x0fff /* message byte count */ /* - * Transmit List type definition + * Transmit List type definition * * This essentially consists of 4, 32 bit LE words. In the following the * fields are ordered so that they map correctly in BE mode, however each @@ -321,7 +321,7 @@ typedef volatile struct rmde { typedef volatile struct tmde { uint32_t tmde_addr; /* buf addr */ - uint16_t tmde_bcnt; + uint16_t tmde_bcnt; uint16_t tmde_status; /* misc error and status bits */ uint32_t tmde_error; @@ -330,7 +330,7 @@ typedef volatile struct tmde { } tmde_t; /* - * bits in the status field + * bits in the status field */ #define TST_OWN 0x8000 /* ownership bit, 1==LANCE */ #define TST_ERR 0x4000 /* error summary */ @@ -342,18 +342,18 @@ typedef volatile struct tmde { #define TST_ENP 0x0100 /* end of packet */ /* - * setting of status field when packet is to be transmitted + * setting of status field when packet is to be transmitted */ #define TST_XMIT (TST_STP | TST_ENP | TST_OWN) /* - * bits in the buffer byte count field + * bits in the buffer byte count field */ #define TBCNT_ONES 0xf000 /* must be ones */ #define TBCNT_BCNT 0x0fff /* buf byte count, in 2's compl */ /* - * bits in the error field + * bits in the error field */ #define TERR_BUFF 0x8000 /* buffer error */ #define TERR_UFLO 0x4000 /* underflow error */ @@ -368,7 +368,7 @@ typedef volatile struct tmde { */ /* - * receive errors + * receive errors */ #define ERR_FRAM 0 /* framing error */ #define ERR_OFLO 1 /* overflow error */ @@ -376,7 +376,7 @@ typedef volatile struct tmde { #define ERR_RBUFF 3 /* receive buffer error */ /* - * transmit errors + * transmit errors */ #define ERR_MORE 4 /* more than one retry */ #define ERR_ONE 5 /* one retry */ @@ -388,7 +388,7 @@ typedef volatile struct tmde { #define ERR_RTRY 11 /* retry error, >16 retries */ /* - * errors reported in csr0 + * errors reported in csr0 */ #define ERR_BABL 12 /* transmitter timeout error */ #define ERR_MISS 13 /* missed packet */ @@ -400,7 +400,7 @@ typedef volatile struct tmde { #define NHARD_ERRORS 18 /* error types used in diagnostic */ /* - * other statistics + * other statistics */ #define ERR_TTOUT 18 /* transmit timeouts */ #define ERR_ITOUT 19 /* init timeouts */ @@ -412,7 +412,7 @@ typedef volatile struct tmde { #define NUM_ERRORS 24 /* number of errors types */ /* - * Bit definitions for BCR19 + * Bit definitions for BCR19 */ #define prom_EDI (uint16_t)0x0001 #define prom_EDO (uint16_t)0x0001 -- cgit v1.2.3