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

diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc
index 36f17c4fb6bc7090b14fbe55f017f953e2b9b715..cae90a3b4eef34384f51f6b1465c0f765f797e6c 100644 (file)
--- 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 5b5b6dc271d5a84e001a87bc9d7d581295922d7b..774fec4352d9f04ad5d4a658c1b1bf1ad91c9adc 100644 (file)
--- 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