80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed NE2000 I/O port handlers, per report by waltje.

Browse Source
This commit is contained in:
OBattler
2021-06-28 01:03:24 +02:00
parent 58da2edce2
commit 5d05434d46
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/network/net_ne2000.c
View File

@@ -571,13 +571,7 @@ static void
nic_ioset(nic_t *dev, uint16_t addr) nic_ioset(nic_t *dev, uint16_t addr)
{ {
if (dev->is_pci) { if (dev->is_pci) {
io_sethandler(addr, 16, io_sethandler(addr, 32,
nic_readb, nic_readw, nic_readl,
nic_writeb, nic_writew, nic_writel, dev);
io_sethandler(addr+16, 16,
nic_readb, nic_readw, nic_readl,
nic_writeb, nic_writew, nic_writel, dev);
io_sethandler(addr+0x1f, 1,
nic_readb, nic_readw, nic_readl, nic_readb, nic_readw, nic_readl,
nic_writeb, nic_writew, nic_writel, dev); nic_writeb, nic_writew, nic_writel, dev);
} else { } else {
@@ -593,9 +587,6 @@ nic_ioset(nic_t *dev, uint16_t addr)
nic_readb, nic_readw, NULL, nic_readb, nic_readw, NULL,
nic_writeb, nic_writew, NULL, dev); nic_writeb, nic_writew, NULL, dev);
} }
io_sethandler(addr+0x1f, 1,
nic_readb, NULL, NULL,
nic_writeb, NULL, NULL, dev);
} }
} }
@@ -604,13 +595,7 @@ static void
nic_ioremove(nic_t *dev, uint16_t addr) nic_ioremove(nic_t *dev, uint16_t addr)
{ {
if (dev->is_pci) { if (dev->is_pci) {
io_removehandler(addr, 16, io_removehandler(addr, 32,
nic_readb, nic_readw, nic_readl,
nic_writeb, nic_writew, nic_writel, dev);
io_removehandler(addr+16, 16,
nic_readb, nic_readw, nic_readl,
nic_writeb, nic_writew, nic_writel, dev);
io_removehandler(addr+0x1f, 1,
nic_readb, nic_readw, nic_readl, nic_readb, nic_readw, nic_readl,
nic_writeb, nic_writew, nic_writel, dev); nic_writeb, nic_writew, nic_writel, dev);
} else { } else {
@@ -626,9 +611,6 @@ nic_ioremove(nic_t *dev, uint16_t addr)
nic_readb, nic_readw, NULL, nic_readb, nic_readw, NULL,
nic_writeb, nic_writew, NULL, dev); nic_writeb, nic_writew, NULL, dev);
} }
io_removehandler(addr+0x1f, 1,
nic_readb, NULL, NULL,
nic_writeb, NULL, NULL, dev);
} }
} }