Changeset 3f03199 in mainline for uspace/lib/c/include/ipc/devman.h

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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:

Merge mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/lib/c/include/ipc/devman.h (modified) (3 diffs)

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 {
@@ -155 +169 @@
         DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD,
         DEVMAN_DEV_GET_FUNCTIONS,
+        DEVMAN_DEV_GET_PARENT,
         DEVMAN_FUN_GET_CHILD,
+        DEVMAN_FUN_GET_MATCH_ID,
         DEVMAN_FUN_GET_NAME,
         DEVMAN_FUN_GET_DRIVER_NAME,
@@ -161 +177 @@
         DEVMAN_FUN_OFFLINE,
         DEVMAN_FUN_GET_PATH,
-        DEVMAN_FUN_SID_TO_HANDLE
+        DEVMAN_FUN_SID_TO_HANDLE,
+        DEVMAN_GET_DRIVERS,
+        DEVMAN_DRIVER_GET_DEVICES,
+        DEVMAN_DRIVER_GET_HANDLE,
+        DEVMAN_DRIVER_GET_MATCH_ID,
+        DEVMAN_DRIVER_GET_NAME,
+        DEVMAN_DRIVER_GET_STATE,
+        DEVMAN_DRIVER_LOAD
 } client_to_devman_t;