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

Applied the recent mainline PCem commits (and fixed the Pentium machines);

Browse Source 
Ported the Roland MT-32 emulation (using MUNT) from bit's MT32 emulation branch of PCem;
Sanitized the OpenAL give buffer code in openal.c a bit;
NVR path is now specifiable in the Settings dialog;
Added Logitech 3-button serial mouse per protocol description by waltje;
The RTL8029AS and the BT-958D now actually use the PCI IRQ routing;
Fixed BT-958D PCI device initialization on the bus;
PCI IRQ routing now respects the edge/level setting set on ports 4D0/4D1.
This commit is contained in:
OBattler
2017-06-19 06:46:08 +02:00
parent 9c9f7b1b9a
commit 1e7668f1db
112 changed files with 16289 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/scsi_buslogic.c
View File

@@ -529,18 +529,7 @@ BuslogicLog(const char *format, ...)
static void
BuslogicInterrupt(Buslogic_t *bl, int set)
{
if ((bl->chip != CHIP_BUSLOGIC_PCI) || (bl->Irq != 255))
{
if (set)
{
picint(1 << bl->Irq);
}
else
{
picintc(1 << bl->Irq);
}
}
else
if (bl->chip == CHIP_BUSLOGIC_PCI)
{
if (set)
{
@@ -551,6 +540,17 @@ BuslogicInterrupt(Buslogic_t *bl, int set)
pci_clear_irq(bl->Card, PCI_INTA);
}
}
else
{
if (set)
{
picint(1 << bl->Irq);
}
else
{
picintc(1 << bl->Irq);
}
}
}
@@ -2286,7 +2286,7 @@ BuslogicInit(int chip)
&BuslogicCallback, &BuslogicCallback, bl);
if (bl->chip == CHIP_BUSLOGIC_PCI) {
pci_add(BuslogicPCIRead, BuslogicPCIWrite, bl);
bl->Card = pci_add(BuslogicPCIRead, BuslogicPCIWrite, bl);
buslogic_pci_bar[0].addr_regs[0] = 1;
buslogic_pci_bar[1].addr_regs[0] = 0;