Merge gblack@m5.eecs.umich.edu:/bk/multiarch

[gem5.git] / dev / ide_disk.hh

diff --git a/dev/ide_disk.hh b/dev/ide_disk.hh
index 9799e2d380ec3d8b146ba08f96b8369eccdd7532..a656ca464ef8c14ae52a5480fa0ecc9800ffbf60 100644 (file)
--- a/dev/ide_disk.hh
+++ b/dev/ide_disk.hh
@@ -270,8 +270,8 @@ class IdeDisk : public SimObject
     }
 
     // Device register read/write
-    void read(const Addr &offset, RegType_t type, uint8_t *data);
-    void write(const Addr &offset, bool byte, bool cmdBlk, const uint8_t *data);
+    void read(const Addr &offset, IdeRegType regtype, uint8_t *data);
+    void write(const Addr &offset, IdeRegType regtype, const uint8_t *data);
 
     // Start/abort functions
     void startDma(const uint32_t &prdTableBase);