Changeset 43b4314 in mainline for uspace/srv/hw/netif/dp8390/dp8390.c

Timestamp:

2011-01-10T23:22:05Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4fc2b3b

Parents:

abe95c9

Message:

refactor NE2000 up/down operations, do not configure the card prematurelly (during probing)

File:

• uspace/srv/hw/netif/dp8390/dp8390.c (modified) (8 diffs)

uspace/srv/hw/netif/dp8390/dp8390.c

@@ -81 +81 @@
 
 /** NE2000 retry count */
-#define NE2K_RETRY  100
+#define NE2K_RETRY  0x1000
 
 /** NE2000 error messages rate limiting */
@@ -186 +186 @@
                 memcpy(&word, buf, 1);
                 pio_write_16(ne2k->data_port, word);
+        }
+}
+
+static void ne2k_init(ne2k_t *ne2k)
+{
+        unsigned int i;
+        
+        /* Reset the ethernet card */
+        uint8_t val = pio_read_8(ne2k->port + NE2K_RESET);
+        usleep(2000);
+        pio_write_8(ne2k->port + NE2K_RESET, val);
+        usleep(2000);
+        
+        /* Reset the DP8390 */
+        pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT);
+        for (i = 0; i < NE2K_RETRY; i++) {
+                if (pio_read_8(ne2k->port + DP_ISR) != 0)
+                        break;
         }
 }
@@ -210 +228 @@
         ne2k->up = false;
         
-        /* Reset the ethernet card */
-        uint8_t val = pio_read_8(ne2k->port + NE2K_RESET);
-        usleep(2000);
-        pio_write_8(ne2k->port + NE2K_RESET, val);
-        usleep(2000);
-        
-        /* Reset the DP8390 */
-        pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT);
-        for (i = 0; i < 0x1000; i++) {
-                if (pio_read_8(ne2k->port + DP_ISR) != 0)
-                        break;
-        }
+        ne2k_init(ne2k);
         
         /* Check if the DP8390 is really there */
-        val = pio_read_8(ne2k->port + DP_CR);
+        uint8_t val = pio_read_8(ne2k->port + DP_CR);
         if ((val & (CR_STP | CR_DM_ABORT)) != (CR_STP | CR_DM_ABORT))
                 return EXDEV;
@@ -242 +249 @@
         for (i = 0; i < ETH_ADDR; i++)
                 ne2k->mac[i] = pio_read_16(ne2k->data_port);
+        
+        ne2k->probed = true;
+        return EOK;
+}
+
+/** Start the network interface.
+ *
+ * @param[in,out] ne2k Network interface structure.
+ *
+ * @return EOK on success.
+ * @return EXDEV if the network interface is disabled.
+ *
+ */
+int ne2k_up(ne2k_t *ne2k)
+{
+        if (!ne2k->probed)
+                return EXDEV;
+        
+        ne2k_init(ne2k);
         
         /*
@@ -329 +355 @@
         
         /* Finish the initialization */
-        ne2k->probed = true;
-        return EOK;
-}
-
-/** Start the network interface.
- *
- * @param[in,out] ne2k Network interface structure.
- *
- * @return EOK on success.
- * @return EXDEV if the network interface is disabled.
- *
- */
-int ne2k_up(ne2k_t *ne2k)
-{
-        if (!ne2k->probed)
-                return EXDEV;
-        
-        pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_STA);
-        pio_write_8(ne2k->port + DP_RCR, RCR_AB);
-        
         ne2k->up = true;
         return EOK;
@@ -362 +368 @@
         if ((ne2k->probed) && (ne2k->up)) {
                 pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT);
-                
-                /* Reset the ethernet card */
-                uint8_t val = pio_read_8(ne2k->port + NE2K_RESET);
-                usleep(2000);
-                pio_write_8(ne2k->port + NE2K_RESET, val);
-                
+                ne2k_init(ne2k);
                 ne2k->up = false;
         }
@@ -420 +421 @@
         pio_write_8(ne2k->port + DP_RBCR1, 0);
         
-        for (i = 0; i < 0x1000; i++) {
+        for (i = 0; i < NE2K_RETRY; i++) {
                 if ((pio_read_8(ne2k->port + DP_ISR) & ISR_RST) != 0)
                         break;
@@ -430 +431 @@
         
         /* Acknowledge the ISR_RDC (remote DMA) interrupt */
-        for (i = 0; i < 0x1000; i++) {
+        for (i = 0; i < NE2K_RETRY; i++) {
                 if ((pio_read_8(ne2k->port + DP_ISR) & ISR_RDC) != 0)
                         break;