|
@@ -769,14 +769,14 @@ static void pcnet_reset_8390(void)
|
|
|
{
|
|
|
int i, r;
|
|
|
|
|
|
- PRINTK("nic base is %lx\n", nic_base);
|
|
|
+ PRINTK("nic base is %lx\n", nic.base);
|
|
|
|
|
|
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));
|
|
|
+ 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));
|
|
|
+ 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));
|
|
|
+ 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);
|
|
|
|
|
|
n2k_outb(n2k_inb(PCNET_RESET), PCNET_RESET);
|
|
@@ -852,8 +852,6 @@ int __get_prom(u8* mac_addr)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-u32 nic_base;
|
|
|
-
|
|
|
/* U-boot specific routines */
|
|
|
static u8 *pbuf = NULL;
|
|
|
|
|
@@ -901,7 +899,6 @@ int eth_init(bd_t *bd) {
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
- nic_base = CONFIG_DRIVER_NE2000_BASE;
|
|
|
nic.base = (u8 *) CONFIG_DRIVER_NE2000_BASE;
|
|
|
|
|
|
r = get_prom(dev_addr);
|