Changeset 41811af in mainline for uspace/srv/hw/netif/ne2000/ne2000.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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 mainline

File:

• uspace/srv/hw/netif/ne2000/ne2000.c (modified) (4 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 +45 @@
 #include <sysinfo.h>
 #include <ipc/services.h>
-#include <ipc/ns.h>
+#include <ns.h>
+#include <ns_obsolete.h>
 #include <ipc/irc.h>
 #include <net/modules.h>
@@ -330 +332 @@
                 
                 if (irc_service)
-                        async_msg_1(irc_phone, IRC_ENABLE_INTERRUPT, ne2k->irq);
+                        async_obsolete_msg_1(irc_phone, IRC_ENABLE_INTERRUPT, ne2k->irq);
         }
         
@@ -389 +391 @@
         if (irc_service) {
                 while (irc_phone < 0)
-                        irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
+                        irc_phone = service_obsolete_connect_blocking(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);
 }