From 74fd4f68c5a7df2efba11497ba1ab5ab62b0b1bf Mon Sep 17 00:00:00 2001
From: Miguel Serrano <mserrano@umich.edu>
Date: Thu, 28 Jul 2005 11:49:01 -0400
Subject: .

SConscript:
    add pcifake
dev/ide_ctrl.cc:
dev/ide_ctrl.hh:
dev/ide_disk.cc:
dev/ide_disk.hh:
    endianess
dev/tsunami_io.cc:
    rtc, date/time

--HG--
extra : convert_revision : 21ad27c780749cb6f6eef2b57798c0c292c3f14d
---
 dev/ide_disk.hh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'dev/ide_disk.hh')

diff --git a/dev/ide_disk.hh b/dev/ide_disk.hh
index 0fcd863ec..ceec11925 100644
--- a/dev/ide_disk.hh
+++ b/dev/ide_disk.hh
@@ -84,6 +84,7 @@ class PrdTableEntry {
 #define LCYL_OFFSET     (4)
 #define HCYL_OFFSET     (5)
 #define SELECT_OFFSET   (6)
+#define DRIVE_OFFSET    (6)
 #define STATUS_OFFSET   (7)
 #define COMMAND_OFFSET  (7)
 
@@ -105,10 +106,7 @@ class PrdTableEntry {
 
 typedef struct CommandReg {
     uint16_t data;
-    union {
-        uint8_t error;
-        uint8_t features;
-    };
+    uint8_t error;
     uint8_t sec_count;
     uint8_t sec_num;
     uint8_t cyl_low;
@@ -272,8 +270,8 @@ class IdeDisk : public SimObject
     }
 
     // Device register read/write
-    uint16_t read(const Addr &offset, RegType_t type);
-    void write(const Addr &offset, bool byte, bool cmdBlk, const uint8_t *data);
+    void read(const Addr &offset, RegType_t type, uint8_t *data);
+    void write(const Addr &offset, RegType_t type, const uint8_t *data);
 
     // Start/abort functions
     void startDma(const uint32_t &prdTableBase);
-- 
cgit v1.2.3