Changeset 1affcdf3 in mainline for uspace/lib/net/generic/generic.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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/lib/net/generic/generic.c (modified) (8 diffs)

uspace/lib/net/generic/generic.c

@@ -37 +37 @@
 #include <generic.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <ipc/services.h>
 #include <net/device.h>
@@ -56 +57 @@
     int state, services_t target)
 {
-        async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+        async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
             (sysarg_t) state, target);
         
@@ -78 +79 @@
     int arg2, services_t service)
 {
-        return (int) async_req_3_0(phone, (sysarg_t) message,
+        return (int) async_obsolete_req_3_0(phone, (sysarg_t) message,
             (sysarg_t) device_id, (sysarg_t) arg2, (sysarg_t) service);
 }
@@ -107 +108 @@
 
         /* Request the address */
-        message_id = async_send_1(phone, (sysarg_t) message,
+        message_id = async_obsolete_send_1(phone, (sysarg_t) message,
             (sysarg_t) device_id, NULL);
         string = measured_strings_return(phone, address, data, 1);
@@ -145 +146 @@
         sysarg_t suffix;
         
-        sysarg_t result = async_req_1_4(phone, (sysarg_t) message,
+        sysarg_t result = async_obsolete_req_1_4(phone, (sysarg_t) message,
             (sysarg_t) device_id, &addr_len, &prefix, &content, &suffix);
         
@@ -172 +173 @@
 {
         if (error) {
-                async_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
+                async_obsolete_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
                     (sysarg_t) packet_id, (sysarg_t) target, (sysarg_t) error);
         } else {
-                async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+                async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
                     (sysarg_t) packet_id, (sysarg_t) target);
         }
@@ -198 +199 @@
 {
         if (error) {
-                async_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
+                async_obsolete_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
                     (sysarg_t) packet_id, (sysarg_t) sender, (sysarg_t) error);
         } else {
-                async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+                async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
                     (sysarg_t) packet_id, (sysarg_t) sender);
         }
@@ -243 +244 @@
 
         /* Request the translation */
-        message_id = async_send_3(phone, (sysarg_t) message,
+        message_id = async_obsolete_send_3(phone, (sysarg_t) message,
             (sysarg_t) device_id, (sysarg_t) count, (sysarg_t) service, NULL);
         measured_strings_send(phone, configuration, count);