Changeset 7397638 in rtems

Timestamp:

02/04/99 22:59:46 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

13cc89e1

Parents:

354b00bc

Message:

Works great now.

File:

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

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

@@ -140 +140 @@
  */
 #define SONIC_DCR \
-   (DCR_DW32 | DCR_WAIT0 | DCR_PO0 | DCR_PO1  | DCR_RFT4 | DCR_TFT8)
+   (DCR_DW32 | DCR_WAIT0 | DCR_PO0 | DCR_PO1  | DCR_RFT24 | DCR_TFT28)
 #ifndef SONIC_DCR
 # define SONIC_DCR (DCR_DW32 | DCR_TFT28)
@@ -152 +152 @@
  */
 #define RDA_COUNT     20 /* 20 */
-#define TDA_COUNT     10 /* 10 */
+#define TDA_COUNT     20 /* 10 */
 
 /*
@@ -512 +512 @@
 
 #if (SONIC_DEBUG & SONIC_DEBUG_ERRORS)
-    if ( status != 0x0001 )
+    /*
+     *  If there is an error that was not a collision, 
+     *  then someone may want to see it.
+     */
+
+    if ( (status & ~(TDA_STATUS_COLLISION_MASK|TDA_STATUS_DEF)) != 0x0001 )
       printf( "ERROR: retire TDA %p (0x%08x)\n",
                 sc->tdaTail, sc->tdaTail->status );
@@ -529 +534 @@
        */
       rtems_unsigned16 link;
+#if (SONIC_DEBUG & SONIC_DEBUG_ERRORS)
+      printf("restarting sonic after error\n");
+#endif
+
       link = *(sc->tdaTail->linkp);
 
@@ -600 +609 @@
   static char padBuf[64];
 
+  /* printf( "sonic_sendpacket %p\n", m ); */
   /*
    * Free up transmit descriptors.
@@ -609 +619 @@
    */
   if (sc->tdaActiveCount == sc->tdaCount) {
-#if (SONIC_DEBUG & SONIC_DEBUG_FRAGMENTS)
+#if (SONIC_DEBUG & SONIC_DEBUG_ERRORS)
     puts( "Wait for more TDAs" );
 #endif
+
     /*
      * Clear old events.
@@ -628 +639 @@
     while (sc->tdaActiveCount == sc->tdaCount) {
       rtems_event_set events;
+
+#if (SONIC_DEBUG & SONIC_DEBUG_ERRORS)
+      printf("blocking until TDAs are available\n");
+#endif
       /*
        * Enable transmitter interrupts.
@@ -727 +742 @@
   sc->tdaHead = tdp;
 
-/* XXX */
-/*   sonic_enable_interrupts( rp, (IMR_PINTEN | IMR_PTXEN | IMR_TXEREN) ); */
+/* XXX not in KA9Q */
+  sonic_enable_interrupts( rp, (IMR_PINTEN | IMR_PTXEN | IMR_TXEREN) );
   sonic_write_register( rp, SONIC_REG_CR, CR_TXP );
 }
@@ -985 +1000 @@
 #endif
 
+      /* printf( "ether_input %p\n", m ); */
       ether_input (ifp, eh, m);
 
@@ -1125 +1141 @@
 
 /* XXX not used by the BSD drivers
+*/
     if (i & 1)
       tdp->pkt_config = TDA_CONFIG_PINT;
-*/
 
     tdp->frag_count        = 0;
@@ -1447 +1463 @@
    */
   /* sonic_write_register( rp, SONIC_REG_IMR, 0 ); */
-  sonic_enable_interrupts( rp, (IMR_PRXEN | IMR_RBAEEN) );
+  sonic_enable_interrupts( rp,
+        (IMR_PINTEN | IMR_PTXEN | IMR_TXEREN) | (IMR_PRXEN | IMR_RBAEEN) );
 
   sonic_write_register(rp, SONIC_REG_CR, /* CR_TXP | */ CR_RXEN);
@@ -1657 +1674 @@
 #endif
 
-inline void sonic_write_register(
+void sonic_write_register(
   void       *base,
   unsigned32  regno,
@@ -1673 +1690 @@
 }
 
-inline unsigned32 sonic_read_register(
+unsigned32 sonic_read_register(
   void       *base,
   unsigned32  regno