Changeset 39d70ec in mainline for uspace/srv/hw/netif/dp8390/dp8390_module.c

Timestamp:

2011-01-06T19:50:04Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

aa1e202

Parents:

b187536

Message:

remove additional packet queueing

File:

• uspace/srv/hw/netif/dp8390/dp8390_module.c (modified) (1 diff)

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

@@ -115 +115 @@
 static void irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {
+        device_id_t device_id = IRQ_GET_DEVICE(*call);
         netif_device_t *device;
-        dpeth_t *dep;
-        packet_t *received;
-        device_id_t device_id;
-        int phone;
-        
-        device_id = IRQ_GET_DEVICE(*call);
+        int nil_phone;
+        dpeth_t *dep;
+        
         fibril_rwlock_write_lock(&netif_globals.lock);
         
-        if (find_device(device_id, &device) != EOK) {
-                fibril_rwlock_write_unlock(&netif_globals.lock);
-                return;
-        }
-        
-        dep = (dpeth_t *) device->specific;
-        if (dep->de_mode != DEM_ENABLED) {
-                fibril_rwlock_write_unlock(&netif_globals.lock);
-                return;
-        }
-        
-        assert(dep->de_flags & DEF_ENABLED);
-        
-        dp_check_ints(dep, IRQ_GET_ISR(*call));
-        
-        if (dep->received_queue) {
-                received = dep->received_queue;
-                phone = device->nil_phone;
-                dep->received_queue = NULL;
-                dep->received_count = 0;
-                fibril_rwlock_write_unlock(&netif_globals.lock);
-                nil_received_msg(phone, device_id, received, SERVICE_NONE);
+        if (find_device(device_id, &device) == EOK) {
+                nil_phone = device->nil_phone;
+                dep = (dpeth_t *) device->specific;
         } else
-                fibril_rwlock_write_unlock(&netif_globals.lock);
+                dep = NULL;
+        
+        fibril_rwlock_write_unlock(&netif_globals.lock);
+        
+        if ((dep != NULL) && (dep->de_mode == DEM_ENABLED)) {
+                assert(dep->de_flags & DEF_ENABLED);
+                dp_check_ints(nil_phone, device_id, dep, IRQ_GET_ISR(*call));
+        }
 }