Changeset 79ae36dd in mainline for uspace/lib/net/netif

Timestamp:

2011-06-08T19:01:55Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0eff68e

Parents:

764d71e

Message:

new async framework with integrated exchange tracking

• strict isolation between low-level IPC and high-level async framework with integrated exchange tracking
  • each IPC connection is represented by an async_sess_t structure
  • each IPC exchange is represented by an async_exch_t structure
  • exchange management is either based on atomic messages (EXCHANGE_ATOMIC), locking (EXCHANGE_SERIALIZE) or connection cloning (EXCHANGE_CLONE)
• async_obsolete: temporary compatibility layer to keep old async clients working (several pieces of code are currently broken, but only non-essential functionality)
• IPC_M_PHONE_HANGUP is now method no. 0 (for elegant boolean evaluation)
• IPC_M_DEBUG_ALL has been renamed to IPC_M_DEBUG
• IPC_M_PING has been removed (VFS protocol now has VFS_IN_PING)
• console routines in libc have been rewritten for better abstraction
• additional use for libc-private header files (FILE structure opaque to the client)
• various cstyle changes (typos, indentation, missing externs in header files, improved comments, etc.)

Location:

uspace/lib/net/netif

Files:

• netif_remote.c (modified) (5 diffs)
• netif_skel.c (modified) (3 diffs)

uspace/lib/net/netif/netif_remote.c

@@ -38 +38 @@
 #include <packet_client.h>
 #include <generic.h>
-
+#include <async_obsolete.h>
 #include <ipc/services.h>
 #include <ipc/netif.h>
@@ -82 +82 @@
 int netif_probe_req(int netif_phone, device_id_t device_id, int irq, void *io)
 {
-        return async_req_3_0(netif_phone, NET_NETIF_PROBE, device_id, irq,
+        return async_obsolete_req_3_0(netif_phone, NET_NETIF_PROBE, device_id, irq,
             (sysarg_t) io);
 }
@@ -119 +119 @@
 int netif_start_req(int netif_phone, device_id_t device_id)
 {
-        return async_req_1_0(netif_phone, NET_NETIF_START, device_id);
+        return async_obsolete_req_1_0(netif_phone, NET_NETIF_START, device_id);
 }
 
@@ -136 +136 @@
 int netif_stop_req(int netif_phone, device_id_t device_id)
 {
-        return async_req_1_0(netif_phone, NET_NETIF_STOP, device_id);
+        return async_obsolete_req_1_0(netif_phone, NET_NETIF_STOP, device_id);
 }
 
@@ -154 +154 @@
                 return EBADMEM;
         
-        aid_t message_id = async_send_1(netif_phone, NET_NETIF_STATS,
+        aid_t message_id = async_obsolete_send_1(netif_phone, NET_NETIF_STATS,
             (sysarg_t) device_id, NULL);
-        async_data_read_start(netif_phone, stats, sizeof(*stats));
+        async_obsolete_data_read_start(netif_phone, stats, sizeof(*stats));
         
         sysarg_t result;

uspace/lib/net/netif/netif_skel.c

@@ -54 +54 @@
 #include <nil_remote.h>
 
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
+
 DEVICE_MAP_IMPLEMENT(netif_device_map, netif_device_t);
 
@@ -288 +291 @@
         *count = 0;
         
+        if (!IPC_GET_IMETHOD(*call))
+                return EOK;
+        
         switch (IPC_GET_IMETHOD(*call)) {
-        case IPC_M_PHONE_HUNGUP:
-                return EOK;
-        
         case NET_NETIF_PROBE:
                 return netif_probe_req_local(0, IPC_GET_DEVICE(*call),
@@ -385 +388 @@
                 
                 /* End if said to either by the message or the processing result */
-                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
-                    (res == EHANGUP))
+                if ((!IPC_GET_IMETHOD(call)) || (res == EHANGUP))
                         return;