Changeset 92574f4 in mainline for uspace/srv/hw/netif/ne2000/ne2000.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/srv/hw/netif/ne2000/ne2000.c (modified) (5 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>
@@ -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);
         }
@@ -389 +389 @@
         
         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(irc_service, 0, 0);
         }
         
         async_set_interrupt_received(irq_handler);
         
-        return ipc_connect_to_me(PHONE_NS, SERVICE_NE2000, 0, 0, NULL, NULL);
+        return async_connect_to_me(PHONE_NS, SERVICE_NE2000, 0, 0, NULL);
 }