Changeset 1253f39 in rtems

Timestamp:

08/13/98 16:20:14 (25 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

af3e81c9

Parents:

70502bc4

Message:

Cleaned up some debugging stuff.

Redid interrupt handler to read imr/isr once and to write the imr once.

File:

• c/src/lib/libbsp/powerpc/dmv177/sonic/sonic.c (modified) (7 diffs)

c/src/lib/libbsp/powerpc/dmv177/sonic/sonic.c

@@ -1 @@
-void break_when_you_get_here();
 /*
  *******************************************************************
@@ -57 +56 @@
 #define SONIC_DEBUG_ERRORS           0x0020
 
-#define SONIC_DEBUG (SONIC_DEBUG_ERRORS)
-
-/* (SONIC_DEBUG_MEMORY|SONIC_DEBUG_DESCRIPTORS) */
-
-/* SONIC_DEBUG_ALL */
-
+#define SONIC_DEBUG (SONIC_DEBUG_NONE)
 
 /*
@@ -132 +126 @@
  */
 #define RDA_COUNT     20
-#define TDA_COUNT     100
+#define TDA_COUNT     10
 
 /*
@@ -372 +366 @@
 {
   struct sonic *dp = sonic;
+  unsigned32    isr, imr;
   void *rp;
 
@@ -393 +388 @@
   dp->Interrupts++;
 
+  isr = sonic_read_register( rp, SONIC_REG_ISR );
+  imr = sonic_read_register( rp, SONIC_REG_IMR );
+
   /*
    * Packet received or receive buffer area exceeded?
    */
-  if ((sonic_read_register( rp, SONIC_REG_IMR ) & (IMR_PRXEN | IMR_RBAEEN)) &&
-      (sonic_read_register( rp, SONIC_REG_ISR ) & (ISR_PKTRX | ISR_RBAE))) {
-    sonic_write_register(
-       rp,
-       SONIC_REG_IMR,
-       sonic_read_register( rp, SONIC_REG_IMR) & ~(IMR_PRXEN | IMR_RBAEEN)
-    );
+  if ((imr & (IMR_PRXEN | IMR_RBAEEN)) &&
+      (isr & (ISR_PKTRX | ISR_RBAE))) {
+    imr &= ~(IMR_PRXEN | IMR_RBAEEN);
     dp->rxInterrupts++;
     rtems_event_send (dp->iface->rxproc, INTERRUPT_EVENT);
@@ -410 +404 @@
    * Packet started, transmitter done or transmitter error?
    */
-  if ((sonic_read_register( rp, SONIC_REG_IMR ) & (IMR_PINTEN | IMR_PTXEN | IMR_TXEREN))
-   && (sonic_read_register( rp, SONIC_REG_ISR ) & (ISR_PINT | ISR_TXDN | ISR_TXER))) {
-    sonic_write_register(
-       rp,
-       SONIC_REG_IMR,
-       sonic_read_register( rp, SONIC_REG_IMR) &
-                  ~(IMR_PINTEN | IMR_PTXEN | IMR_TXEREN)
-    );
+  if ((imr & (IMR_PINTEN | IMR_PTXEN | IMR_TXEREN))
+   && (isr & (ISR_PINT | ISR_TXDN | ISR_TXER))) {
+    imr &= ~(IMR_PINTEN | IMR_PTXEN | IMR_TXEREN);
     dp->txInterrupts++;
     rtems_event_send (dp->txWaitTid, INTERRUPT_EVENT);
   }
+
+  sonic_write_register( rp, SONIC_REG_IMR, imr );
 }
 
@@ -1524 +1515 @@
 };
 #endif
+
 void sonic_write_register(
   void       *base,