projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: phy: delay only if reset handler is registered
[oweals/u-boot.git]
/
drivers
/
net
/
ax88180.c
diff --git
a/drivers/net/ax88180.c
b/drivers/net/ax88180.c
index bc3e6ad58a0ff0e58080ff675b839353bbdc5f65..ded9e064e51aa6d03e6632a5f79d7b840d6a303c 100644
(file)
--- a/
drivers/net/ax88180.c
+++ b/
drivers/net/ax88180.c
@@
-157,7
+157,7
@@
static void ax88180_mac_reset (struct eth_device *dev)
OUTW (dev, MISC_RESET_MAC, MISC);
tmpval = INW (dev, MISC);
OUTW (dev, MISC_RESET_MAC, MISC);
tmpval = INW (dev, MISC);
- for (i = 0; i <
(sizeof (program_seq) / sizeof (program_seq[0])
); i++)
+ for (i = 0; i <
ARRAY_SIZE(program_seq
); i++)
OUTW (dev, program_seq[i].value, program_seq[i].offset);
}
OUTW (dev, program_seq[i].value, program_seq[i].offset);
}
@@
-192,9
+192,9
@@
static void ax88180_rx_handler (struct eth_device *dev)
unsigned short rxcurt_ptr, rxbound_ptr, next_ptr;
int i;
#if defined (CONFIG_DRIVER_AX88180_16BIT)
unsigned short rxcurt_ptr, rxbound_ptr, next_ptr;
int i;
#if defined (CONFIG_DRIVER_AX88180_16BIT)
- unsigned short *rxdata = (unsigned short *)
NetRxP
ackets[0];
+ unsigned short *rxdata = (unsigned short *)
net_rx_p
ackets[0];
#else
#else
- unsigned long *rxdata = (unsigned long *)
NetRxP
ackets[0];
+ unsigned long *rxdata = (unsigned long *)
net_rx_p
ackets[0];
#endif
unsigned short count;
#endif
unsigned short count;
@@
-237,7
+237,7
@@
static void ax88180_rx_handler (struct eth_device *dev)
OUTW (dev, RX_STOP_READ, RXINDICATOR);
/* Pass the packet up to the protocol layers. */
OUTW (dev, RX_STOP_READ, RXINDICATOR);
/* Pass the packet up to the protocol layers. */
-
NetReceive (NetRxP
ackets[0], data_size);
+
net_process_received_packet(net_rx_p
ackets[0], data_size);
OUTW (dev, rxbound_ptr, RXBOUND);
OUTW (dev, rxbound_ptr, RXBOUND);
@@
-604,8
+604,7
@@
static int ax88180_recv (struct eth_device *dev)
}
/* Send a data block via Ethernet. */
}
/* Send a data block via Ethernet. */
-static int
-ax88180_send (struct eth_device *dev, volatile void *packet, int length)
+static int ax88180_send(struct eth_device *dev, void *packet, int length)
{
struct ax88180_private *priv = (struct ax88180_private *)dev->priv;
unsigned short TXDES_addr;
{
struct ax88180_private *priv = (struct ax88180_private *)dev->priv;
unsigned short TXDES_addr;