Changeset 3a0a4d8 in mainline for uspace/lib/c/include/ipc

Timestamp:

2013-09-12T07:54:05Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

95027b5

Parents:

47f5a77 (diff), 64f3d3b (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

Location:

uspace/lib/c/include/ipc

Files:

• corecfg.h (added)
• dev_iface.h (modified) (3 diffs)
• devman.h (modified) (3 diffs)
• services.h (modified) (1 diff)
• vfs.h (modified) (2 diffs)

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

@@ -36 +36 @@
 typedef enum {
         HW_RES_DEV_IFACE = 0,
+        PIO_WINDOW_DEV_IFACE,
+
         /** Character device interface */
         CHAR_DEV_IFACE,
@@ -41 +43 @@
         /** Graphic device interface */
         GRAPH_DEV_IFACE,
+
+        /** Audio device mixer interface */
+        AUDIO_MIXER_IFACE,
+        /** Audio device pcm buffer interface */
+        AUDIO_PCM_BUFFER_IFACE,
         
         /** Network interface controller interface */
@@ -54 +61 @@
         /** Interface provided by USB HID devices. */
         USBHID_DEV_IFACE,
+
         /** Interface provided by Real Time Clock devices */
         CLOCK_DEV_IFACE,
+
         /** Interface provided by battery powered devices */
         BATTERY_DEV_IFACE,
+
         /** Interface provided by AHCI devices. */
         AHCI_DEV_IFACE,

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;
 

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

@@ -53 +53 @@
 } services_t;
 
+#define SERVICE_NAME_CORECFG    "corecfg"
 #define SERVICE_NAME_DNSR       "net/dnsr"
 #define SERVICE_NAME_INET       "net/inet"

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

@@ -82 +82 @@
         VFS_IN_WAIT_HANDLE,
         VFS_IN_MTAB_GET,
+        VFS_IN_STATFS
 } vfs_in_request_t;
 
@@ -98 +99 @@
         VFS_OUT_LOOKUP,
         VFS_OUT_DESTROY,
+        VFS_OUT_STATFS,
         VFS_OUT_LAST
 } vfs_out_request_t;