diff options
| author | Benjamin Nash <benash@umich.edu> | 2005-07-28 13:16:45 -0400 |
|---|---|---|
| committer | Benjamin Nash <benash@umich.edu> | 2005-07-28 13:16:45 -0400 |
| commit | a115249eb07f6e3c9666bf408e214fcd38a665fb (patch) | |
| tree | 21ea53a2698dc89fdc7f26fc81d45db6d69fbe4f /dev/ide_ctrl.hh | |
| parent | 648c3beb1d4735e423e77f5189c27c28e5b34493 (diff) | |
| parent | 74fd4f68c5a7df2efba11497ba1ab5ab62b0b1bf (diff) | |
| download | gem5-a115249eb07f6e3c9666bf408e214fcd38a665fb.tar.xz | |
Merge zed.eecs.umich.edu:/.automount/fox/y/mserrano/m5_new/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
SConscript:
dev/ide_disk.hh:
Formatting.
dev/ide_ctrl.cc:
Endianness
dev/ide_disk.cc:
dev/pcidev.cc:
dev/tsunami_io.cc:
dev/uart8250.cc:
Clean up code.
--HG--
extra : convert_revision : cb554f0e3a701371d2106cd7e11a4a22f773acc2
Diffstat (limited to 'dev/ide_ctrl.hh')
| -rw-r--r-- | dev/ide_ctrl.hh | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/dev/ide_ctrl.hh b/dev/ide_ctrl.hh index 2164f2f4a..51bdd93b1 100644 --- a/dev/ide_ctrl.hh +++ b/dev/ide_ctrl.hh @@ -110,7 +110,22 @@ class IdeController : public PciDev private: /** Registers used for bus master interface */ - uint8_t bmi_regs[16]; + union { + uint8_t data[16]; + + struct { + uint8_t bmic0; + uint8_t padding_0; + uint8_t bmis0; + uint8_t padding_1; + uint32_t bmidtp0; + uint8_t bmic1; + uint8_t padding_2; + uint8_t bmis1; + uint8_t padding_3; + uint32_t bmidtp1; + }; + } bmi_regs; /** Shadows of the device select bit */ uint8_t dev[2]; /** Registers used in device specific PCI configuration */ |