Changeset 8b655705 in mainline for uspace/srv/hw/netif/ne2000/ne2000.c

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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 changes.

File:

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

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

@@ -43 +43 @@
 #include <malloc.h>
 #include <sysinfo.h>
-#include <ipc/ipc.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 bool irc_service = false;
 static int irc_phone = -1;
 
@@ -316 +316 @@
                 ne2k_cmds[5].addr = ne2k->port + DP_TSR;
                 
-                int rc = ipc_register_irq(ne2k->irq, device->device_id,
+                int rc = register_irq(ne2k->irq, device->device_id,
                     device->device_id, &ne2k_code);
                 if (rc != EOK)
@@ -323 +323 @@
                 rc = ne2k_up(ne2k);
                 if (rc != EOK) {
-                        ipc_unregister_irq(ne2k->irq, device->device_id);
+                        unregister_irq(ne2k->irq, device->device_id);
                         return rc;
                 }
@@ -342 +342 @@
                 
                 ne2k_down(ne2k);
-                ipc_unregister_irq(ne2k->irq, device->device_id);
+                unregister_irq(ne2k->irq, device->device_id);
                 change_state(device, NETIF_STOPPED);
         }
@@ -383 +383 @@
         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 = ipc_connect_me_to_blocking(PHONE_NS, irc_service,
-                            0, 0);
-                }
+                while (irc_phone < 0)
+                        irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
         }
         
         async_set_interrupt_received(irq_handler);
         
-        sysarg_t phonehash;
-        return ipc_connect_to_me(PHONE_NS, SERVICE_NE2000, 0, 0, &phonehash);
+        return async_connect_to_me(PHONE_NS, SERVICE_NE2000, 0, 0, NULL);
 }