diff options
| author | Benjamin Nash <benash@umich.edu> | 2005-06-27 18:08:42 -0400 |
|---|---|---|
| committer | Benjamin Nash <benash@umich.edu> | 2005-06-27 18:08:42 -0400 |
| commit | 8b042182626b94ed6380f0ba6b99c0e862aa710f (patch) | |
| tree | f77e69fddaa5146c6be9467054e890a4661fc149 /dev/ide_disk.hh | |
| parent | 0460a78829c000f033d703bb814ca39a835014a0 (diff) | |
| download | gem5-8b042182626b94ed6380f0ba6b99c0e862aa710f.tar.xz | |
Change IDE disk and ethernet device to work better with FreeBSD.
dev/ide_ctrl.cc:
dev/ide_disk.cc:
dev/ide_disk.hh:
Add support for 32-bit accesses.
dev/ns_gige.cc:
Change default configuration register value to work with FreeBSD driver.
--HG--
extra : convert_revision : c9dd125338a97ffa8cd95293e6b7877068652387
Diffstat (limited to 'dev/ide_disk.hh')
| -rw-r--r-- | dev/ide_disk.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/ide_disk.hh b/dev/ide_disk.hh index 506f0c7cb..0fcd863ec 100644 --- a/dev/ide_disk.hh +++ b/dev/ide_disk.hh @@ -35,6 +35,7 @@ #include "dev/disk_image.hh" #include "dev/ide_atareg.h" +#include "dev/ide_ctrl.hh" #include "dev/ide_wdcreg.h" #include "dev/io_device.hh" #include "sim/eventq.hh" @@ -103,9 +104,8 @@ class PrdTableEntry { #define DEV1 (1) typedef struct CommandReg { - uint8_t data0; + uint16_t data; union { - uint8_t data1; uint8_t error; uint8_t features; }; @@ -272,7 +272,7 @@ class IdeDisk : public SimObject } // Device register read/write - void read(const Addr &offset, bool byte, bool cmdBlk, uint8_t *data); + uint16_t read(const Addr &offset, RegType_t type); void write(const Addr &offset, bool byte, bool cmdBlk, const uint8_t *data); // Start/abort functions |