diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2004-02-11 15:36:36 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2004-02-11 15:36:36 -0500 |
| commit | 29eae76153c325e1b16785e65381075eaeaa7d3b (patch) | |
| tree | 61473081de8105d5f421249815de11c69e394604 /dev/tsunami_uart.cc | |
| parent | e72e8b28c8579f56b36b89f1b6cbfba169202f1e (diff) | |
| parent | 0f34a00703bf4dd2cd0ff673e343b72ad5bdc5bd (diff) | |
| download | gem5-29eae76153c325e1b16785e65381075eaeaa7d3b.tar.xz | |
Merge
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
dev/tsunami_uart.cc:
SCCS merged
--HG--
extra : convert_revision : da3d1998d6dd39e0d3f8754074c513cdd8a4193c
Diffstat (limited to 'dev/tsunami_uart.cc')
| -rw-r--r-- | dev/tsunami_uart.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dev/tsunami_uart.cc b/dev/tsunami_uart.cc index 9e7207d9c..6f15c5ee0 100644 --- a/dev/tsunami_uart.cc +++ b/dev/tsunami_uart.cc @@ -119,7 +119,6 @@ TsunamiUart::read(MemReqPtr &req, uint8_t *data) *data = 0; return No_Fault; 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; } @@ -185,6 +184,7 @@ TsunamiUart::serialize(ostream &os) SERIALIZE_SCALAR(status_store); SERIALIZE_SCALAR(next_char); SERIALIZE_SCALAR(valid_char); + SERIALIZE_SCALAR(IER); } void @@ -193,6 +193,7 @@ TsunamiUart::unserialize(Checkpoint *cp, const std::string §ion) UNSERIALIZE_SCALAR(status_store); UNSERIALIZE_SCALAR(next_char); UNSERIALIZE_SCALAR(valid_char); + UNSERIALIZE_SCALAR(IER); } BEGIN_DECLARE_SIM_OBJECT_PARAMS(TsunamiUart) |