diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2005-06-05 00:45:10 -0400 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2005-06-05 00:45:10 -0400 |
| commit | fb1282de1a39412b45a48cacc4fbea953008e1cd (patch) | |
| tree | 3fc965503e06eedded24a4f89d9765f8d7dc2349 /dev/ide_disk.hh | |
| parent | 13c005a8af79a8481879ce099b45a1f98faae165 (diff) | |
| parent | 87d27637aa2e99d5218e2e5dd5b728a3d650a2e7 (diff) | |
| download | gem5-fb1282de1a39412b45a48cacc4fbea953008e1cd.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/m5
into crampon.my.domain:/z/binkertn/research/m5/head
--HG--
extra : convert_revision : b0c9b044b44a1bfc4cded2ebfa240b799dd4a5a0
Diffstat (limited to 'dev/ide_disk.hh')
| -rw-r--r-- | dev/ide_disk.hh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dev/ide_disk.hh b/dev/ide_disk.hh index 703625595..f9a413e1e 100644 --- a/dev/ide_disk.hh +++ b/dev/ide_disk.hh @@ -33,8 +33,9 @@ #ifndef __IDE_DISK_HH__ #define __IDE_DISK_HH__ -#include "dev/ide.hh" #include "dev/disk_image.hh" +#include "dev/ide_atareg.h" +#include "dev/ide_wdcreg.h" #include "dev/io_device.hh" #include "sim/eventq.hh" @@ -204,7 +205,7 @@ class IdeDisk : public SimObject private: /** Drive identification structure for this disk */ - struct hd_driveid driveID; + struct ataparams driveID; /** Data buffer for transfers */ uint8_t *dataBuffer; /** Number of bytes in command data transfer */ |