Changeset 1db5669 in mainline for uspace/srv/devman

Timestamp:

2013-09-11T12:35:55Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

48bd6f4, 4c9b28a

Parents:

cd3b380

Message:

devctl show-drv lists attached devices, add device count to list-drv.

Location:

uspace/srv/devman

Files:

• client_conn.c (modified) (6 diffs)
• driver.c (modified) (1 diff)
• driver.h (modified) (1 diff)

uspace/srv/devman/client_conn.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -269 +270 @@
 }
 
+/** Get handle for parent function of a device. */
+static void devman_dev_get_parent(ipc_callid_t iid, ipc_call_t *icall)
+{
+        dev_node_t *dev;
+        
+        fibril_rwlock_read_lock(&device_tree.rwlock);
+        
+        dev = find_dev_node_no_lock(&device_tree, IPC_GET_ARG1(*icall));
+        if (dev == NULL || dev->state == DEVICE_REMOVED) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        if (dev->pfun == NULL) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        async_answer_1(iid, EOK, dev->pfun->handle);
+        
+        fibril_rwlock_read_unlock(&device_tree.rwlock);
+}
+
 static void devman_dev_get_functions(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -425 +451 @@
         
         if (!async_data_read_receive(&callid, &size)) {
-                async_answer_0(callid, EREFUSED);
                 async_answer_0(iid, EREFUSED);
                 return;
@@ -449 +474 @@
         async_answer_1(iid, retval, act_size);
 }
+
+static void devman_driver_get_devices(ipc_callid_t iid, ipc_call_t *icall)
+{
+        ipc_callid_t callid;
+        size_t size;
+        size_t act_size;
+        int rc;
+        
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        driver_t *drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall));
+        if (drv == NULL) {
+                async_answer_0(callid, ENOENT);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        devman_handle_t *hdl_buf = (devman_handle_t *) malloc(size);
+        if (hdl_buf == NULL) {
+                async_answer_0(callid, ENOMEM);
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+        
+        rc = driver_get_devices(drv, hdl_buf, size, &act_size);
+        if (rc != EOK) {
+                fibril_rwlock_read_unlock(&device_tree.rwlock);
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+                return;
+        }
+        
+        sysarg_t retval = async_data_read_finalize(callid, hdl_buf, size);
+        free(hdl_buf);
+        
+        async_answer_1(iid, retval, act_size);
+}
+
 
 /** Find driver by name. */
@@ -563 +629 @@
                         devman_function_get_handle(callid, &call);
                         break;
+                case DEVMAN_DEV_GET_PARENT:
+                        devman_dev_get_parent(callid, &call);
+                        break;
                 case DEVMAN_DEV_GET_FUNCTIONS:
                         devman_dev_get_functions(callid, &call);
@@ -589 +658 @@
                 case DEVMAN_GET_DRIVERS:
                         devman_get_drivers(callid, &call);
+                        break;
+                case DEVMAN_DRIVER_GET_DEVICES:
+                        devman_driver_get_devices(callid, &call);
                         break;
                 case DEVMAN_DRIVER_GET_HANDLE:

uspace/srv/devman/driver.c

@@ -729 +729 @@
 }
 
+/** Get list of device functions. */
+int driver_get_devices(driver_t *driver, devman_handle_t *hdl_buf,
+    size_t buf_size, size_t *act_size)
+{
+        size_t act_cnt;
+        size_t buf_cnt;
+
+        fibril_mutex_lock(&driver->driver_mutex);
+
+        buf_cnt = buf_size / sizeof(devman_handle_t);
+
+        act_cnt = list_count(&driver->devices);
+        *act_size = act_cnt * sizeof(devman_handle_t);
+
+        if (buf_size % sizeof(devman_handle_t) != 0) {
+                fibril_mutex_unlock(&driver->driver_mutex);
+                return EINVAL;
+        }
+
+        size_t pos = 0;
+        list_foreach(driver->devices, driver_devices, dev_node_t, dev) {
+                if (pos < buf_cnt) {
+                        hdl_buf[pos] = dev->handle;
+                }
+
+                pos++;
+        }
+
+        fibril_mutex_unlock(&driver->driver_mutex);
+        return EOK;
+}
+
 /** @}
  */

uspace/srv/devman/driver.h

@@ -64 +64 @@
 extern void delete_driver(driver_t *);
 extern int driver_get_list(driver_list_t *, devman_handle_t *, size_t, size_t *);
+extern int driver_get_devices(driver_t *, devman_handle_t *, size_t, size_t *);
 
 #endif