summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2004-05-18 14:30:17 -0400
committerLisa Hsu <hsul@eecs.umich.edu>2004-05-18 14:30:17 -0400
commit675b849b50083c1bcde52c806fc5e03702142371 (patch)
tree3982cc720c6621f5f39c0ba3882c8b7e0c88a5a3
parentf42b13afc158794bc7ddc3e0376c264dc15235a3 (diff)
downloadgem5-675b849b50083c1bcde52c806fc5e03702142371.tar.xz
fix the indefinite interrupting of the ethernet device.
dev/ns_gige.cc: clear the device interrupts dev/ns_gige_reg.h: Add a new mask --HG-- extra : convert_revision : ce3617315677cbee577ed8893821a8abc5a1a10d
-rw-r--r--dev/ns_gige.cc2
-rw-r--r--dev/ns_gige_reg.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc
index 36f17c4fb..cae90a3b4 100644
--- a/dev/ns_gige.cc
+++ b/dev/ns_gige.cc
@@ -299,7 +299,7 @@ EtherDev::read(MemReqPtr &req, uint8_t *data)
case ISR:
reg = regs.isr;
- regs.isr = 0;
+ devIntrClear(ISR_ALL);
break;
case IMR:
diff --git a/dev/ns_gige_reg.h b/dev/ns_gige_reg.h
index 5b5b6dc27..774fec435 100644
--- a/dev/ns_gige_reg.h
+++ b/dev/ns_gige_reg.h
@@ -219,6 +219,7 @@
#define ISR_RXERR 0x00000004
#define ISR_RXDESC 0x00000002
#define ISR_RXOK 0x00000001
+#define ISR_ALL 0x7FFFFFFF
/* transmit configuration register */
#define TXCFG_CSI 0x80000000