Changeset e5556e4a in mainline

Timestamp:

2013-09-11T09:46:38Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7969087

Parents:

4c6ade6

Message:

Reverse order of drivers in driver list. Print driver state.

Location:

uspace

Files:

• app/devctl/devctl.c (modified) (2 diffs)
• lib/c/generic/devman.c (modified) (1 diff)
• lib/c/include/devman.h (modified) (1 diff)
• lib/c/include/ipc/devman.h (modified) (2 diffs)
• srv/devman/client_conn.c (modified) (2 diffs)
• srv/devman/devman.h (modified) (2 diffs)
• srv/devman/driver.c (modified) (1 diff)

uspace/app/devctl/devctl.c

@@ -162 +162 @@
 {
         devman_handle_t *drvs;
+        driver_state_t state;
+        const char *sstate;
         size_t ndrvs;
         size_t i;
@@ -170 +172 @@
                 return rc;
 
-        printf("Got %d handles\n", ndrvs);
         for (i = 0; i < ndrvs; i++) {
                 rc = devman_driver_get_name(drvs[i], drv_name, MAX_NAME_LENGTH);
                 if (rc != EOK)
                         continue;
-                printf("%3d %s\n", (int)drvs[i], drv_name);
+                rc = devman_driver_get_state(drvs[i], &state);
+                if (rc != EOK)
+                        continue;
+                switch (state) {
+                case DRIVER_NOT_STARTED:
+                        sstate = "not started";
+                        break;
+                case DRIVER_STARTING:
+                        sstate = "starting";
+                        break;
+                case DRIVER_RUNNING:
+                        sstate = "running";
+                        break;
+                default:
+                        sstate = "unknown";
+                }
+                printf("%3d %-10s %s\n", (int)drvs[i], drv_name, sstate);
         }
         free(drvs);

uspace/lib/c/generic/devman.c

@@ -604 +604 @@
 }
 
+int devman_driver_get_state(devman_handle_t drvh, driver_state_t *rstate)
+{
+        sysarg_t state;
+        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        int rc = async_req_1_1(exch, DEVMAN_DRIVER_GET_STATE, drvh,
+            &state);
+        
+        devman_exchange_end(exch);
+        if (rc != EOK)
+                return rc;
+
+        *rstate = state;
+        return rc;
+}
+
 /** @}
  */

uspace/lib/c/include/devman.h

@@ -73 +73 @@
 extern int devman_get_drivers(devman_handle_t **, size_t *);
 extern int devman_driver_get_name(devman_handle_t, char *, size_t);
+extern int devman_driver_get_state(devman_handle_t, driver_state_t *);
 
 #endif

uspace/lib/c/include/ipc/devman.h

@@ -42 +42 @@
 
 typedef sysarg_t devman_handle_t;
+
+typedef enum {
+        /** Driver has not been started. */
+        DRIVER_NOT_STARTED = 0,
+        
+        /**
+         * Driver has been started, but has not registered as running and ready
+         * to receive requests.
+         */
+        DRIVER_STARTING,
+        
+        /** Driver is running and prepared to serve incomming requests. */
+        DRIVER_RUNNING
+} driver_state_t;
 
 typedef enum {
@@ -163 +177 @@
         DEVMAN_FUN_SID_TO_HANDLE,
         DEVMAN_GET_DRIVERS,
-        DEVMAN_DRIVER_GET_NAME
+        DEVMAN_DRIVER_GET_NAME,
+        DEVMAN_DRIVER_GET_STATE
 } client_to_devman_t;
 

uspace/srv/devman/client_conn.c

@@ -490 +490 @@
 }
 
+/** Get driver state. */
+static void devman_driver_get_state(ipc_callid_t iid, ipc_call_t *icall)
+{
+        driver_t *drv;
+        
+        drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall));
+        if (drv == NULL) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        async_answer_1(iid, EOK, (sysarg_t) drv->state);
+}
+
 /** Function for handling connections from a client to the device manager. */
 void devman_connection_client(ipc_callid_t iid, ipc_call_t *icall)
@@ -537 +551 @@
                         devman_driver_get_name(callid, &call);
                         break;
+                case DEVMAN_DRIVER_GET_STATE:
+                        devman_driver_get_state(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, ENOENT);

uspace/srv/devman/devman.h

@@ -62 +62 @@
 } client_t;
 
-typedef enum {
-        /** Driver has not been started. */
-        DRIVER_NOT_STARTED = 0,
-        
-        /**
-         * Driver has been started, but has not registered as running and ready
-         * to receive requests.
-         */
-        DRIVER_STARTING,
-        
-        /** Driver is running and prepared to serve incomming requests. */
-        DRIVER_RUNNING
-} driver_state_t;
-
 /** Representation of device driver. */
 typedef struct driver {
@@ -87 +73 @@
          * and prepared to receive requests.
          */
-        int state;
+        driver_state_t state;
         
         /** Session asociated with this driver. */

uspace/srv/devman/driver.c

@@ -81 +81 @@
 {
         fibril_mutex_lock(&drivers_list->drivers_mutex);
-        list_prepend(&drv->drivers, &drivers_list->drivers);
+        list_append(&drv->drivers, &drivers_list->drivers);
         drv->handle = drivers_list->next_handle++;
         fibril_mutex_unlock(&drivers_list->drivers_mutex);