summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-10-21 01:01:17 +0200
committerWolfgang Denk <wd@denx.de>2007-10-21 01:01:17 +0200
commit05bf4919c1ce49cdedadacd564d0786a8ed796a1 (patch)
tree751c85d3eed5f6866fcef4c0bd00e2afd5ff1680 /drivers
parentff285ca07eda1ea4a8909848cc1cc604ec8fec9c (diff)
downloadtalos-obmc-uboot-05bf4919c1ce49cdedadacd564d0786a8ed796a1.tar.gz
talos-obmc-uboot-05bf4919c1ce49cdedadacd564d0786a8ed796a1.zip
Minor coding style cleanup; update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ne2000.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/ne2000.c b/drivers/ne2000.c
index 0bfe74e547..695a1dc6c9 100644
--- a/drivers/ne2000.c
+++ b/drivers/ne2000.c
@@ -745,14 +745,12 @@ static void pcnet_reset_8390(void)
PRINTK("nic base is %lx\n", nic_base);
-#if 1
n2k_outb(E8390_NODMA+E8390_PAGE0+E8390_STOP, E8390_CMD);
PRINTK("cmd (at %lx) is %x\n", nic_base+ E8390_CMD, n2k_inb(E8390_CMD));
n2k_outb(E8390_NODMA+E8390_PAGE1+E8390_STOP, E8390_CMD);
PRINTK("cmd (at %lx) is %x\n", nic_base+ E8390_CMD, n2k_inb(E8390_CMD));
n2k_outb(E8390_NODMA+E8390_PAGE0+E8390_STOP, E8390_CMD);
PRINTK("cmd (at %lx) is %x\n", nic_base+ E8390_CMD, n2k_inb(E8390_CMD));
-#endif
n2k_outb(E8390_NODMA+E8390_PAGE0+E8390_STOP, E8390_CMD);
n2k_outb(n2k_inb(PCNET_RESET), PCNET_RESET);
@@ -847,12 +845,9 @@ void uboot_push_packet_len(int len) {
}
plen[nrx] = len;
dp83902a_recv(&pbuf[nrx*2000], len);
-/*Just pass it to the upper layer*/
+
+ /*Just pass it to the upper layer*/
NetReceive(&pbuf[nrx*2000], plen[nrx]);
-/*eth_rx() was gutted, so this is not needed anymore*/
-#if 0
- nrx++;
-#endif
}
void uboot_push_tx_done(int key, int val) {
@@ -949,5 +944,4 @@ int eth_send(volatile void *packet, int length) {
}
return 0;
}
-
#endif
OpenPOWER on IntegriCloud