Changeset 1916d1f in mainline for uspace/srv/hw/netif/ne2000/ne2000.c

Timestamp:

2011-07-12T13:41:26Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

50fc490

Parents:

11809eab (diff), 6817eba (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:

Merge libposix changes.

File:

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

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

@@ -38 +38 @@
 #include <assert.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <ddi.h>
 #include <errno.h>
@@ -44 +43 @@
 #include <malloc.h>
 #include <sysinfo.h>
+#include <ns.h>
 #include <ipc/services.h>
-#include <ns.h>
-#include <ns_obsolete.h>
 #include <ipc/irc.h>
 #include <net/modules.h>
@@ -78 +76 @@
 
 static bool irc_service = false;
-static int irc_phone = -1;
+static async_sess_t *irc_sess = NULL;
 
 /** NE2000 kernel interrupt command sequence.
@@ -154 +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;
         
@@ -177 +176 @@
                                 
                                 list_remove(&frame->link);
-                                nil_received_msg(nil_phone, device_id,
-                                    frame->packet, SERVICE_NONE);
+                                nil_received_msg(nil_sess, device_id, frame->packet,
+                                    SERVICE_NONE);
                                 free(frame);
                         }
@@ -278 +277 @@
         
         device->device_id = device_id;
-        device->nil_phone = -1;
         device->specific = (void *) ne2k;
         device->state = NETIF_STOPPED;
@@ -331 +329 @@
                 change_state(device, NETIF_ACTIVE);
                 
-                if (irc_service)
-                        async_obsolete_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);
+                }
         }
         
@@ -390 +391 @@
         
         if (irc_service) {
-                while (irc_phone < 0)
-                        irc_phone = service_obsolete_connect_blocking(SERVICE_IRC, 0, 0);
+                while (!irc_sess)
+                        irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+                            SERVICE_IRC, 0, 0);
         }