brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-08-05 17:53:44 +09:00
Code Issues Projects Releases Wiki Activity

[FIX] Coding style cleanup

Browse Source
This commit is contained in:
Michal Simek 2007-08-05 22:33:05 +02:00
parent 45b3fd2815
commit a274ca4f6d
3 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/xilinx_emac.h
View File

@ -35,7 +35,6 @@ typedef struct {
u32 IsStarted; /* Device is currently started 0-no, 1-yes */ u32 IsStarted; /* Device is currently started 0-no, 1-yes */
XPacketFifoV100b RecvFifo; /* FIFO used to receive frames */ XPacketFifoV100b RecvFifo; /* FIFO used to receive frames */
XPacketFifoV100b SendFifo; /* FIFO used to send frames */ XPacketFifoV100b SendFifo; /* FIFO used to send frames */
} XEmac; } XEmac;
#define XIIF_V123B_IISR_OFFSET 32UL /* IP interrupt status register */ #define XIIF_V123B_IISR_OFFSET 32UL /* IP interrupt status register */
@ -46,7 +45,7 @@ typedef struct {
#define XPF_RESET_FIFO_MASK 0x0000000A #define XPF_RESET_FIFO_MASK 0x0000000A
#define XPF_COUNT_STATUS_REG_OFFSET 4UL #define XPF_COUNT_STATUS_REG_OFFSET 4UL
/* * These constants are used with the Occupancy/Vacancy Count Register. This /* These constants are used with the Occupancy/Vacancy Count Register. This
* register also contains FIFO status */ * register also contains FIFO status */
#define XPF_COUNT_MASK 0x0000FFFF #define XPF_COUNT_MASK 0x0000FFFF
#define XPF_DEADLOCK_MASK 0x20000000 #define XPF_DEADLOCK_MASK 0x20000000
@ -78,9 +77,9 @@ typedef struct {
* part of the IPIF IP Interrupt registers * part of the IPIF IP Interrupt registers
*/ */
/* A mask for all transmit interrupts, used in polled mode */ /* A mask for all transmit interrupts, used in polled mode */
#define XEM_EIR_XMIT_ALL_MASK (XEM_EIR_XMIT_DONE_MASK | \ #define XEM_EIR_XMIT_ALL_MASK (XEM_EIR_XMIT_DONE_MASK |\
XEM_EIR_XMIT_ERROR_MASK | \ XEM_EIR_XMIT_ERROR_MASK | \
XEM_EIR_XMIT_SFIFO_EMPTY_MASK | \ XEM_EIR_XMIT_SFIFO_EMPTY_MASK |\
XEM_EIR_XMIT_LFIFO_FULL_MASK) XEM_EIR_XMIT_LFIFO_FULL_MASK)
#define XEM_EIR_XMIT_DONE_MASK 0x00000001UL /* Xmit complete */ #define XEM_EIR_XMIT_DONE_MASK 0x00000001UL /* Xmit complete */

10
drivers/net/xilinx_emaclite.c
View File

@ -29,7 +29,7 @@
#ifdef XILINX_EMACLITE_BASEADDR #ifdef XILINX_EMACLITE_BASEADDR
//#define DEBUG #undef DEBUG
#define ENET_MAX_MTU PKTSIZE #define ENET_MAX_MTU PKTSIZE
#define ENET_MAX_MTU_ALIGNED PKTSIZE_ALIGN #define ENET_MAX_MTU_ALIGNED PKTSIZE_ALIGN
@ -310,7 +310,7 @@ int eth_rx (void)
BaseAddress = EmacLite.BaseAddress + EmacLite.NextRxBufferToUse; BaseAddress = EmacLite.BaseAddress + EmacLite.NextRxBufferToUse;
Register = in_be32 (BaseAddress + XEL_RSR_OFFSET); Register = in_be32 (BaseAddress + XEL_RSR_OFFSET);
#ifdef DEBUG #ifdef DEBUG
// printf ("Testing data at address 0x%x\n", BaseAddress); printf ("Testing data at address 0x%x\n", BaseAddress);
#endif #endif
if ((Register & XEL_RSR_RECV_DONE_MASK) == XEL_RSR_RECV_DONE_MASK) { if ((Register & XEL_RSR_RECV_DONE_MASK) == XEL_RSR_RECV_DONE_MASK) {
#ifdef XILINX_EMACLITE_RX_PING_PONG #ifdef XILINX_EMACLITE_RX_PING_PONG
@ -319,7 +319,7 @@ int eth_rx (void)
} else { } else {
#ifndef XILINX_EMACLITE_RX_PING_PONG #ifndef XILINX_EMACLITE_RX_PING_PONG
#ifdef DEBUG #ifdef DEBUG
// printf ("No data was available - address 0x%x\n", BaseAddress); printf ("No data was available - address 0x%x\n", BaseAddress);
#endif #endif
return 0; return 0;
#else #else
@ -328,8 +328,8 @@ int eth_rx (void)
if ((Register & XEL_RSR_RECV_DONE_MASK) != if ((Register & XEL_RSR_RECV_DONE_MASK) !=
XEL_RSR_RECV_DONE_MASK) { XEL_RSR_RECV_DONE_MASK) {
#ifdef DEBUG #ifdef DEBUG
// printf ("No data was available - address 0x%x\n", printf ("No data was available - address 0x%x\n",
// BaseAddress); BaseAddress);
#endif #endif
return 0; return 0;
} }