|
@@ -70,7 +70,7 @@ struct xemaclite {
|
|
|
|
|
|
static u32 etherrxbuff[PKTSIZE_ALIGN/4]; /* Receive buffer */
|
|
|
|
|
|
-static void xemaclite_alignedread (u32 *srcptr, void *destptr, u32 bytecount)
|
|
|
+static void xemaclite_alignedread(u32 *srcptr, void *destptr, u32 bytecount)
|
|
|
{
|
|
|
u32 i;
|
|
|
u32 alignbuffer;
|
|
@@ -90,14 +90,13 @@ static void xemaclite_alignedread (u32 *srcptr, void *destptr, u32 bytecount)
|
|
|
to8ptr = (u8 *) to32ptr;
|
|
|
|
|
|
alignbuffer = *from32ptr++;
|
|
|
- from8ptr = (u8 *) & alignbuffer;
|
|
|
+ from8ptr = (u8 *) &alignbuffer;
|
|
|
|
|
|
- for (i = 0; i < bytecount; i++) {
|
|
|
+ for (i = 0; i < bytecount; i++)
|
|
|
*to8ptr++ = *from8ptr++;
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
-static void xemaclite_alignedwrite (void *srcptr, u32 destptr, u32 bytecount)
|
|
|
+static void xemaclite_alignedwrite(void *srcptr, u32 destptr, u32 bytecount)
|
|
|
{
|
|
|
u32 i;
|
|
|
u32 alignbuffer;
|
|
@@ -114,25 +113,24 @@ static void xemaclite_alignedwrite (void *srcptr, u32 destptr, u32 bytecount)
|
|
|
}
|
|
|
|
|
|
alignbuffer = 0;
|
|
|
- to8ptr = (u8 *) & alignbuffer;
|
|
|
+ to8ptr = (u8 *) &alignbuffer;
|
|
|
from8ptr = (u8 *) from32ptr;
|
|
|
|
|
|
- for (i = 0; i < bytecount; i++) {
|
|
|
+ for (i = 0; i < bytecount; i++)
|
|
|
*to8ptr++ = *from8ptr++;
|
|
|
- }
|
|
|
|
|
|
*to32ptr++ = alignbuffer;
|
|
|
}
|
|
|
|
|
|
static void emaclite_halt(struct eth_device *dev)
|
|
|
{
|
|
|
- debug ("eth_halt\n");
|
|
|
+ debug("eth_halt\n");
|
|
|
}
|
|
|
|
|
|
static int emaclite_init(struct eth_device *dev, bd_t *bis)
|
|
|
{
|
|
|
struct xemaclite *emaclite = dev->priv;
|
|
|
- debug ("EmacLite Initialization Started\n");
|
|
|
+ debug("EmacLite Initialization Started\n");
|
|
|
|
|
|
/*
|
|
|
* TX - TX_PING & TX_PONG initialization
|
|
@@ -140,8 +138,7 @@ static int emaclite_init(struct eth_device *dev, bd_t *bis)
|
|
|
/* Restart PING TX */
|
|
|
out_be32 (dev->iobase + XEL_TSR_OFFSET, 0);
|
|
|
/* Copy MAC address */
|
|
|
- xemaclite_alignedwrite (dev->enetaddr,
|
|
|
- dev->iobase, ENET_ADDR_LENGTH);
|
|
|
+ xemaclite_alignedwrite(dev->enetaddr, dev->iobase, ENET_ADDR_LENGTH);
|
|
|
/* Set the length */
|
|
|
out_be32 (dev->iobase + XEL_TPLR_OFFSET, ENET_ADDR_LENGTH);
|
|
|
/* Update the MAC address in the EMAC Lite */
|
|
@@ -174,7 +171,7 @@ static int emaclite_init(struct eth_device *dev, bd_t *bis)
|
|
|
out_be32 (dev->iobase + XEL_RSR_OFFSET + XEL_BUFFER_OFFSET,
|
|
|
XEL_RSR_RECV_IE_MASK);
|
|
|
|
|
|
- debug ("EmacLite Initialization complete\n");
|
|
|
+ debug("EmacLite Initialization complete\n");
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -199,10 +196,10 @@ static int xemaclite_txbufferavailable(struct eth_device *dev)
|
|
|
txpongbusy = ((reg & 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)
|
|
|
{
|
|
|
u32 reg;
|
|
|
u32 baseaddress;
|
|
@@ -214,12 +211,12 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len)
|
|
|
len = PKTSIZE;
|
|
|
|
|
|
while (!xemaclite_txbufferavailable(dev) && maxtry) {
|
|
|
- udelay (10);
|
|
|
+ udelay(10);
|
|
|
maxtry--;
|
|
|
}
|
|
|
|
|
|
if (!maxtry) {
|
|
|
- printf ("Error: Timeout waiting for ethernet TX buffer\n");
|
|
|
+ printf("Error: Timeout waiting for ethernet TX buffer\n");
|
|
|
/* Restart PING TX */
|
|
|
out_be32 (dev->iobase + XEL_TSR_OFFSET, 0);
|
|
|
if (emaclite->txpp) {
|
|
@@ -241,16 +238,15 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len)
|
|
|
if (emaclite->txpp)
|
|
|
emaclite->nexttxbuffertouse ^= XEL_BUFFER_OFFSET;
|
|
|
|
|
|
- debug ("Send packet from 0x%x\n", baseaddress);
|
|
|
+ debug("Send packet from 0x%x\n", baseaddress);
|
|
|
/* Write the frame to the buffer */
|
|
|
- xemaclite_alignedwrite ((void *) ptr, baseaddress, len);
|
|
|
+ xemaclite_alignedwrite((void *) ptr, baseaddress, len);
|
|
|
out_be32 (baseaddress + XEL_TPLR_OFFSET,(len &
|
|
|
(XEL_TPLR_LENGTH_MASK_HI | XEL_TPLR_LENGTH_MASK_LO)));
|
|
|
reg = in_be32 (baseaddress + XEL_TSR_OFFSET);
|
|
|
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;
|
|
|
- }
|
|
|
out_be32 (baseaddress + XEL_TSR_OFFSET, reg);
|
|
|
return 0;
|
|
|
}
|
|
@@ -278,7 +274,7 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- puts ("Error while sending frame\n");
|
|
|
+ puts("Error while sending frame\n");
|
|
|
return -1;
|
|
|
}
|
|
|
|
|
@@ -291,14 +287,14 @@ static int emaclite_recv(struct eth_device *dev)
|
|
|
|
|
|
baseaddress = dev->iobase + emaclite->nextrxbuffertouse;
|
|
|
reg = in_be32 (baseaddress + XEL_RSR_OFFSET);
|
|
|
- debug ("Testing data at address 0x%x\n", baseaddress);
|
|
|
+ debug("Testing data at address 0x%x\n", baseaddress);
|
|
|
if ((reg & XEL_RSR_RECV_DONE_MASK) == XEL_RSR_RECV_DONE_MASK) {
|
|
|
if (emaclite->rxpp)
|
|
|
emaclite->nextrxbuffertouse ^= XEL_BUFFER_OFFSET;
|
|
|
} else {
|
|
|
|
|
|
if (!emaclite->rxpp) {
|
|
|
- debug ("No data was available - address 0x%x\n",
|
|
|
+ debug("No data was available - address 0x%x\n",
|
|
|
baseaddress);
|
|
|
return 0;
|
|
|
} else {
|
|
@@ -317,12 +313,13 @@ static int emaclite_recv(struct eth_device *dev)
|
|
|
0xFFFF0000 ) >> 16) {
|
|
|
case 0x806:
|
|
|
length = 42 + 20; /* FIXME size of ARP */
|
|
|
- debug ("ARP Packet\n");
|
|
|
+ debug("ARP Packet\n");
|
|
|
break;
|
|
|
case 0x800:
|
|
|
length = 14 + 14 +
|
|
|
- (((ntohl(in_be32 (baseaddress + XEL_RXBUFF_OFFSET + 0x10))) &
|
|
|
- 0xFFFF0000) >> 16); /* FIXME size of IP packet */
|
|
|
+ (((ntohl(in_be32 (baseaddress + XEL_RXBUFF_OFFSET +
|
|
|
+ 0x10))) & 0xFFFF0000) >> 16);
|
|
|
+ /* FIXME size of IP packet */
|
|
|
debug ("IP Packet\n");
|
|
|
break;
|
|
|
default:
|
|
@@ -331,7 +328,7 @@ static int emaclite_recv(struct eth_device *dev)
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- xemaclite_alignedread ((u32 *) (baseaddress + XEL_RXBUFF_OFFSET),
|
|
|
+ xemaclite_alignedread((u32 *) (baseaddress + XEL_RXBUFF_OFFSET),
|
|
|
etherrxbuff, length);
|
|
|
|
|
|
/* Acknowledge the frame */
|
|
@@ -339,8 +336,8 @@ static int emaclite_recv(struct eth_device *dev)
|
|
|
reg &= ~XEL_RSR_RECV_DONE_MASK;
|
|
|
out_be32 (baseaddress + XEL_RSR_OFFSET, reg);
|
|
|
|
|
|
- debug ("Packet receive from 0x%x, length %dB\n", baseaddress, length);
|
|
|
- NetReceive ((uchar *) etherrxbuff, length);
|
|
|
+ debug("Packet receive from 0x%x, length %dB\n", baseaddress, length);
|
|
|
+ NetReceive((uchar *) etherrxbuff, length);
|
|
|
return length;
|
|
|
|
|
|
}
|