Changeset 1b367b4 in mainline

Timestamp:

2011-02-08T19:21:46Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8b1e15ac

Parents:

ba38f72c

Message:

Small C-style fixes in devman client code.

File:

• uspace/lib/c/generic/devman.c (modified) (8 diffs)

uspace/lib/c/generic/devman.c

@@ -123 +123 @@
 }
 
-static int devman_send_match_id(int phone, match_id_t *match_id) \
-{
-        ipc_call_t answer;
-        aid_t req = async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score, &answer);
-        int retval = async_data_write_start(phone, match_id->id, str_size(match_id->id));
+static int devman_send_match_id(int phone, match_id_t *match_id)
+{
+        ipc_call_t answer;
+
+        aid_t req = async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score,
+            &answer);
+        int retval = async_data_write_start(phone, match_id->id,
+            str_size(match_id->id));
+
         async_wait_for(req, NULL);
         return retval;
@@ -133 +137 @@
 
 
-static int devman_send_match_ids(int phone, match_id_list_t *match_ids) 
+static int devman_send_match_ids(int phone, match_id_list_t *match_ids)
 {
         link_t *link = match_ids->ids.next;
         match_id_t *match_id = NULL;
         int ret = EOK;
-        
+
         while (link != &match_ids->ids) {
                 match_id = list_get_instance(link, match_id_t, link); 
-                if (EOK != (ret = devman_send_match_id(phone, match_id))) 
-                {
-                        printf("Driver failed to send match id, error number = %d\n", ret);
-                        return ret;                     
-                }
+                ret = devman_send_match_id(phone, match_id);
+                if (ret != EOK) {
+                        printf("Driver failed to send match id, error %d\n",
+                            ret);
+                        return ret;
+                }
+
                 link = link->next;
         }
-        return ret;     
-}
-
-int devman_child_device_register(
-        const char *name, match_id_list_t *match_ids, devman_handle_t parent_handle, devman_handle_t *handle)
-{               
+
+        return ret;
+}
+
+int devman_child_device_register(const char *name, match_id_list_t *match_ids,
+    devman_handle_t parent_handle, devman_handle_t *handle)
+{
         int phone = devman_get_phone(DEVMAN_DRIVER, IPC_FLAG_BLOCKING);
         
@@ -163 +170 @@
         int match_count = list_count(&match_ids->ids);  
         ipc_call_t answer;
-        aid_t req = async_send_2(phone, DEVMAN_ADD_CHILD_DEVICE, parent_handle, match_count, &answer);
+        aid_t req = async_send_2(phone, DEVMAN_ADD_CHILD_DEVICE, parent_handle, match_count,
+            &answer);
 
         sysarg_t retval = async_data_write_start(phone, name, str_size(name));
@@ -179 +187 @@
         
         if (retval != EOK) {
-                if (handle != NULL) {
+                if (handle != NULL)
                         *handle = -1;
-                }
-                return retval;
-        }       
+
+                return retval;
+        }
         
         if (handle != NULL)
-                *handle = (int) IPC_GET_ARG1(answer);   
-                
-        return retval;
-}
-
-int devman_add_device_to_class(devman_handle_t devman_handle, const char *class_name)
+                *handle = (int) IPC_GET_ARG1(answer);
+                
+        return retval;
+}
+
+int devman_add_device_to_class(devman_handle_t devman_handle,
+    const char *class_name)
 {
         int phone = devman_get_phone(DEVMAN_DRIVER, IPC_FLAG_BLOCKING);
@@ -200 +209 @@
         async_serialize_start();
         ipc_call_t answer;
-        aid_t req = async_send_1(phone, DEVMAN_ADD_DEVICE_TO_CLASS, devman_handle, &answer);
-        
-        sysarg_t retval = async_data_write_start(phone, class_name, str_size(class_name));
+        aid_t req = async_send_1(phone, DEVMAN_ADD_DEVICE_TO_CLASS,
+            devman_handle, &answer);
+        
+        sysarg_t retval = async_data_write_start(phone, class_name,
+            str_size(class_name));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -212 +223 @@
         async_serialize_end();
         
-        return retval;  
+        return retval;
 }
 
@@ -265 +276 @@
 }
 
-int devman_device_get_handle(const char *pathname, devman_handle_t *handle, unsigned int flags)
+int devman_device_get_handle(const char *pathname, devman_handle_t *handle,
+    unsigned int flags)
 {
         int phone = devman_get_phone(DEVMAN_CLIENT, flags);
@@ -278 +290 @@
             &answer);
         
-        sysarg_t retval = async_data_write_start(phone, pathname, str_size(pathname));
+        sysarg_t retval = async_data_write_start(phone, pathname,
+            str_size(pathname));
         if (retval != EOK) {
                 async_wait_for(req, NULL);