Merge

--HG-- extra : convert_revision : 10c28ac66c7e71615a239783e21ab36a47de992c
2005-02-13 23:05:47 -05:00
parent 10ee909fbd 57482491c5
commit 538d7d19c8
4 changed files with 9 additions and 19 deletions
--- a/dev/tsunami_cchip.cc
+++ b/dev/tsunami_cchip.cc
@@ -176,7 +176,7 @@ TsunamiCChip::read(MemReqPtr &req, uint8_t *data)
          if (regnum == TSDEV_CC_DRIR) {
              warn("accessing DRIR with 32 bit read, "
                   "hopefully your just reading this for timing");
-              *(uint64_t*)data = drir;
+              *(uint32_t*)data = drir;
          } else
              panic("invalid access size(?) for tsunami register!\n");
          return No_Fault;