Hand merge ide_disk.cc

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

--HG--
extra : convert_revision : 643bcf15b52c3e14231d8136b8cb049a8896457a

1 files changed, 10 insertions, 11 deletions

diff --git a/dev/tsunami_io.hh b/dev/tsunami_io.hh
index dca651d4b..4b28635e8 100644
--- a/dev/tsunami_io.hh
+++ b/dev/tsunami_io.hh
@@ -75,18 +75,14 @@ class TsunamiIO : public PioDevice
         uint8_t mode;
         /** The status of the PIT */
         uint8_t status;
-        /** The counts (current and latched) of the PIT */
-        union {
-            uint16_t whole;
-            struct {
-                uint8_t msb;
-                uint8_t lsb;
-            } half;
-        } current_count, latched_count;
-
-        /** Thse state of the output latch of the PIT */
+        /** The current count of the PIT */
+        uint16_t current_count;
+        /** The latched count of the PIT */
+        uint16_t latched_count;
+        /** The state of the output latch of the PIT */
         bool latch_on;
-        bool read_msb;
+        /** The next count half (byte) to read */
+        enum {READ_LSB, READ_MSB} read_byte;
 
       public:
         /**
@@ -158,6 +154,9 @@ class TsunamiIO : public PioDevice
         Tsunami* tsunami;
         Tick interval;
 
+        /** Count of the number of RTC interrupts that have occured */
+        uint32_t intr_count;
+
       public:
         /**
          * RTC Event initializes the RTC event by scheduling an event