From a5a2bb12b879529f71929715719affb403d112b2 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Wed, 4 Oct 2023 14:39:46 -0400
Subject: [PATCH] Swap addresses and IRQ's according to Linux Documentation

---
 src/disk/hdc_ide.c          | 20 ++++++++++----------
 src/include/86box/hdc_ide.h | 12 ++++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c
index e84a975ae..61b8728e1 100644
--- a/src/disk/hdc_ide.c
+++ b/src/disk/hdc_ide.c
@@ -140,13 +140,13 @@ static uint8_t ide_ter_pnp_rom[] = {
     0x15, 0x09, 0xf8, 0x00, 0x01, 0x00,             /* logical device BOX0001 */
     0x1c, 0x41, 0xd0, 0x06, 0x00,                   /* compatible device PNP0600 */
     0x31, 0x00,                                     /* start dependent functions, preferred */
-    0x22, 0x00, 0x04,                               /* IRQ 10 */
-    0x47, 0x01, 0x68, 0x01, 0x68, 0x01, 0x01, 0x08, /* I/O 0x168, decodes 16-bit, 1-byte alignment, 8 addresses */
-    0x47, 0x01, 0x6e, 0x03, 0x6e, 0x03, 0x01, 0x01, /* I/O 0x36E, decodes 16-bit, 1-byte alignment, 1 address */
+    0x22, 0x00, 0x08,                               /* IRQ 11 */
+    0x47, 0x01, 0xe8, 0x01, 0xe8, 0x01, 0x01, 0x08, /* I/O 0x168, decodes 16-bit, 1-byte alignment, 8 addresses */
+    0x47, 0x01, 0xee, 0x03, 0xee, 0x03, 0x01, 0x01, /* I/O 0x36E, decodes 16-bit, 1-byte alignment, 1 address */
     0x30,                                           /* start dependent functions, acceptable */
     0x22, 0xb8, 0x1e,                               /* IRQ 3/4/5/7/9/10/11/12 */
-    0x47, 0x01, 0x68, 0x01, 0x68, 0x01, 0x01, 0x08, /* I/O 0x168, decodes 16-bit, 1-byte alignment, 8 addresses */
-    0x47, 0x01, 0x6e, 0x03, 0x6e, 0x03, 0x01, 0x01, /* I/O 0x36E, decodes 16-bit, 1-byte alignment, 1 address */
+    0x47, 0x01, 0xe8, 0x01, 0xe8, 0x01, 0x01, 0x08, /* I/O 0x168, decodes 16-bit, 1-byte alignment, 8 addresses */
+    0x47, 0x01, 0xee, 0x03, 0xee, 0x03, 0x01, 0x01, /* I/O 0x36E, decodes 16-bit, 1-byte alignment, 1 address */
     0x30,                                           /* start dependent functions, acceptable */
     0x22, 0xb8, 0x1e,                               /* IRQ 3/4/5/7/9/10/11/12 */
     0x47, 0x01, 0x00, 0x01, 0xf8, 0xff, 0x08, 0x08, /* I/O 0x100-0xFFF8, decodes 16-bit, 8-byte alignment, 8 addresses */
@@ -163,13 +163,13 @@ static uint8_t ide_qua_pnp_rom[] = {
     0x15, 0x09, 0xf8, 0x00, 0x01, 0x00,             /* logical device BOX0001 */
     0x1c, 0x41, 0xd0, 0x06, 0x00,                   /* compatible device PNP0600 */
     0x31, 0x00,                                     /* start dependent functions, preferred */
-    0x22, 0x00, 0x08,                               /* IRQ 11 */
-    0x47, 0x01, 0xe8, 0x01, 0xe8, 0x01, 0x01, 0x08, /* I/O 0x1E8, decodes 16-bit, 1-byte alignment, 8 addresses */
-    0x47, 0x01, 0xee, 0x03, 0xee, 0x03, 0x01, 0x01, /* I/O 0x3EE, decodes 16-bit, 1-byte alignment, 1 address */
+    0x22, 0x00, 0x04,                               /* IRQ 10 */
+    0x47, 0x01, 0x68, 0x01, 0x68, 0x01, 0x01, 0x08, /* I/O 0x1E8, decodes 16-bit, 1-byte alignment, 8 addresses */
+    0x47, 0x01, 0x6e, 0x03, 0x6e, 0x03, 0x01, 0x01, /* I/O 0x3EE, decodes 16-bit, 1-byte alignment, 1 address */
     0x30,                                           /* start dependent functions, acceptable */
     0x22, 0xb8, 0x1e,                               /* IRQ 3/4/5/7/9/10/11/12 */
-    0x47, 0x01, 0xe8, 0x01, 0xe8, 0x01, 0x01, 0x08, /* I/O 0x1E8, decodes 16-bit, 1-byte alignment, 8 addresses */
-    0x47, 0x01, 0xee, 0x03, 0xee, 0x03, 0x01, 0x01, /* I/O 0x3EE, decodes 16-bit, 1-byte alignment, 1 address */
+    0x47, 0x01, 0x68, 0x01, 0x68, 0x01, 0x01, 0x08, /* I/O 0x1E8, decodes 16-bit, 1-byte alignment, 8 addresses */
+    0x47, 0x01, 0x6e, 0x03, 0x6e, 0x03, 0x01, 0x01, /* I/O 0x3EE, decodes 16-bit, 1-byte alignment, 1 address */
     0x30,                                           /* start dependent functions, acceptable */
     0x22, 0xb8, 0x1e,                               /* IRQ 3/4/5/7/9/10/11/12 */
     0x47, 0x01, 0x00, 0x01, 0xf8, 0xff, 0x08, 0x08, /* I/O 0x100-0xFFF8, decodes 16-bit, 8-byte alignment, 8 addresses */
diff --git a/src/include/86box/hdc_ide.h b/src/include/86box/hdc_ide.h
index 8bac5cf8b..7ecb188e6 100644
--- a/src/include/86box/hdc_ide.h
+++ b/src/include/86box/hdc_ide.h
@@ -28,12 +28,12 @@
 #define HDC_SECONDARY_BASE  0x0170
 #define HDC_SECONDARY_SIDE  0x0376
 #define HDC_SECONDARY_IRQ   15
-#define HDC_TERTIARY_BASE   0x0168
-#define HDC_TERTIARY_SIDE   0x036E
-#define HDC_TERTIARY_IRQ    10
-#define HDC_QUATERNARY_BASE 0x01E8
-#define HDC_QUATERNARY_SIDE 0x03EE
-#define HDC_QUATERNARY_IRQ  11
+#define HDC_TERTIARY_BASE   0x01E8
+#define HDC_TERTIARY_SIDE   0x03EE
+#define HDC_TERTIARY_IRQ    11
+#define HDC_QUATERNARY_BASE 0x0168
+#define HDC_QUATERNARY_SIDE 0x036E
+#define HDC_QUATERNARY_IRQ  10
 
 enum {
     IDE_NONE = 0,