Changes in uspace/lib/net/generic/generic.c [28a3e74:b01f878] in mainline

File:

• uspace/lib/net/generic/generic.c (modified) (10 diffs)

uspace/lib/net/generic/generic.c

@@ -36 +36 @@
 
 #include <generic.h>
+
 #include <async.h>
+#include <ipc/ipc.h>
 #include <ipc/services.h>
+
 #include <net/device.h>
 #include <adt/measured_strings.h>
@@ -56 +59 @@
     int state, services_t target)
 {
-        async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
-            (sysarg_t) state, target);
+        async_msg_3(phone, (ipcarg_t) message, (ipcarg_t) device_id,
+            (ipcarg_t) state, target);
         
         return EOK;
@@ -78 +81 @@
     int arg2, services_t service)
 {
-        return (int) async_req_3_0(phone, (sysarg_t) message,
-            (sysarg_t) device_id, (sysarg_t) arg2, (sysarg_t) service);
+        return (int) async_req_3_0(phone, (ipcarg_t) message,
+            (ipcarg_t) device_id, (ipcarg_t) arg2, (ipcarg_t) service);
 }
 
@@ -89 +92 @@
  * @param[out] address  The desired address.
  * @param[out] data     The address data container.
- * @return              EOK on success.
- * @return              EBADMEM if the address parameter and/or the data
+ * @returns             EOK on success.
+ * @returns             EBADMEM if the address parameter and/or the data
  *                      parameter is NULL.
- * @return              Other error codes as defined for the specific service
+ * @returns             Other error codes as defined for the specific service
  *                      message.
  */
 int
 generic_get_addr_req(int phone, int message, device_id_t device_id,
-    measured_string_t **address, uint8_t **data)
+    measured_string_ref *address, char ** data)
 {
         aid_t message_id;
-        sysarg_t result;
+        ipcarg_t result;
         int string;
 
@@ -106 +109 @@
                 return EBADMEM;
 
-        /* Request the address */
-        message_id = async_send_1(phone, (sysarg_t) message,
-            (sysarg_t) device_id, NULL);
+        // request the address
+        message_id = async_send_1(phone, (ipcarg_t) message,
+            (ipcarg_t) device_id, NULL);
         string = measured_strings_return(phone, address, data, 1);
         async_wait_for(message_id, &result);
 
-        /* If not successful */
+        // if not successful
         if ((string == EOK) && (result != EOK)) {
-                /* Clear the data */
+                // clear the data
                 free(*address);
                 free(*data);
@@ -135 +138 @@
 int
 generic_packet_size_req_remote(int phone, int message, device_id_t device_id,
-    packet_dimension_t *packet_dimension)
+    packet_dimension_ref packet_dimension)
 {
         if (!packet_dimension)
                 return EBADMEM;
         
-        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);
+        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);
         
         packet_dimension->prefix = (size_t) prefix;
@@ -172 +175 @@
 {
         if (error) {
-                async_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
-                    (sysarg_t) packet_id, (sysarg_t) target, (sysarg_t) error);
+                async_msg_4(phone, (ipcarg_t) message, (ipcarg_t) device_id,
+                    (ipcarg_t) packet_id, (ipcarg_t) target, (ipcarg_t) error);
         } else {
-                async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
-                    (sysarg_t) packet_id, (sysarg_t) target);
+                async_msg_3(phone, (ipcarg_t) message, (ipcarg_t) device_id,
+                    (ipcarg_t) packet_id, (ipcarg_t) target);
         }
         
@@ -198 +201 @@
 {
         if (error) {
-                async_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
-                    (sysarg_t) packet_id, (sysarg_t) sender, (sysarg_t) error);
+                async_msg_4(phone, (ipcarg_t) message, (ipcarg_t) device_id,
+                    (ipcarg_t) packet_id, (ipcarg_t) sender, (ipcarg_t) error);
         } else {
-                async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
-                    (sysarg_t) packet_id, (sysarg_t) sender);
+                async_msg_3(phone, (ipcarg_t) message, (ipcarg_t) device_id,
+                    (ipcarg_t) packet_id, (ipcarg_t) sender);
         }
         
@@ -220 +223 @@
  * @param[out] translation The translated values.
  * @param[out] data     The translation data container.
- * @return              EOK on success.
- * @return              EINVAL if the configuration parameter is NULL.
- * @return              EINVAL if the count parameter is zero.
- * @return              EBADMEM if the translation or the data parameters are
+ * @returns             EOK on success.
+ * @returns             EINVAL if the configuration parameter is NULL.
+ * @returns             EINVAL if the count parameter is zero.
+ * @returns             EBADMEM if the translation or the data parameters are
  *                      NULL.
- * @return              Other error codes as defined for the specific service
+ * @returns             Other error codes as defined for the specific service
  *                      message.
  */
 int
 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, uint8_t **data)
+    services_t service, measured_string_ref configuration, size_t count,
+    measured_string_ref *translation, char **data)
 {
         aid_t message_id;
-        sysarg_t result;
+        ipcarg_t result;
         int string;
 
@@ -242 +245 @@
                 return EBADMEM;
 
-        /* Request the translation */
-        message_id = async_send_3(phone, (sysarg_t) message,
-            (sysarg_t) device_id, (sysarg_t) count, (sysarg_t) service, NULL);
+        // request the translation
+        message_id = async_send_3(phone, (ipcarg_t) message,
+            (ipcarg_t) device_id, (ipcarg_t) count, (ipcarg_t) service, NULL);
         measured_strings_send(phone, configuration, count);
         string = measured_strings_return(phone, translation, data, count);
         async_wait_for(message_id, &result);
 
-        /* If not successful */
+        // if not successful
         if ((string == EOK) && (result != EOK)) {
-                /* Clear the data */
+                // clear the data
                 free(*translation);
                 free(*data);