Changeset 92574f4 in mainline for uspace/lib/c/generic/devman.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

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

uspace/lib/c/generic/devman.c

@@ -28 +28 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
- /** @addtogroup libc
+
+/** @addtogroup libc
  * @{
  */
@@ -37 +37 @@
 #include <str.h>
 #include <stdio.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/devman.h>
@@ -116 +115 @@
         async_set_client_connection(conn);
         
-        ipc_connect_to_me(phone, 0, 0, 0, NULL, NULL);
+        async_connect_to_me(phone, 0, 0, 0, NULL);
         async_wait_for(req, &retval);
         
@@ -124 +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;
@@ -134 +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;
+}
+
+/** Add function to a device.
+ *
+ * Request devman to add a new function to the specified device owned by
+ * this driver task.
+ *
+ * @param name          Name of the new function
+ * @param ftype         Function type, fun_inner or fun_exposed
+ * @param match_ids     Match IDs (should be empty for fun_exposed)
+ * @param devh          Devman handle of the device
+ * @param funh          Place to store handle of the new function
+ *
+ * @return              EOK on success or negative error code.
+ */
+int devman_add_function(const char *name, fun_type_t ftype,
+    match_id_list_t *match_ids, devman_handle_t devh, devman_handle_t *funh)
+{
         int phone = devman_get_phone(DEVMAN_DRIVER, IPC_FLAG_BLOCKING);
+        int fun_handle;
         
         if (phone < 0)
@@ -162 +182 @@
         async_serialize_start();
         
-        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);
+        int match_count = list_count(&match_ids->ids);
+        ipc_call_t answer;
+
+        aid_t req = async_send_3(phone, DEVMAN_ADD_FUNCTION, (sysarg_t) ftype,
+            devh, match_count, &answer);
 
         sysarg_t retval = async_data_write_start(phone, name, str_size(name));
@@ -179 +201 @@
         async_serialize_end();
         
-        if (retval != EOK) {
-                if (handle != NULL) {
-                        *handle = -1;
-                }
-                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)
+        if (retval == EOK)
+                fun_handle = (int) IPC_GET_ARG1(answer);
+        else
+                fun_handle = -1;
+        
+        *funh = fun_handle;
+
+        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);
@@ -201 +221 @@
         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);
@@ -213 +235 @@
         async_serialize_end();
         
-        return retval;  
+        return retval;
 }
 
@@ -221 +243 @@
         case DEVMAN_DRIVER:
                 if (devman_phone_driver >= 0) {
-                        ipc_hangup(devman_phone_driver);
+                        async_hangup(devman_phone_driver);
                         devman_phone_driver = -1;
                 }
@@ -227 +249 @@
         case DEVMAN_CLIENT:
                 if (devman_phone_client >= 0) {
-                        ipc_hangup(devman_phone_client);
+                        async_hangup(devman_phone_client);
                         devman_phone_client = -1;
                 }
@@ -266 +288 @@
 }
 
-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);
@@ -279 +302 @@
             &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);