Changeset aa1e202 in mainline

Timestamp:

2011-01-06T19:59:43Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e0854e3

Parents:

39d70ec

Message:

cleanup

File:

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

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

@@ -76 +76 @@
 {
         if (dep->de_mode == DEM_DISABLED)
-                // might call do_probe()
+                /* FIXME: Perhaps call do_probe()? */
                 return EXDEV;
         
@@ -402 +402 @@
                 }
                 
-                if (isr & ISR_PRX) {
-                        /* Only call dp_recv if there is a read request */
-//                      if (dep->de_flags) & DEF_READING)
-                                dp_recv(nil_phone, device_id, dep);
-                }
+                if (isr & ISR_PRX)
+                        dp_recv(nil_phone, device_id, dep);
                 
                 if (isr & ISR_RXE)
@@ -417 +414 @@
                 }
                 
-                if (isr & ISR_OVW) {
+                if (isr & ISR_OVW)
                         dep->de_stat.ets_OVW++;
-/*                      if (dep->de_flags & DEF_READING) {
-                                printf("dp_check_ints: strange: overwrite warning and pending read request\n");
-                                dp_recv(dep);
-                        }
-*/              }
                 
                 if (isr & ISR_RDC) {
@@ -441 +433 @@
         }
         
-//      if ((dep->de_flags & (DEF_READING | DEF_STOPPED)) == (DEF_READING | DEF_STOPPED))
         if ((dep->de_flags & DEF_STOPPED) == DEF_STOPPED) {
                 /*
@@ -456 +447 @@
 {
         dp_rcvhdr_t header;
-        //unsigned pageno, curr, next;
         int pageno, curr, next;
         size_t length;
@@ -543 +533 @@
         packet_t *packet;
         
-//      if (!(dep->de_flags & DEF_READING))
-//              return EINVAL;
-        
         packet = netif_packet_get_1(length);
         if (!packet)
@@ -566 +553 @@
         
         dep->de_flags |= DEF_PACK_RECV;
-//      dep->de_flags &= ~DEF_READING;
         
         nil_received_msg(nil_phone, device_id, packet, SERVICE_NONE);
@@ -678 +664 @@
 static void conf_hw(dpeth_t *dep)
 {
-//      int ifnr;
-//      dp_conf_t *dcp;
-        
-//      dep->de_mode= DEM_DISABLED;     /* Superfluous */
-//      ifnr= dep-de_table;
-        
-//      dcp= &dp_conf[ifnr];
-//      update_conf(dep, dcp);
-//      if (dep->de_mode != DEM_ENABLED)
-//              return;
-        
         if (!ne_probe(dep)) {
                 printf("%s: No ethernet card found at %#lx\n",