diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/alpha_access.h | 5 | ||||
| -rw-r--r-- | dev/alpha_console.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/dev/alpha_access.h b/dev/alpha_access.h index c0a571ced..07350d622 100644 --- a/dev/alpha_access.h +++ b/dev/alpha_access.h @@ -33,12 +33,15 @@ * System Console Memory Mapped Register Definition */ -#define ALPHA_ACCESS_VERSION (1301) +#define ALPHA_ACCESS_VERSION (1302) #ifndef CONSOLE #include <iosfwd> #include <string> class Checkpoint; +#else +typedef unsigned uint32_t; +typedef unsigned long uint64_t; #endif // This structure hacked up from simos diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc index 3ae1aede5..2cbe60f47 100644 --- a/dev/alpha_console.cc +++ b/dev/alpha_console.cc @@ -108,7 +108,8 @@ AlphaConsole::read(MemReqPtr &req, uint8_t *data) switch (req->size) { case sizeof(uint32_t): - DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr, *(uint32_t*)data); + DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr, + *(uint32_t*)data); switch (daddr) { case offsetof(AlphaAccess, last_offset): @@ -133,7 +134,8 @@ AlphaConsole::read(MemReqPtr &req, uint8_t *data) } break; case sizeof(uint64_t): - DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr, *(uint64_t*)data); + DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr, + *(uint64_t*)data); switch (daddr) { case offsetof(AlphaAccess, inputChar): |