summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Bukin <br@bsdpad.com>2015-04-03 11:42:10 -0500
committerRuslan Bukin <br@bsdpad.com>2015-04-03 11:42:10 -0500
commitb3314673f456a9686559ec95cbee2302c3214921 (patch)
tree20fca4d16a2dce3037a8e7f7e274779424af1d00
parent305e29b98ef369bcf5574a0a462f43c0bbc7ba5b (diff)
downloadgem5-b3314673f456a9686559ec95cbee2302c3214921.tar.xz
dev: Extend access width for IDE control registers
Add 32-bit access width for PrimaryTiming register and 16bit for UDMAControl register as FreeBSD required. Committed by: Nilay Vaish <nilay@cs.wisc.edu>
-rw-r--r--src/dev/ide_ctrl.cc26
1 files changed, 22 insertions, 4 deletions
diff --git a/src/dev/ide_ctrl.cc b/src/dev/ide_ctrl.cc
index 27757529a..d931fab2b 100644
--- a/src/dev/ide_ctrl.cc
+++ b/src/dev/ide_ctrl.cc
@@ -202,6 +202,9 @@ IdeController::readConfig(PacketPtr pkt)
break;
case sizeof(uint16_t):
switch (offset) {
+ case UDMAControl:
+ pkt->set<uint16_t>(udmaControl);
+ break;
case PrimaryTiming:
pkt->set<uint16_t>(primaryTiming);
break;
@@ -222,10 +225,16 @@ IdeController::readConfig(PacketPtr pkt)
(uint32_t)pkt->get<uint16_t>());
break;
case sizeof(uint32_t):
- if (offset == IDEConfig)
+ switch (offset) {
+ case PrimaryTiming:
+ pkt->set<uint32_t>(primaryTiming);
+ break;
+ case IDEConfig:
pkt->set<uint32_t>(ideConfig);
- else
+ break;
+ default:
panic("No 32bit reads implemented for this device.");
+ }
DPRINTF(IdeCtrl, "PCI read offset: %#x size: 4 data: %#x\n", offset,
(uint32_t)pkt->get<uint32_t>());
break;
@@ -268,6 +277,9 @@ IdeController::writeConfig(PacketPtr pkt)
break;
case sizeof(uint16_t):
switch (offset) {
+ case UDMAControl:
+ udmaControl = pkt->get<uint16_t>();
+ break;
case PrimaryTiming:
primaryTiming = pkt->get<uint16_t>();
break;
@@ -289,10 +301,16 @@ IdeController::writeConfig(PacketPtr pkt)
offset, (uint32_t)pkt->get<uint16_t>());
break;
case sizeof(uint32_t):
- if (offset == IDEConfig)
+ switch (offset) {
+ case PrimaryTiming:
+ primaryTiming = pkt->get<uint32_t>();
+ break;
+ case IDEConfig:
ideConfig = pkt->get<uint32_t>();
- else
+ break;
+ default:
panic("Write of unimplemented PCI config. register: %x\n", offset);
+ }
break;
default:
panic("invalid access size(?) for PCI configspace!\n");