Changeset 66b628a in mainline for uspace/srv/hw/netif/dp8390/dp8390.c

Timestamp:

2011-01-06T23:23:53Z (14 years ago)

Author:

martin@…>

Branches:

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

Children:

7922dea

Parents:

e3fe7df

Message:

further code simplification

File:

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

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

@@ -102 +102 @@
         /* This is the default, try to (re)locate the device. */
         conf_hw(dep);
-        if (dep->de_mode == DEM_DISABLED)
+        if (!dep->up)
                 /* Probe failed, or the device is configured off. */
                 return EXDEV;
         
-        if (dep->de_mode == DEM_ENABLED)
+        if (dep->up)
                 dp_init(dep);
         
@@ -112 +112 @@
 }
 
-int do_init(dpeth_t *dep, int mode)
-{
-        if (dep->de_mode == DEM_DISABLED)
+/** Initialize and/or start the network interface.
+ *
+ *  @param[in,out] dep The network interface structure.
+ *
+ *  @return EOK on success.
+ *  @return EXDEV if the network interface is disabled.
+ *
+ */
+int do_init(dpeth_t *dep)
+{
+        if (!dep->up)
                 /* FIXME: Perhaps call do_probe()? */
                 return EXDEV;
         
-        assert(dep->de_mode == DEM_ENABLED);
-        assert(dep->de_flags & DEF_ENABLED);
-        
-        dep->de_flags &= ~(DEF_PROMISC | DEF_MULTI | DEF_BROAD);
-        
-        if (mode &DL_PROMISC_REQ)
-                dep->de_flags |= DEF_PROMISC | DEF_MULTI | DEF_BROAD;
-        
-        if (mode &DL_MULTI_REQ)
-                dep->de_flags |= DEF_MULTI;
-        
-        if (mode &DL_BROAD_REQ)
-                dep->de_flags |= DEF_BROAD;
+        assert(dep->up);
+        assert(dep->enabled);
         
         dp_reinit(dep);
@@ -138 +135 @@
 void do_stop(dpeth_t *dep)
 {
-        if ((dep->de_mode == DEM_ENABLED)
-            && (dep->de_flags & DEF_ENABLED)) {
+        if ((dep->up) && (dep->enabled)) {
                 outb_reg0(dep, DP_CR, CR_STP | CR_DM_ABORT);
                 (dep->de_stopf)(dep);
+                dep->enabled = false;
+                dep->stopped = false;
                 dep->sending = false;
                 dep->send_avail = false;
@@ -152 +150 @@
         int sendq_head;
         
-        assert(dep->de_mode == DEM_ENABLED);
-        assert(dep->de_flags & DEF_ENABLED);
+        assert(dep->up);
+        assert(dep->enabled);
         
         if (dep->send_avail) {
@@ -213 +211 @@
         
         /* General initialization */
+        dep->enabled = false;
+        dep->stopped = false;
         dep->sending = false;
         dep->send_avail = false;
         (*dep->de_initf)(dep);
         
-        printf("%s: Ethernet address ", dep->de_name);
+        printf("Ethernet address ");
         for (i = 0; i < 6; i++)
                 printf("%x%c", dep->de_address.ea_addr[i], i < 5 ? ':' : '\n');
@@ -241 +241 @@
         
         /* Step 4: */
-        dp_rcr_reg = 0;
-        
-        if (dep->de_flags & DEF_PROMISC)
-                dp_rcr_reg |= RCR_AB | RCR_PRO | RCR_AM;
-        
-        if (dep->de_flags & DEF_BROAD)
-                dp_rcr_reg |= RCR_AB;
-        
-        if (dep->de_flags & DEF_MULTI)
-                dp_rcr_reg |= RCR_AM;
+        dp_rcr_reg = RCR_AB;  /* Enable broadcasts */
         
         outb_reg0(dep, DP_RCR, dp_rcr_reg);
@@ -301 +292 @@
         
         /* Finish the initialization. */
-        dep->de_flags |= DEF_ENABLED;
+        dep->enabled = true;
         for (i = 0; i < dep->de_sendq_nr; i++)
                 dep->de_sendq[i].sq_filled= 0;
@@ -325 +316 @@
         outb_reg0(dep, DP_CR, CR_PS_P0 | CR_EXTRA);
         
-        dp_rcr_reg = 0;
-        
-        if (dep->de_flags & DEF_PROMISC)
-                dp_rcr_reg |= RCR_AB | RCR_PRO | RCR_AM;
-        
-        if (dep->de_flags & DEF_BROAD)
-                dp_rcr_reg |= RCR_AB;
-        
-        if (dep->de_flags & DEF_MULTI)
-                dp_rcr_reg |= RCR_AM;
+        /* Enable broadcasts */
+        dp_rcr_reg = RCR_AB;
         
         outb_reg0(dep, DP_RCR, dp_rcr_reg);
@@ -373 +356 @@
         
         dep->send_avail = false;
-        dep->de_flags &= ~DEF_STOPPED;
+        dep->stopped = false;
 }
 
@@ -389 +372 @@
         int tsr;
         int size, sendq_tail;
-        
-        if (!(dep->de_flags & DEF_ENABLED))
-                fprintf(stderr, "dp8390: got premature interrupt\n");
         
         for (; (isr & 0x7f) != 0; isr = isr_acknowledge(dep)) {
@@ -413 +393 @@
                                 
                                 if ((tsr & TSR_FU) && (++dep->de_stat.ets_fifoUnder <= 10))
-                                        printf("%s: fifo underrun\n", dep->de_name);
+                                        printf("FIFO underrun\n");
                                 
                                 if ((tsr & TSR_CDH) && (++dep->de_stat.ets_CDheartbeat <= 10))
-                                        printf("%s: CD heart beat failure\n", dep->de_name);
+                                        printf("CD heart beat failure\n");
                                 
                                 if (tsr & TSR_OWC)
@@ -425 +405 @@
                         
                         if (!(dep->de_sendq[sendq_tail].sq_filled)) {
-                                /* Or hardware bug? */
-                                printf("%s: transmit interrupt, but not sending\n", dep->de_name);
+                                printf("PTX interrupt, but no frame to send\n");
                                 continue;
                         }
@@ -470 +449 @@
                 if (isr & ISR_RST) {
                         /*
-                         * This means we got an interrupt but the ethernet 
-                         * chip is shutdown. We set the flag DEF_STOPPED,
+                         * This means we got an interrupt but the ethernet
+                         * chip is shutdown. We set the flag 'stopped'
                          * and continue processing arrived packets. When the
                          * receive buffer is empty, we reset the dp8390.
                          */
-                        dep->de_flags |= DEF_STOPPED;
+                        dep->stopped = true;
                         break;
                 }
         }
         
-        if ((dep->de_flags & DEF_STOPPED) == DEF_STOPPED) {
+        if (dep->stopped) {
                 /*
-                 * The chip is stopped, and all arrived packets
-                 * are delivered.
+                 * The chip is stopped, and all arrived
+                 * frames are delivered.
                  */
                 dp_reset(dep);
@@ -518 +497 @@
                 next = header.dr_next;
                 if ((length < ETH_MIN_PACK_SIZE) || (length > ETH_MAX_PACK_SIZE_TAGGED)) {
-                        printf("%s: packet with strange length arrived: %d\n", dep->de_name, (int) length);
+                        printf("Packet with strange length arrived: %zu\n", length);
                         next= curr;
                 } else if ((next < dep->de_startpage) || (next >= dep->de_stoppage)) {
-                        printf("%s: strange next page\n", dep->de_name);
+                        printf("Strange next page\n");
                         next= curr;
                 } else if (header.dr_status & RSR_FO) {
@@ -528 +507 @@
                          * reset the buffers
                          */
-                        printf("%s: fifo overrun, resetting receive buffer\n", dep->de_name);
+                        printf("FIFO overrun, resetting receive buffer\n");
                         dep->de_stat.ets_fifoOver++;
                         next = curr;
-                } else if ((header.dr_status & RSR_PRX) && (dep->de_flags & DEF_ENABLED)) {
+                } else if ((header.dr_status & RSR_PRX) && (dep->enabled)) {
                         r = dp_pkt2user(nil_phone, device_id, dep, pageno, length);
                         if (r != EOK)
@@ -710 +689 @@
 {
         if (!ne_probe(dep)) {
-                printf("%s: No ethernet card found at %#lx\n",
-                    dep->de_name, dep->de_base_port);
-                dep->de_mode= DEM_DISABLED;
+                printf("No ethernet card found at %#lx\n", dep->de_base_port);
+                dep->up = false;
                 return;
         }
         
-        dep->de_mode = DEM_ENABLED;
+        dep->up = true;
+        dep->enabled = false;
+        dep->stopped = false;
         dep->sending = false;
         dep->send_avail = false;