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

Removed excess pci_dummy.c logging and added LOG=y to the Mingw makefile to compile without -mwindows.

Browse Source
This commit is contained in:
OBattler
2023-02-11 23:58:43 +01:00
parent e395c59254
commit a76e9f9d77
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pci_dummy.c
View File

@@ -23,9 +23,9 @@ static void
pci_dummy_interrupt(int set, pci_dummy_t *dev) pci_dummy_interrupt(int set, pci_dummy_t *dev)
{ {
if (set) if (set)
pci_set_irq(dev->card, dev->pci_regs[0x3D]); pci_set_irq(dev->card, PCI_INTA);
else else
pci_clear_irq(dev->card, dev->pci_regs[0x3D]); pci_clear_irq(dev->card, PCI_INTA);
} }
static uint8_t static uint8_t
@@ -88,9 +88,7 @@ pci_dummy_write(uint16_t Port, uint8_t Val, void *p)
dev->interrupt_on = 1; dev->interrupt_on = 1;
pci_dummy_interrupt(1, dev); pci_dummy_interrupt(1, dev);
} }
return; break;
default:
return;
} }
} }
@@ -168,7 +166,7 @@ pci_dummy_pci_read(int func, int addr, void *priv)
break; break;
} }
pclog("AB0B:071A: PCI_Read(%d, %04X) = %02X\n", func, addr, ret); // pclog("AB0B:071A: PCI_Read(%d, %04X) = %02X\n", func, addr, ret);
return ret; return ret;
} }
@@ -179,7 +177,7 @@ pci_dummy_pci_write(int func, int addr, uint8_t val, void *priv)
pci_dummy_t *dev = (pci_dummy_t *) priv; pci_dummy_t *dev = (pci_dummy_t *) priv;
uint8_t valxor; uint8_t valxor;
pclog("AB0B:071A: PCI_Write(%d, %04x, %02x)\n", func, addr, val); // pclog("AB0B:071A: PCI_Write(%d, %04X, %02X)\n", func, addr, val);
if (func == 0x00) switch (addr) { if (func == 0x00) switch (addr) {
case 0x04: /* PCI_COMMAND_LO */ case 0x04: /* PCI_COMMAND_LO */
@@ -207,7 +205,7 @@ pci_dummy_pci_write(int func, int addr, uint8_t val, void *priv)
dev->pci_bar[0].addr &= 0xffe0; dev->pci_bar[0].addr &= 0xffe0;
/* Log the new base. */ /* Log the new base. */
pclog("AB0B:071A: PCI: new I/O base is %04X\n", dev->pci_bar[0].addr); // pclog("AB0B:071A: PCI: new I/O base is %04X\n", dev->pci_bar[0].addr);
/* We're done, so get out of the here. */ /* We're done, so get out of the here. */
if (dev->pci_regs[4] & PCI_COMMAND_IO) { if (dev->pci_regs[4] & PCI_COMMAND_IO) {
@@ -217,7 +215,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: IRQ now: %i\n", val); pclog("AB0B:071A Device %02X: IRQ now: %i\n", dev->card, val);
dev->pci_regs[addr] = val; dev->pci_regs[addr] = val;
return; return;
} }

12
src/win/Makefile.mingw
View File

@@ -782,13 +782,19 @@ ifdef EXOBJ
OBJ += $(EXOBJ) OBJ += $(EXOBJ)
endif endif
ifeq ($(LOG), y)
MWIN := -lcomdlg32
else
MWIN := -mwindows
endif
ifeq ($(OPENAL), y) ifeq ($(OPENAL), y)
LIBS := -mwindows -lopenal -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32 LIBS := $(MWIN) -lopenal -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32
else else
ifeq ($(FAUDIO), y) ifeq ($(FAUDIO), y)
LIBS := -mwindows -lfaudio -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32 LIBS := $(MWIN) -lfaudio -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32
else else
LIBS := -mwindows -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32 LIBS := $(MWIN) -lcomctl32 -lSDL2 -limagehlp -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -lws2_32
endif endif
endif endif