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

Merge pull request #3527 from jriwanek-forks/devbranch-fix

Browse Source 
Fix missed bits from pci rewrite in pci_dummy.c
This commit is contained in:
Miran Grča
2023-08-08 21:23:44 +02:00
committed by GitHub
parent 3796eb8163 914e1b92b4
commit b28d82a38e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/pci_dummy.c
View File

@@ -17,7 +17,8 @@ typedef struct pci_dummy_t {
bar_t pci_bar[2]; bar_t pci_bar[2];
uint8_t card; uint8_t pci_slot;
uint8_t irq_state;
uint8_t interrupt_on; uint8_t interrupt_on;
uint8_t irq_level; uint8_t irq_level;
@@ -28,9 +29,9 @@ pci_dummy_interrupt(int set, pci_dummy_t *dev)
{ {
if (set != dev->irq_level) { if (set != dev->irq_level) {
if (set) if (set)
pci_set_irq(dev->card, PCI_INTA); pci_set_irq(dev->pci_slot, PCI_INTA, &dev->irq_state);
else else
pci_clear_irq(dev->card, PCI_INTA); pci_clear_irq(dev->pci_slot, PCI_INTA, &dev->irq_state);
} }
dev->irq_level = set; dev->irq_level = set;
@@ -166,8 +167,8 @@ pci_dummy_pci_read(int func, int addr, void *priv)
ret = dev->pci_regs[addr]; ret = dev->pci_regs[addr];
break; break;
case 0x08: /* Techncially, revision, but we return the card (slot) here. */ case 0x08: /* Techncially, revision, but we return the slot here. */
ret = dev->card; ret = dev->pci_slot;
break; break;
case 0x10: /* PCI_BAR 7:5 */ case 0x10: /* PCI_BAR 7:5 */
@@ -242,7 +243,7 @@ pci_dummy_pci_write(int func, int addr, uint8_t val, void *priv)
break; break;
case 0x3c: /* PCI_ILR */ case 0x3c: /* PCI_ILR */
pclog("AB0B:071A Device %02X: IRQ now: %i\n", dev->card, val); pclog("AB0B:071A Device %02X: IRQ now: %i\n", dev->pci_slot, val);
dev->pci_regs[addr] = val; dev->pci_regs[addr] = val;
return; return;
@@ -279,7 +280,7 @@ pci_dummy_card_init(UNUSED(const device_t *info))
{ {
pci_dummy_t *dev = (pci_dummy_t *) calloc(1, sizeof(pci_dummy_t)); pci_dummy_t *dev = (pci_dummy_t *) calloc(1, sizeof(pci_dummy_t));
dev->card = pci_add_card(PCI_ADD_NORMAL, pci_dummy_pci_read, pci_dummy_pci_write, dev); pci_add_card(PCI_ADD_NORMAL, pci_dummy_pci_read, pci_dummy_pci_write, dev, &dev->pci_slot);
return dev; return dev;
} }