Changeset 87b4baa in mainline for uspace/lib/c/generic/devmap.c

Timestamp:

2010-12-17T20:16:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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/c/generic/devmap.c (modified) (11 diffs)

uspace/lib/c/generic/devmap.c

@@ -107 +107 @@
         aid_t req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
+        sysarg_t retval = async_data_write_start(phone, name, str_size(name));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -116 +116 @@
         async_set_client_connection(conn);
         
-        ipcarg_t callback_phonehash;
+        sysarg_t callback_phonehash;
         ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash);
         async_wait_for(req, &retval);
@@ -145 +145 @@
             &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
+        sysarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -181 +181 @@
             &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
+        sysarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -217 +217 @@
             &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
+        sysarg_t retval = async_data_write_start(phone, name, str_size(name));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -247 +247 @@
                 return phone;
         
-        ipcarg_t type;
+        sysarg_t type;
         int retval = async_req_1_1(phone, DEVMAP_HANDLE_PROBE, handle, &type);
         if (retval != EOK)
@@ -277 +277 @@
                 return -1;
         
-        ipcarg_t null_id;
+        sysarg_t null_id;
         int retval = async_req_0_1(phone, DEVMAP_NULL_CREATE, &null_id);
         if (retval != EOK)
@@ -292 +292 @@
                 return;
         
-        async_req_1_0(phone, DEVMAP_NULL_DESTROY, (ipcarg_t) null_id);
+        async_req_1_0(phone, DEVMAP_NULL_DESTROY, (sysarg_t) null_id);
 }
 
 static size_t devmap_count_namespaces_internal(int phone)
 {
-        ipcarg_t count;
+        sysarg_t count;
         int retval = async_req_0_1(phone, DEVMAP_GET_NAMESPACE_COUNT, &count);
         if (retval != EOK)
@@ -307 +307 @@
 static size_t devmap_count_devices_internal(int phone, devmap_handle_t ns_handle)
 {
-        ipcarg_t count;
+        sysarg_t count;
         int retval = async_req_1_1(phone, DEVMAP_GET_DEVICE_COUNT, ns_handle, &count);
         if (retval != EOK)
@@ -375 +375 @@
                 }
                 
-                ipcarg_t retval;
+                sysarg_t retval;
                 async_wait_for(req, &retval);
                 async_serialize_end();
@@ -427 +427 @@
                 }
                 
-                ipcarg_t retval;
+                sysarg_t retval;
                 async_wait_for(req, &retval);
                 async_serialize_end();