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

Fixed STPC PCI IRQ steering and silenced the massive Voodoo warning.

Browse Source
This commit is contained in:
OBattler
2020-07-10 03:10:07 +02:00
parent 72c1c36ec6
commit fec5160bf4
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/chipset/stpc.c
View File

@@ -626,9 +626,9 @@ stpc_reg_write(uint16_t addr, uint8_t val, void *priv)
break; break;
case 0x52: case 0x53: case 0x54: case 0x55: case 0x52: case 0x53: case 0x54: case 0x55:
stpc_log("STPC: Set IRQ routing: INT %c -> %d\n", 0x41 + ((dev->reg_offset & 0x03) ^ 0x02), (val & 0x80) ? (val & 0xf) : -1); stpc_log("STPC: Set IRQ routing: INT %c -> %d\n", 0x41 + (dev->reg_offset & 0x03), (val & 0x80) ? (val & 0xf) : -1);
val &= 0x8f; val &= 0x8f;
pci_set_irq_routing(PCI_INTA + ((dev->reg_offset & 0x03) ^ 0x02), (val & 0x80) ? (val & 0xf) : PCI_IRQ_DISABLED); pci_set_irq_routing(PCI_INTA + (dev->reg_offset & 0x03), (val & 0x80) ? (val & 0xf) : PCI_IRQ_DISABLED);
break; break;
case 0x56: case 0x57: case 0x56: case 0x57:

3
src/include/86box/vid_voodoo_codegen_x86-64.h
View File

@@ -41,7 +41,8 @@ static int last_block[2] = {0, 0};
static int next_block_to_write[2] = {0, 0}; static int next_block_to_write[2] = {0, 0};
#define addbyte(val) \ #define addbyte(val) \
code_block[block_pos++] = val; \ if (block_pos < BLOCK_SIZE) \
code_block[block_pos++] = val; \
if (block_pos >= BLOCK_SIZE) \ if (block_pos >= BLOCK_SIZE) \
fatal("Over!\n") fatal("Over!\n")

3
src/include/86box/vid_voodoo_codegen_x86.h
View File

@@ -39,7 +39,8 @@ static int last_block[2] = {0, 0};
static int next_block_to_write[2] = {0, 0}; static int next_block_to_write[2] = {0, 0};
#define addbyte(val) \ #define addbyte(val) \
code_block[block_pos++] = val; \ if (block_pos < BLOCK_SIZE) \
code_block[block_pos++] = val; \
if (block_pos >= BLOCK_SIZE) \ if (block_pos >= BLOCK_SIZE) \
fatal("Over!\n") fatal("Over!\n")