Merge zizzer.eecs.umich.edu:/bk/m5/

[gem5.git] / dev / uart.hh

diff --git a/dev/uart.hh b/dev/uart.hh
index 83e1a758c8192fa8c725491d7327633bd7714248..d1f167526943dc2973dc9d4f0c79f7ce730a52b0 100644 (file)
--- a/dev/uart.hh
+++ b/dev/uart.hh
@@ -62,19 +62,21 @@ class Uart : public PioDevice
     {
         protected:
             Uart *uart;
+            int intrBit;
         public:
-            IntrEvent(Uart *u);
+            IntrEvent(Uart *u, int bit);
             virtual void process();
             virtual const char *description();
             void scheduleIntr();
     };
 
-    IntrEvent intrEvent;
-    Platform *platform;
+    IntrEvent txIntrEvent;
+    IntrEvent rxIntrEvent;
 
   public:
-    Uart(const string &name, SimConsole *c, MemoryController *mmu,
-            Addr a, Addr s, HierParams *hier, Bus *bus, Platform *p);
+    Uart(const std::string &name, SimConsole *c, MemoryController *mmu,
+         Addr a, Addr s, HierParams *hier, Bus *bus, Tick pio_latency,
+         Platform *p);
 
     Fault read(MemReqPtr &req, uint8_t *data);
     Fault write(MemReqPtr &req, const uint8_t *data);