From b956c5f6f5d23c70c5e2204a502edb1d78afe7d9 Mon Sep 17 00:00:00 2001 From: OBattler Date: Thu, 22 Sep 2016 21:33:14 +0200 Subject: [PATCH] Added missing variable declarations in pc87306.c; Both PIIX IDE bus masters now initialize with IRQ set to 14 rather than not set. --- src/pc87306.c | 2 ++ src/piix.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pc87306.c b/src/pc87306.c index b3d44957b..0a8989737 100644 --- a/src/pc87306.c +++ b/src/pc87306.c @@ -43,12 +43,14 @@ uint8_t uart_int2() uint8_t uart1_int() { + uint8_t temp; temp = ((pc87306_regs[1] >> 2) & 1) ? 3 : 4; /* 0 = IRQ 4, 1 = IRQ 3 */ return (pc87306_regs[0x1C] & 1) ? uart_int1() : temp; } uint8_t uart2_int() { + uint8_t temp; temp = ((pc87306_regs[1] >> 4) & 1) ? 3 : 4; /* 0 = IRQ 4, 1 = IRQ 3 */ return (pc87306_regs[0x1C] & 1) ? uart_int2() : temp; } diff --git a/src/piix.c b/src/piix.c index dbf66a0fc..fcb8988d4 100644 --- a/src/piix.c +++ b/src/piix.c @@ -519,7 +519,7 @@ void piix_init(int card) card_piix_ide[0x0d] = 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[0x3C] = 14; /* Default IRQ */ + card_piix_ide[0x3c] = 14; /* Default IRQ */ card_piix_ide[0x40] = card_piix_ide[0x41] = 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[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[0x3c] = 14; /* Default IRQ */ card_piix_ide[0x40] = card_piix_ide[0x41] = 0x00; card_piix_ide[0x42] = card_piix_ide[0x43] = 0x00; card_piix_ide[0x44] = 0x00;