projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm: timer: uclass: Add flag to control sequence numbering
[oweals/u-boot.git]
/
drivers
/
net
/
at91_emac.c
diff --git
a/drivers/net/at91_emac.c
b/drivers/net/at91_emac.c
index 64d4c56ac56ac3b996b3659a3c9b81e473f8ec14..26595929c51b91b64c41ded84bdc6caeaf1b3117 100644
(file)
--- a/
drivers/net/at91_emac.c
+++ b/
drivers/net/at91_emac.c
@@
-352,7
+352,7
@@
static int at91emac_init(struct eth_device *netdev, bd_t *bd)
/* Init Ethernet buffers */
for (i = 0; i < RBF_FRAMEMAX; i++) {
/* Init Ethernet buffers */
for (i = 0; i < RBF_FRAMEMAX; i++) {
- dev->rbfdt[i].addr = (unsigned long)
NetRxP
ackets[i];
+ dev->rbfdt[i].addr = (unsigned long)
net_rx_p
ackets[i];
dev->rbfdt[i].size = 0;
}
dev->rbfdt[RBF_FRAMEMAX - 1].addr |= RBF_WRAP;
dev->rbfdt[i].size = 0;
}
dev->rbfdt[RBF_FRAMEMAX - 1].addr |= RBF_WRAP;
@@
-420,7
+420,7
@@
static int at91emac_recv(struct eth_device *netdev)
rbfp = &dev->rbfdt[dev->rbindex];
while (rbfp->addr & RBF_OWNER) {
size = rbfp->size & RBF_SIZE;
rbfp = &dev->rbfdt[dev->rbindex];
while (rbfp->addr & RBF_OWNER) {
size = rbfp->size & RBF_SIZE;
-
NetReceive(NetRxP
ackets[dev->rbindex], size);
+
net_process_received_packet(net_rx_p
ackets[dev->rbindex], size);
debug_cond(DEBUG_AT91EMAC, "Recv[%ld]: %d bytes @ %lx\n",
dev->rbindex, size, rbfp->addr);
debug_cond(DEBUG_AT91EMAC, "Recv[%ld]: %d bytes @ %lx\n",
dev->rbindex, size, rbfp->addr);
@@
-490,7
+490,7
@@
int at91emac_register(bd_t *bis, unsigned long iobase)
memset(emacfix, 0, sizeof(emac_device));
memset(dev, 0, sizeof(*dev));
memset(emacfix, 0, sizeof(emac_device));
memset(dev, 0, sizeof(*dev));
- s
printf
(dev->name, "emac");
+ s
trcpy
(dev->name, "emac");
dev->iobase = iobase;
dev->priv = emacfix;
dev->init = at91emac_init;
dev->iobase = iobase;
dev->priv = emacfix;
dev->init = at91emac_init;