Hand merge ide_disk.cc

dev/ide_disk.cc:
    Don't initialize data to 0.

--HG--
extra : convert_revision : 643bcf15b52c3e14231d8136b8cb049a8896457a

1 files changed, 26 insertions, 10 deletions

diff --git a/dev/ide_ctrl.hh b/dev/ide_ctrl.hh
index 4b54c3d57..2164f2f4a 100644
--- a/dev/ide_ctrl.hh
+++ b/dev/ide_ctrl.hh
@@ -64,15 +64,9 @@
 #define IDE_COMMAND_OFFSET      IDE_STATUS_OFFSET
 
 // PCI device specific register byte offsets
-#define PCI_IDE_TIMING    0x40
-#define PCI_SLAVE_TIMING  0x44
-#define PCI_UDMA33_CTRL   0x48
-#define PCI_UDMA33_TIMING 0x4a
+#define IDE_CTRL_CONFIG_START 0x40
+#define IDE_CTRL_CONFIG_END ((IDE_CTRL_CONFIG_START) + sizeof(pci_config_regs))
 
-#define IDETIM  (0)
-#define SIDETIM (4)
-#define UDMACTL (5)
-#define UDMATIM (6)
 
 typedef enum RegType {
     COMMAND_BLOCK = 0,
@@ -119,8 +113,30 @@ class IdeController : public PciDev
     uint8_t bmi_regs[16];
     /** Shadows of the device select bit */
     uint8_t dev[2];
-    /** Registers used in PCI configuration */
-    uint8_t pci_regs[8];
+    /** Registers used in device specific PCI configuration */
+    union {
+        uint8_t data[22];
+
+        struct {
+            uint32_t idetim;
+            uint8_t sidetim;
+            uint8_t reserved_45;
+            uint8_t reserved_46;
+            uint8_t reserved_47;
+            uint8_t udmactl;
+            uint8_t reserved_49;
+            uint16_t udmatim;
+            uint8_t reserved_4c;
+            uint8_t reserved_4d;
+            uint8_t reserved_4e;
+            uint8_t reserved_4f;
+            uint8_t reserved_50;
+            uint8_t reserved_51;
+            uint8_t reserved_52;
+            uint8_t reserved_53;
+            uint16_t ideconfig;
+        };
+    } pci_config_regs;
 
     // Internal management variables
     bool io_enabled;