redonkable/remarkable-uboot
redonkable/remarkable-uboot
1
0
Fork 0
Code Releases 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 */
XPacketFifoV100b RecvFifo; /* FIFO used to receive frames */
XPacketFifoV100b SendFifo; /* FIFO used to send frames */
} XEmac;
#define XIIF_V123B_IISR_OFFSET 32UL /* IP interrupt status register */
@ -46,7 +45,7 @@ typedef struct {
#define XPF_RESET_FIFO_MASK 0x0000000A
#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 */
#define XPF_COUNT_MASK 0x0000FFFF
#define XPF_DEADLOCK_MASK 0x20000000
@ -78,9 +77,9 @@ typedef struct {
* part of the IPIF IP Interrupt registers
*/
/* 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_SFIFO_EMPTY_MASK | \
XEM_EIR_XMIT_SFIFO_EMPTY_MASK |\
XEM_EIR_XMIT_LFIFO_FULL_MASK)
#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
//#define DEBUG
#undef DEBUG
#define ENET_MAX_MTU PKTSIZE
#define ENET_MAX_MTU_ALIGNED PKTSIZE_ALIGN
@ -310,7 +310,7 @@ int eth_rx (void)
BaseAddress = EmacLite.BaseAddress + EmacLite.NextRxBufferToUse;
Register = in_be32 (BaseAddress + XEL_RSR_OFFSET);
#ifdef DEBUG
// printf ("Testing data at address 0x%x\n", BaseAddress);
printf ("Testing data at address 0x%x\n", BaseAddress);
#endif
if ((Register & XEL_RSR_RECV_DONE_MASK) == XEL_RSR_RECV_DONE_MASK) {
#ifdef XILINX_EMACLITE_RX_PING_PONG
@ -319,7 +319,7 @@ int eth_rx (void)
} else {
#ifndef XILINX_EMACLITE_RX_PING_PONG
#ifdef DEBUG
// printf ("No data was available - address 0x%x\n", BaseAddress);
printf ("No data was available - address 0x%x\n", BaseAddress);
#endif
return 0;
#else
@ -328,8 +328,8 @@ int eth_rx (void)
if ((Register & XEL_RSR_RECV_DONE_MASK) !=
XEL_RSR_RECV_DONE_MASK) {
#ifdef DEBUG
// printf ("No data was available - address 0x%x\n",
// BaseAddress);
printf ("No data was available - address 0x%x\n",
BaseAddress);
#endif
return 0;
}