Merge with head.

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

diff --git a/src/dev/uart.cc b/src/dev/uart.cc
index f769b720b23ee1e83d7ac911b1af6bda1c674e82..c9a2ae964d320eb28b4177452f6c5f18ea0ecafb 100644 (file)
--- a/src/dev/uart.cc
+++ b/src/dev/uart.cc
@@ -35,20 +35,14 @@
 #include "dev/simconsole.hh"
 #include "dev/uart.hh"
 #include "dev/platform.hh"
-#include "sim/builder.hh"
 
 using namespace std;
 
-Uart::Uart(Params *p)
-    : BasicPioDevice(p), platform(p->platform), cons(p->cons)
+Uart::Uart(const Params *p)
+    : BasicPioDevice(p), platform(p->platform), cons(p->sim_console)
 {
-
     status = 0;
 
     // set back pointers
     cons->uart = this;
-    platform->uart = this;
 }
-
-DEFINE_SIM_OBJECT_CLASS_NAME("Uart", Uart)
-