Changeset 46b881c in mainline for uspace/srv/hw/netif/ne2000/ne2000.c

Timestamp:

2011-01-29T11:36:41Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0b6931a, 8add9ca5

Parents:

e26a4633 (diff), ffa2c8ef (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:

IPC/async: strictly isolate the use of low-level IPC methods (ipc_*) and async framework methods (async_*) in user code, do not allow a mixture of both in a single source file

Benefits for future plans

• The async framework could use different communication style under the hood, but keeping the same high-level API
• The async framework can be integrated more tightly with sessions without potential problems of intermixing session-aware async methods with session-unaware low-level methods in user code
• The async_serialize_start()/_end() can be deprecated more easily

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>
@@ -317 +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)
@@ -324 +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;
                 }
@@ -343 +342 @@
                 
                 ne2k_down(ne2k);
-                ipc_unregister_irq(ne2k->irq, device->device_id);
+                unregister_irq(ne2k->irq, device->device_id);
                 change_state(device, NETIF_STOPPED);
         }
@@ -396 +395 @@
         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);
 }