Changeset e3fe7df in mainline

Timestamp:

2011-01-06T22:58:05Z (14 years ago)

Author:

martin@…>

Branches:

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

Children:

66b628a

Parents:

efa8aec6

Message:

convert bit flags to explicit flags for better readability

Location:

uspace/srv/hw/netif/dp8390

Files:

• dp8390.c (modified) (9 diffs)
• dp8390.h (modified) (1 diff)

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

@@ -142 +142 @@
                 outb_reg0(dep, DP_CR, CR_STP | CR_DM_ABORT);
                 (dep->de_stopf)(dep);
-                dep->de_flags = DEF_EMPTY;
+                dep->sending = false;
+                dep->send_avail = false;
         }
 }
@@ -154 +155 @@
         assert(dep->de_flags & DEF_ENABLED);
         
-        if (dep->de_flags & DEF_SEND_AVAIL) {
-                fprintf(stderr, "dp8390: send already in progress\n");
+        if (dep->send_avail) {
+                fprintf(stderr, "Send already in progress\n");
                 return EBUSY;
         }
@@ -163 +164 @@
                 if (from_int)
                         fprintf(stderr, "dp8390: should not be sending\n");
-                dep->de_flags |= DEF_SEND_AVAIL;
-                dep->de_flags &= ~DEF_PACK_SEND;
+                dep->send_avail = true;
+                dep->sending = false;
                 
                 return EBUSY;
         }
         
-        assert(!(dep->de_flags & DEF_PACK_SEND));
+        assert(!dep->sending);
         
         void *buf = packet_get_data(packet);
@@ -196 +197 @@
         assert(sendq_head < SENDQ_NR);
         dep->de_sendq_head = sendq_head;
-        
-        dep->de_flags |= DEF_PACK_SEND;
+        dep->sending = true;
         
         if (from_int)
                 return EOK;
         
-        dep->de_flags &= ~DEF_PACK_SEND;
+        dep->sending = false;
         
         return EOK;
@@ -213 +213 @@
         
         /* General initialization */
-        dep->de_flags = DEF_EMPTY;
+        dep->sending = false;
+        dep->send_avail = false;
         (*dep->de_initf)(dep);
         
@@ -371 +372 @@
                 dep->de_sendq[i].sq_filled = 0;
         
-        dep->de_flags &= ~DEF_SEND_AVAIL;
+        dep->send_avail = false;
         dep->de_flags &= ~DEF_STOPPED;
 }
@@ -445 +446 @@
                         }
                         
-                        dep->de_flags &= ~DEF_SEND_AVAIL;
+                        dep->send_avail = false;
                 }
                 
@@ -487 +488 @@
         }
         
-        dep->de_flags &= ~DEF_PACK_SEND;
+        dep->sending = false;
 }
 
@@ -716 +717 @@
         
         dep->de_mode = DEM_ENABLED;
-        dep->de_flags = DEF_EMPTY;
+        dep->sending = false;
+        dep->send_avail = false;
 }
 

uspace/srv/hw/netif/dp8390/dp8390.h

@@ -306 +306 @@
         dp_nic2userf_t de_nic2userf;
         dp_getblock_t de_getblockf;
+        
+        /* Driver flags */
+        bool sending;
+        bool send_avail;
 } dpeth_t;
 
-#define DEF_EMPTY       0x000
-#define DEF_PACK_SEND   0x001
-#define DEF_SEND_AVAIL  0x004
 #define DEF_PROMISC     0x040
 #define DEF_MULTI       0x080