minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-18 08:32:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

net: emaclite: Fix coding style

Browse Source 
Coding style should follow linux coding style.

Signed-off-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
Michal Simek 2011-09-12 21:10:05 +00:00 committed by Wolfgang Denk
parent 8043925204
commit 5ac83801f9
1 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/xilinx_emaclite.c
View File

@ -92,10 +92,9 @@ static void xemaclite_alignedread (u32 *srcptr, void *destptr, u32 bytecount)
alignbuffer = *from32ptr++; alignbuffer = *from32ptr++;
from8ptr = (u8 *) &alignbuffer; from8ptr = (u8 *) &alignbuffer;
for (i = 0; i < bytecount; i++) { for (i = 0; i < bytecount; i++)
*to8ptr++ = *from8ptr++; *to8ptr++ = *from8ptr++;
} }
}
static void xemaclite_alignedwrite(void *srcptr, u32 destptr, u32 bytecount) static void xemaclite_alignedwrite(void *srcptr, u32 destptr, u32 bytecount)
{ {
@ -117,9 +116,8 @@ static void xemaclite_alignedwrite (void *srcptr, u32 destptr, u32 bytecount)
to8ptr = (u8 *) &alignbuffer; to8ptr = (u8 *) &alignbuffer;
from8ptr = (u8 *) from32ptr; from8ptr = (u8 *) from32ptr;
for (i = 0; i < bytecount; i++) { for (i = 0; i < bytecount; i++)
*to8ptr++ = *from8ptr++; *to8ptr++ = *from8ptr++;
}
*to32ptr++ = alignbuffer; *to32ptr++ = alignbuffer;
} }
@ -140,8 +138,7 @@ static int emaclite_init(struct eth_device *dev, bd_t *bis)
/* Restart PING TX */ /* Restart PING TX */
out_be32 (dev->iobase + XEL_TSR_OFFSET, 0); out_be32 (dev->iobase + XEL_TSR_OFFSET, 0);
/* Copy MAC address */ /* Copy MAC address */
xemaclite_alignedwrite (dev->enetaddr, xemaclite_alignedwrite(dev->enetaddr, dev->iobase, ENET_ADDR_LENGTH);
dev->iobase, ENET_ADDR_LENGTH);
/* Set the length */ /* Set the length */
out_be32 (dev->iobase + XEL_TPLR_OFFSET, ENET_ADDR_LENGTH); out_be32 (dev->iobase + XEL_TPLR_OFFSET, ENET_ADDR_LENGTH);
/* Update the MAC address in the EMAC Lite */ /* Update the MAC address in the EMAC Lite */
@ -199,7 +196,7 @@ static int xemaclite_txbufferavailable(struct eth_device *dev)
txpongbusy = ((reg & XEL_TSR_XMIT_BUSY_MASK) == txpongbusy = ((reg & XEL_TSR_XMIT_BUSY_MASK) ==
XEL_TSR_XMIT_BUSY_MASK); XEL_TSR_XMIT_BUSY_MASK);
return (!(txpingbusy && txpongbusy)); return !(txpingbusy && txpongbusy);
} }
static int emaclite_send(struct eth_device *dev, volatile void *ptr, int len) static int emaclite_send(struct eth_device *dev, volatile void *ptr, int len)
@ -248,9 +245,8 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len)
(XEL_TPLR_LENGTH_MASK_HI | XEL_TPLR_LENGTH_MASK_LO))); (XEL_TPLR_LENGTH_MASK_HI | XEL_TPLR_LENGTH_MASK_LO)));
reg = in_be32 (baseaddress + XEL_TSR_OFFSET); reg = in_be32 (baseaddress + XEL_TSR_OFFSET);
reg |= XEL_TSR_XMIT_BUSY_MASK; reg |= XEL_TSR_XMIT_BUSY_MASK;
if ((reg & XEL_TSR_XMIT_IE_MASK) != 0) { if ((reg & XEL_TSR_XMIT_IE_MASK) != 0)
reg |= XEL_TSR_XMIT_ACTIVE_MASK; reg |= XEL_TSR_XMIT_ACTIVE_MASK;
}
out_be32 (baseaddress + XEL_TSR_OFFSET, reg); out_be32 (baseaddress + XEL_TSR_OFFSET, reg);
return 0; return 0;
} }
@ -321,8 +317,9 @@ static int emaclite_recv(struct eth_device *dev)
break; break;
case 0x800: case 0x800:
length = 14 + 14 + length = 14 + 14 +
(((ntohl(in_be32 (baseaddress + XEL_RXBUFF_OFFSET + 0x10))) & (((ntohl(in_be32 (baseaddress + XEL_RXBUFF_OFFSET +
0xFFFF0000) >> 16); /* FIXME size of IP packet */ 0x10))) & 0xFFFF0000) >> 16);
/* FIXME size of IP packet */
debug ("IP Packet\n"); debug ("IP Packet\n");
break; break;
default: default: