Changeset 3d5e190 in mainline for uspace/srv/hw/netif/dp8390/dp8390_module.c

Timestamp:

2011-01-06T23:50:48Z (13 years ago)

Author:

martin@…>

Branches:

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

Children:

7c34b28f, 854151c, ae1f70e

Parents:

ba21938 (diff), 7922dea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

simplify the NE2000 driver code even futher to be really sure that it is working properly (still not 100 % sure about that)

File:

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

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

@@ -130 +130 @@
         fibril_rwlock_write_unlock(&netif_globals.lock);
         
-        if ((dep != NULL) && (dep->de_mode == DEM_ENABLED)) {
-                assert(dep->de_flags & DEF_ENABLED);
+        if ((dep != NULL) && (dep->up)) {
+                assert(dep->enabled);
                 dp_check_ints(nil_phone, device_id, dep, IRQ_GET_ISR(*call));
         }
@@ -233 +233 @@
         device->state = NETIF_STOPPED;
         dep->de_irq = irq;
-        dep->de_mode = DEM_DISABLED;
+        dep->up = false;
         
         //TODO address?
@@ -306 +306 @@
                         return rc;
                 
-                rc = do_init(dep, DL_BROAD_REQ);
+                rc = do_init(dep);
                 if (rc != EOK) {
                         ipc_unregister_irq(dep->de_irq, device->device_id);