diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2004-06-29 16:08:33 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2004-06-29 16:08:33 -0400 |
| commit | a2afbeecce6d417bd89dd15e9268f9c41fa604a4 (patch) | |
| tree | 15f66b2a275d8a48f3e74b75b99d6cea59d05afe /dev/uart.hh | |
| parent | 53e3d58549a04bde8c87a7b2b80445e1447f2d5d (diff) | |
| parent | 5a1340d046c00a322fe2ac4d97a9b03e732b46ba (diff) | |
| download | gem5-a2afbeecce6d417bd89dd15e9268f9c41fa604a4.tar.xz | |
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : 7e1d8e3723f47338f0b24071ee95c66a9561dd2f
Diffstat (limited to 'dev/uart.hh')
| -rw-r--r-- | dev/uart.hh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dev/uart.hh b/dev/uart.hh index 83e1a758c..07ad4d0c8 100644 --- a/dev/uart.hh +++ b/dev/uart.hh @@ -62,14 +62,16 @@ 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; + IntrEvent txIntrEvent; + IntrEvent rxIntrEvent; Platform *platform; public: |