Changeset 357b5f5 in mainline for uspace/lib/net/generic/generic.c

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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) (9 diffs)

uspace/lib/net/generic/generic.c

@@ -59 +59 @@
     int state, services_t target)
 {
-        async_msg_3(phone, (ipcarg_t) message, (ipcarg_t) device_id,
-            (ipcarg_t) state, target);
+        async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+            (sysarg_t) state, target);
         
         return EOK;
@@ -81 +81 @@
     int arg2, services_t service)
 {
-        return (int) async_req_3_0(phone, (ipcarg_t) message,
-            (ipcarg_t) device_id, (ipcarg_t) arg2, (ipcarg_t) service);
+        return (int) async_req_3_0(phone, (sysarg_t) message,
+            (sysarg_t) device_id, (sysarg_t) arg2, (sysarg_t) service);
 }
 
@@ -100 +100 @@
 int
 generic_get_addr_req(int phone, int message, device_id_t device_id,
-    measured_string_t **address, char ** data)
+    measured_string_t **address, uint8_t **data)
 {
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
         int string;
 
@@ -110 +110 @@
 
         // request the address
-        message_id = async_send_1(phone, (ipcarg_t) message,
-            (ipcarg_t) device_id, NULL);
+        message_id = async_send_1(phone, (sysarg_t) message,
+            (sysarg_t) device_id, NULL);
         string = measured_strings_return(phone, address, data, 1);
         async_wait_for(message_id, &result);
@@ -143 +143 @@
                 return EBADMEM;
         
-        ipcarg_t addr_len;
-        ipcarg_t prefix;
-        ipcarg_t content;
-        ipcarg_t suffix;
-        
-        ipcarg_t result = async_req_1_4(phone, (ipcarg_t) message,
-            (ipcarg_t) device_id, &addr_len, &prefix, &content, &suffix);
+        sysarg_t addr_len;
+        sysarg_t prefix;
+        sysarg_t content;
+        sysarg_t suffix;
+        
+        sysarg_t result = async_req_1_4(phone, (sysarg_t) message,
+            (sysarg_t) device_id, &addr_len, &prefix, &content, &suffix);
         
         packet_dimension->prefix = (size_t) prefix;
@@ -175 +175 @@
 {
         if (error) {
-                async_msg_4(phone, (ipcarg_t) message, (ipcarg_t) device_id,
-                    (ipcarg_t) packet_id, (ipcarg_t) target, (ipcarg_t) error);
+                async_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, (ipcarg_t) message, (ipcarg_t) device_id,
-                    (ipcarg_t) packet_id, (ipcarg_t) target);
+                async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+                    (sysarg_t) packet_id, (sysarg_t) target);
         }
         
@@ -201 +201 @@
 {
         if (error) {
-                async_msg_4(phone, (ipcarg_t) message, (ipcarg_t) device_id,
-                    (ipcarg_t) packet_id, (ipcarg_t) sender, (ipcarg_t) error);
+                async_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, (ipcarg_t) message, (ipcarg_t) device_id,
-                    (ipcarg_t) packet_id, (ipcarg_t) sender);
+                async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+                    (sysarg_t) packet_id, (sysarg_t) sender);
         }
         
@@ -234 +234 @@
 generic_translate_req(int phone, int message, device_id_t device_id,
     services_t service, measured_string_t *configuration, size_t count,
-    measured_string_t **translation, char **data)
+    measured_string_t **translation, uint8_t **data)
 {
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
         int string;
 
@@ -246 +246 @@
 
         // request the translation
-        message_id = async_send_3(phone, (ipcarg_t) message,
-            (ipcarg_t) device_id, (ipcarg_t) count, (ipcarg_t) service, NULL);
+        message_id = async_send_3(phone, (sysarg_t) message,
+            (sysarg_t) device_id, (sysarg_t) count, (sysarg_t) service, NULL);
         measured_strings_send(phone, configuration, count);
         string = measured_strings_return(phone, translation, data, count);