From: Ali Saidi <saidi@eecs.umich.edu>
Date: Wed, 11 Feb 2004 20:36:36 +0000 (-0500)
Subject: Merge
X-Git-Tag: m5_1.0_tutorial~378
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=29eae76153c325e1b16785e65381075eaeaa7d3b;p=gem5.git

Merge

dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
dev/tsunami_uart.cc:
    SCCS merged

--HG--
extra : convert_revision : da3d1998d6dd39e0d3f8754074c513cdd8a4193c
---

29eae76153c325e1b16785e65381075eaeaa7d3b
diff --cc dev/tsunami_uart.cc
index 9e7207d9c,4b9e7a76b..6f15c5ee0
--- a/dev/tsunami_uart.cc
+++ b/dev/tsunami_uart.cc
@@@ -118,8 -116,7 +118,7 @@@ TsunamiUart::read(MemReqPtr &req, uint8
          else
              *data = 0;
          return No_Fault;
 -      case 0xA:
 +      case 0x2:
-         //*data = 2<<6; // This means a 8250 serial port, do we want a 16550?
          *data = 0; // This means a 8250 serial port, do we want a 16550?
          return No_Fault;
      }