x86: Adjust the size of the values written to the x87 misc registers

[gem5.git] / src / dev / uart.cc

diff --git a/src/dev/uart.cc b/src/dev/uart.cc
index c9a2ae964d320eb28b4177452f6c5f18ea0ecafb..f232f0f2847c5916f49d88ed7f9f5e000032998b 100644 (file)
--- a/src/dev/uart.cc
+++ b/src/dev/uart.cc
@@ -32,17 +32,19 @@
  * Implements a base class for UARTs
  */
 
-#include "dev/simconsole.hh"
-#include "dev/uart.hh"
 #include "dev/platform.hh"
+#include "dev/terminal.hh"
+#include "dev/uart.hh"
 
 using namespace std;
 
-Uart::Uart(const Params *p)
-    : BasicPioDevice(p), platform(p->platform), cons(p->sim_console)
+Uart::Uart(const Params *p, Addr pio_size)
+    : BasicPioDevice(p, pio_size),
+      platform(p->platform), term(p->terminal),
+      callbackDataAvail(this)
 {
     status = 0;
 
-    // set back pointers
-    cons->uart = this;
+    // setup terminal callbacks
+    term->regDataAvailCallback(&callbackDataAvail);
 }