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

Added missing variable declarations in pc87306.c;

Browse Source 
Both PIIX IDE bus masters now initialize with IRQ set to 14 rather than not set.
This commit is contained in:
OBattler
2016-09-22 21:33:14 +02:00
parent 6318e2bb17
commit b956c5f6f5
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pc87306.c
View File

@@ -43,12 +43,14 @@ uint8_t uart_int2()
uint8_t uart1_int() uint8_t uart1_int()
{ {
uint8_t temp;
temp = ((pc87306_regs[1] >> 2) & 1) ? 3 : 4; /* 0 = IRQ 4, 1 = IRQ 3 */ temp = ((pc87306_regs[1] >> 2) & 1) ? 3 : 4; /* 0 = IRQ 4, 1 = IRQ 3 */
return (pc87306_regs[0x1C] & 1) ? uart_int1() : temp; return (pc87306_regs[0x1C] & 1) ? uart_int1() : temp;
} }
uint8_t uart2_int() uint8_t uart2_int()
{ {
uint8_t temp;
temp = ((pc87306_regs[1] >> 4) & 1) ? 3 : 4; /* 0 = IRQ 4, 1 = IRQ 3 */ temp = ((pc87306_regs[1] >> 4) & 1) ? 3 : 4; /* 0 = IRQ 4, 1 = IRQ 3 */
return (pc87306_regs[0x1C] & 1) ? uart_int2() : temp; return (pc87306_regs[0x1C] & 1) ? uart_int2() : temp;
} }

3
src/piix.c
View File

@@ -519,7 +519,7 @@ void piix_init(int card)
card_piix_ide[0x0d] = 0x00; card_piix_ide[0x0d] = 0x00;
card_piix_ide[0x0e] = 0x00; card_piix_ide[0x0e] = 0x00;
card_piix_ide[0x20] = 0x01; card_piix_ide[0x21] = card_piix_ide[0x22] = card_piix_ide[0x23] = 0x00; /*Bus master interface base address*/ card_piix_ide[0x20] = 0x01; card_piix_ide[0x21] = card_piix_ide[0x22] = card_piix_ide[0x23] = 0x00; /*Bus master interface base address*/
card_piix_ide[0x3C] = 14; /* Default IRQ */ card_piix_ide[0x3c] = 14; /* Default IRQ */
card_piix_ide[0x40] = card_piix_ide[0x41] = 0x00; card_piix_ide[0x40] = card_piix_ide[0x41] = 0x00;
card_piix_ide[0x42] = card_piix_ide[0x43] = 0x00; card_piix_ide[0x42] = card_piix_ide[0x43] = 0x00;
@@ -565,6 +565,7 @@ void piix3_init(int card)
card_piix_ide[0x0d] = 0x00; card_piix_ide[0x0d] = 0x00;
card_piix_ide[0x0e] = 0x00; card_piix_ide[0x0e] = 0x00;
card_piix_ide[0x20] = 0x01; card_piix_ide[0x21] = card_piix_ide[0x22] = card_piix_ide[0x23] = 0x00; /*Bus master interface base address*/ card_piix_ide[0x20] = 0x01; card_piix_ide[0x21] = card_piix_ide[0x22] = card_piix_ide[0x23] = 0x00; /*Bus master interface base address*/
card_piix_ide[0x3c] = 14; /* Default IRQ */
card_piix_ide[0x40] = card_piix_ide[0x41] = 0x00; card_piix_ide[0x40] = card_piix_ide[0x41] = 0x00;
card_piix_ide[0x42] = card_piix_ide[0x43] = 0x00; card_piix_ide[0x42] = card_piix_ide[0x43] = 0x00;
card_piix_ide[0x44] = 0x00; card_piix_ide[0x44] = 0x00;