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

Change NE2000 PnP config function to be more in line with other devices

Browse Source
This commit is contained in:
RichardG867
2021-03-22 21:55:19 -03:00
parent 4803a6ce04
commit c1858212e8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/network/net_ne2000.c
View File

@@ -111,7 +111,6 @@ typedef struct {
uint8_t eeprom[128]; /* for RTL8029AS */ uint8_t eeprom[128]; /* for RTL8029AS */
rom_t bios_rom; rom_t bios_rom;
void *pnp_card; void *pnp_card;
uint8_t pnp_activate;
uint8_t pnp_csnsav; uint8_t pnp_csnsav;
uint8_t maclocal[6]; /* configured MAC (local) address */ uint8_t maclocal[6]; /* configured MAC (local) address */
@@ -502,19 +501,20 @@ static void nic_ioremove(nic_t *dev, uint16_t addr);
static void static void
nic_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv) nic_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv)
{ {
if (ld != 0) if (ld)
return; return;
nic_t *dev = (nic_t *) priv; nic_t *dev = (nic_t *) priv;
if (dev->pnp_activate) if (dev->base_address) {
nic_ioremove(dev, dev->base_address); nic_ioremove(dev, dev->base_address);
dev->base_address = 0;
}
dev->base_address = config->io[0].base; dev->base_address = config->io[0].base;
dev->base_irq = config->irq[0].irq; dev->base_irq = config->irq[0].irq;
dev->pnp_activate = config->activate;
if (dev->pnp_activate && (dev->base_address != ISAPNP_IO_DISABLED) && (dev->base_irq != ISAPNP_IRQ_DISABLED)) if (config->activate && (dev->base_address != ISAPNP_IO_DISABLED))
nic_ioset(dev, dev->base_address); nic_ioset(dev, dev->base_address);
} }