cpu: remove unnecessary data ptr from O3 internal read() funcs

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

diff --git a/src/dev/uart.hh b/src/dev/uart.hh
index ba10c204c382c982fdfe33a716fac3a5b49c3bfe..6c9c08ee7cab27b3ce6ff7fc4ee21643d420c754 100644 (file)
--- a/src/dev/uart.hh
+++ b/src/dev/uart.hh
@@ -35,11 +35,10 @@
 #ifndef __UART_HH__
 #define __UART_HH__
 
-#include "base/range.hh"
 #include "dev/io_device.hh"
+#include "dev/terminal.hh"
 #include "params/Uart.hh"
 
-class Terminal;
 class Platform;
 
 const int RX_INT = 0x1;
@@ -47,7 +46,6 @@ const int TX_INT = 0x2;
 
 class Uart : public BasicPioDevice
 {
-
   protected:
     int status;
     Platform *platform;
@@ -55,7 +53,7 @@ class Uart : public BasicPioDevice
 
   public:
     typedef UartParams Params;
-    Uart(const Params *p);
+    Uart(const Params *p, Addr pio_size);
 
     const Params *
     params() const
@@ -73,6 +71,9 @@ class Uart : public BasicPioDevice
      * @return interrupt status
      */
     bool intStatus() { return status ? true : false; }
+
+  protected:
+    MakeCallback<Uart, &Uart::dataAvailable> callbackDataAvail;
 };
 
 #endif // __UART_HH__