claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

More RTL8029AS fixes - the BIOS now works;

Browse Source 
Moved the Intel SIO device to slot 2 on the Premiere/PCI and Premiere/PCI II boards - fixes the BT-958D in level-triggered mode on those two boards.
This commit is contained in:
OBattler
2017-08-28 06:50:13 +02:00
parent ef29b928ea
commit 15c32bd57a
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/model.c
View File

@@ -664,7 +664,7 @@ void at_premiere_common_init(void)
pci_slot(0xc); pci_slot(0xc);
pci_slot(0xe); pci_slot(0xe);
pci_slot(0x6); pci_slot(0x6);
sio_init(1, 0xc, 0xe, 0x6, 0); sio_init(2, 0xc, 0xe, 0x6, 0);
fdc37c665_init(); fdc37c665_init();
intel_batman_init(); intel_batman_init();
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
@@ -686,7 +686,7 @@ void at_586mc1_init(void)
pci_slot(0xc); pci_slot(0xc);
pci_slot(0xe); pci_slot(0xe);
pci_slot(0x6); pci_slot(0x6);
sio_init(1, 0xc, 0xe, 0x6, 0); sio_init(2, 0xc, 0xe, 0x6, 0);
device_add(&intel_flash_bxt_device); device_add(&intel_flash_bxt_device);
secondary_ide_check(); secondary_ide_check();
} }

22
src/network/net_ne2000.c
View File

@@ -1532,7 +1532,7 @@ nic_pci_read(int func, int addr, void *priv)
ret = dev->pci_bar[1].addr_regs[0] & 0x01; ret = dev->pci_bar[1].addr_regs[0] & 0x01;
break; break;
case 0x31: /* PCI_ROMBAR 15:11 */ case 0x31: /* PCI_ROMBAR 15:11 */
ret = (dev->pci_bar[1].addr_regs[1] & dev->bios_mask); ret = dev->pci_bar[1].addr_regs[1] & 0x80;
break; break;
case 0x32: /* PCI_ROMBAR 23:16 */ case 0x32: /* PCI_ROMBAR 23:16 */
ret = dev->pci_bar[1].addr_regs[2]; ret = dev->pci_bar[1].addr_regs[2];
@@ -1566,7 +1566,7 @@ nic_pci_write(int func, int addr, uint8_t val, void *priv)
switch(addr) { switch(addr) {
case 0x04: /* PCI_COMMAND_LO */ case 0x04: /* PCI_COMMAND_LO */
valxor = (val & 0x23) ^ dev->pci_regs[addr]; valxor = (val & 0x03) ^ dev->pci_regs[addr];
if (valxor & PCI_COMMAND_IO) if (valxor & PCI_COMMAND_IO)
{ {
nic_ioremove(dev, dev->base_address); nic_ioremove(dev, dev->base_address);
@@ -1580,7 +1580,7 @@ nic_pci_write(int func, int addr, uint8_t val, void *priv)
... ...
} }
#endif #endif
dev->pci_regs[addr] = val & 0x23; dev->pci_regs[addr] = val & 0x03;
break; break;
#if 0 #if 0
@@ -1602,7 +1602,7 @@ nic_pci_write(int func, int addr, uint8_t val, void *priv)
#endif #endif
case 0x10: /* PCI_BAR */ case 0x10: /* PCI_BAR */
val &= 0xfc; /* 0xe0 acc to RTL DS */ val &= 0xe0; /* 0xe0 acc to RTL DS */
val |= 0x01; /* re-enable IOIN bit */ val |= 0x01; /* re-enable IOIN bit */
/*FALLTHROUGH*/ /*FALLTHROUGH*/
@@ -1636,8 +1636,8 @@ nic_pci_write(int func, int addr, uint8_t val, void *priv)
case 0x32: /* PCI_ROMBAR */ case 0x32: /* PCI_ROMBAR */
case 0x33: /* PCI_ROMBAR */ case 0x33: /* PCI_ROMBAR */
dev->pci_bar[1].addr_regs[addr & 3] = val; dev->pci_bar[1].addr_regs[addr & 3] = val;
dev->pci_bar[1].addr_regs[1] &= dev->bios_mask; /* dev->pci_bar[1].addr_regs[1] &= dev->bios_mask; */
dev->pci_bar[1].addr &= 0xffffe001; dev->pci_bar[1].addr &= 0xffff8001;
dev->bios_addr = dev->pci_bar[1].addr; dev->bios_addr = dev->pci_bar[1].addr;
nic_update_bios(dev); nic_update_bios(dev);
return; return;
@@ -1967,15 +1967,19 @@ nic_init(int board)
* *
* We do this here, so the I/O routines are generic. * We do this here, so the I/O routines are generic.
*/ */
memset(dev->pci_regs, 0, PCI_REGSIZE);
dev->pci_regs[0x00] = (PCI_VENDID&0xff); dev->pci_regs[0x00] = (PCI_VENDID&0xff);
dev->pci_regs[0x01] = (PCI_VENDID>>8); dev->pci_regs[0x01] = (PCI_VENDID>>8);
dev->pci_regs[0x02] = (PCI_DEVID&0xff); dev->pci_regs[0x02] = (PCI_DEVID&0xff);
dev->pci_regs[0x03] = (PCI_DEVID>>8); dev->pci_regs[0x03] = (PCI_DEVID>>8);
dev->pci_regs[0x04] = 0x01; /* IOEN */ dev->pci_regs[0x04] = 0x03; /* IOEN */
dev->pci_regs[0x05] = 0x00; dev->pci_regs[0x05] = 0x00;
dev->pci_regs[0x07] = 0x02; /* DST0, medium devsel */ dev->pci_regs[0x07] = 0x02; /* DST0, medium devsel */
dev->pci_regs[0x09] = 0x00; /* PIFR */
dev->pci_regs[0x0B] = 0x02; /* BCR: Network Controller */ dev->pci_regs[0x0B] = 0x02; /* BCR: Network Controller */
dev->pci_regs[0x0A] = 0x00; /* SCR: Ethernet */ dev->pci_regs[0x0A] = 0x00; /* SCR: Ethernet */
@@ -1984,14 +1988,14 @@ nic_init(int board)
dev->pci_regs[0x2E] = (PCI_DEVID&0xff); dev->pci_regs[0x2E] = (PCI_DEVID&0xff);
dev->pci_regs[0x2F] = (PCI_DEVID>>8); dev->pci_regs[0x2F] = (PCI_DEVID>>8);
dev->pci_regs[0x3D] = PCI_INTC; /* PCI_IPR */ dev->pci_regs[0x3D] = PCI_INTA; /* PCI_IPR */
/* Enable our address space in PCI. */ /* Enable our address space in PCI. */
dev->pci_bar[0].addr_regs[0] = 0x01; dev->pci_bar[0].addr_regs[0] = 0x01;
/* Enable our BIOS space in PCI, if needed. */ /* Enable our BIOS space in PCI, if needed. */
if (dev->bios_addr > 0) { if (dev->bios_addr > 0) {
dev->pci_bar[1].addr = 0x000F8000; dev->pci_bar[1].addr = 0xFFFF8000;
dev->pci_bar[1].addr_regs[1] = dev->bios_mask; dev->pci_bar[1].addr_regs[1] = dev->bios_mask;
} else { } else {
dev->pci_bar[1].addr = 0; dev->pci_bar[1].addr = 0;