From: Ali Saidi <saidi@eecs.umich.edu>
Date: Wed, 14 Jan 2004 09:07:07 +0000 (-0500)
Subject: Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/alpha-system
X-Git-Tag: stable_2012_02_02~553^2~2^2~44
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=edd7e46eb89787103a5741350cd10be310129df8;p=gem5.git

Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/alpha-system
into zizzer.eecs.umich.edu:/y/saidi/alpha-system
---

edd7e46eb89787103a5741350cd10be310129df8
diff --cc system/alpha/console/console.c
index d62dfdb70,3ae97425b..0697be63a
--- a/system/alpha/console/console.c
+++ b/system/alpha/console/console.c
@@@ -1128,11 -1129,12 +1130,11 @@@ CallBackDispatcher(long a0, long a1, lo
     long i;
     switch (a0) {
     case CONSCB_GETC:
 -      break;
 +     return GetChar();
  
     case CONSCB_PUTS:
 -      for(i = 0; i < a3; i++) {
 +      for(i = 0; i < a3; i++)
-          PutChar(*(char *)a2+i);
+          PutChar(*((char *)a2+i));
 -      }
        return a3;
  
     case CONSCB_GETENV: