Changes in uspace/srv/hw/netif/ne2000/ne2000.c [ffa2c8ef:ee2fa30a] in mainline

File:

• uspace/srv/hw/netif/ne2000/ne2000.c (modified) (7 diffs)

uspace/srv/hw/netif/ne2000/ne2000.c

@@ -43 +43 @@
 #include <malloc.h>
 #include <sysinfo.h>
+#include <ns.h>
 #include <ipc/services.h>
-#include <ipc/ns.h>
 #include <ipc/irc.h>
 #include <net/modules.h>
@@ -75 +75 @@
 #define IRQ_GET_TSR(call)  ((int) IPC_GET_ARG3(call))
 
-static int irc_service = 0;
-static int irc_phone = -1;
+static bool irc_service = false;
+static async_sess_t *irc_sess = NULL;
 
 /** NE2000 kernel interrupt command sequence.
@@ -152 +152 @@
         device_id_t device_id = IRQ_GET_DEVICE(*call);
         netif_device_t *device;
-        int nil_phone;
+        async_sess_t *nil_sess;
         ne2k_t *ne2k;
         
         fibril_rwlock_read_lock(&netif_globals.lock);
         
-        if (find_device(device_id, &device) == EOK) {
-                nil_phone = device->nil_phone;
+        nil_sess = netif_globals.nil_sess;
+        
+        if (find_device(device_id, &device) == EOK)
                 ne2k = (ne2k_t *) device->specific;
-        } else
+        else
                 ne2k = NULL;
         
@@ -166 +167 @@
         
         if (ne2k != NULL) {
-                link_t *frames =
+                list_t *frames =
                     ne2k_interrupt(ne2k, IRQ_GET_ISR(*call), IRQ_GET_TSR(*call));
                 
                 if (frames != NULL) {
                         while (!list_empty(frames)) {
-                                frame_t *frame =
-                                    list_get_instance(frames->next, frame_t, link);
+                                frame_t *frame = list_get_instance(
+                                    list_first(frames), frame_t, link);
                                 
                                 list_remove(&frame->link);
-                                nil_received_msg(nil_phone, device_id, frame->packet,
+                                nil_received_msg(nil_sess, device_id, frame->packet,
                                     SERVICE_NONE);
                                 free(frame);
@@ -276 +277 @@
         
         device->device_id = device_id;
-        device->nil_phone = -1;
         device->specific = (void *) ne2k;
         device->state = NETIF_STOPPED;
@@ -329 +329 @@
                 change_state(device, NETIF_ACTIVE);
                 
-                if (irc_service)
-                        async_msg_1(irc_phone, IRC_ENABLE_INTERRUPT, ne2k->irq);
+                if (irc_service) {
+                        async_exch_t *exch = async_exchange_begin(irc_sess);
+                        async_msg_1(exch, IRC_ENABLE_INTERRUPT, ne2k->irq);
+                        async_exchange_end(exch);
+                }
         }
         
@@ -383 +386 @@
         sysarg_t i8259;
         
-        if ((sysinfo_get_value("apic", &apic) == EOK) && (apic))
-                irc_service = SERVICE_APIC;
-        else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))
-                irc_service = SERVICE_I8259;
+        if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
+            || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)))
+                irc_service = true;
         
         if (irc_service) {
-                while (irc_phone < 0)
-                        irc_phone = service_connect_blocking(irc_service, 0, 0);
+                while (!irc_sess)
+                        irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+                            SERVICE_IRC, 0, 0);
         }
         
         async_set_interrupt_received(irq_handler);
         
-        return async_connect_to_me(PHONE_NS, SERVICE_NE2000, 0, 0, NULL);
+        return service_register(SERVICE_NE2000);
 }