Changes in uspace/lib/c/generic/devman.c [e72fb34:4db43721] in mainline

File:

• uspace/lib/c/generic/devman.c (modified) (15 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>
@@ -115 +116 @@
         async_set_client_connection(conn);
         
-        async_connect_to_me(phone, 0, 0, 0, NULL);
+        sysarg_t callback_phonehash;
+        ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash);
         async_wait_for(req, &retval);
         
@@ -123 +125 @@
 }
 
-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;
@@ -137 +135 @@
 
 
-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); 
-                ret = devman_send_match_id(phone, match_id);
-                if (ret != EOK) {
-                        return ret;
-                }
-
+                if (EOK != (ret = devman_send_match_id(phone, match_id))) 
+                {
+                        printf("Driver failed to send match id, error number = %d\n", ret);
+                        return ret;                     
+                }
                 link = link->next;
         }
-
-        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)
-{
+        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);
-        int fun_handle;
         
         if (phone < 0)
@@ -180 +163 @@
         async_serialize_start();
         
-        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);
+        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);
 
         sysarg_t retval = async_data_write_start(phone, name, str_size(name));
@@ -193 +174 @@
         }
         
-        int match_ids_rc = devman_send_match_ids(phone, match_ids);
+        devman_send_match_ids(phone, match_ids);
         
         async_wait_for(req, &retval);
@@ -199 +180 @@
         async_serialize_end();
         
-        /* Prefer the answer to DEVMAN_ADD_FUNCTION in case of errors. */
-        if ((match_ids_rc != EOK) && (retval == EOK)) {
-                retval = match_ids_rc;
-        }
-
-        if (retval == EOK)
-                fun_handle = (int) IPC_GET_ARG1(answer);
-        else
-                fun_handle = -1;
-        
-        *funh = fun_handle;
-
+        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)
+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);
@@ -224 +202 @@
         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);
@@ -238 +214 @@
         async_serialize_end();
         
-        return retval;
+        return retval;  
 }
 
@@ -246 +222 @@
         case DEVMAN_DRIVER:
                 if (devman_phone_driver >= 0) {
-                        async_hangup(devman_phone_driver);
+                        ipc_hangup(devman_phone_driver);
                         devman_phone_driver = -1;
                 }
@@ -252 +228 @@
         case DEVMAN_CLIENT:
                 if (devman_phone_client >= 0) {
-                        async_hangup(devman_phone_client);
+                        ipc_hangup(devman_phone_client);
                         devman_phone_client = -1;
                 }
@@ -291 +267 @@
 }
 
-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);
@@ -305 +280 @@
             &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);
@@ -329 +303 @@
 }
 
-int devman_device_get_handle_by_class(const char *classname,
-    const char *devname, devman_handle_t *handle, unsigned int flags)
-{
-        int phone = devman_get_phone(DEVMAN_CLIENT, flags);
-
-        if (phone < 0)
-                return phone;
-
-        async_serialize_start();
-
-        ipc_call_t answer;
-        aid_t req = async_send_1(phone, DEVMAN_DEVICE_GET_HANDLE_BY_CLASS,
-            flags, &answer);
-
-        sysarg_t retval = async_data_write_start(phone, classname,
-            str_size(classname));
-        if (retval != EOK) {
-                async_wait_for(req, NULL);
-                async_serialize_end();
-                return retval;
-        }
-        retval = async_data_write_start(phone, devname,
-            str_size(devname));
-        if (retval != EOK) {
-                async_wait_for(req, NULL);
-                async_serialize_end();
-                return retval;
-        }
-
-        async_wait_for(req, &retval);
-
-        async_serialize_end();
-
-        if (retval != EOK) {
-                if (handle != NULL)
-                        *handle = (devman_handle_t) -1;
-                return retval;
-        }
-
-        if (handle != NULL)
-                *handle = (devman_handle_t) IPC_GET_ARG1(answer);
-
-        return retval;
-}
-
 
 /** @}