Merge with the main repository again.

[gem5.git] / src / dev / sparc / mm_disk.cc

diff --git a/src/dev/sparc/mm_disk.cc b/src/dev/sparc/mm_disk.cc
index f9a91ededc9a0b8170c94ab222cf4b7b31b822a6..1921f6d96af60447e7e3e65c2d55ae40f8218b5f 100644 (file)
--- a/src/dev/sparc/mm_disk.cc
+++ b/src/dev/sparc/mm_disk.cc
@@ -36,6 +36,7 @@
 #include <cstring>
 
 #include "base/trace.hh"
+#include "debug/IdeDisk.hh"
 #include "dev/sparc/mm_disk.hh"
 #include "dev/platform.hh"
 #include "mem/packet_access.hh"
@@ -82,7 +83,7 @@ MmDisk::read(PacketPtr pkt)
         break;
       case sizeof(uint16_t):
         memcpy(&d16, diskData + (accessAddr % SectorSize), 2);
-        pkt->set(htobe(d32));
+        pkt->set(htobe(d16));
         DPRINTF(IdeDisk, "reading word %#x value= %#x\n", accessAddr, d16);
         break;
       case sizeof(uint32_t):