Changeset 8b655705 in mainline for uspace/lib/c/include/ipc/devman.h

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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.

File:

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

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

@@ -30 +30 @@
  * @{
  */
- 
+
 #ifndef LIBC_IPC_DEVMAN_H_
 #define LIBC_IPC_DEVMAN_H_
 
+#include <ipc/common.h>
 #include <adt/list.h>
-#include <ipc/ipc.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <str.h>
+#include <malloc.h>
+#include <mem.h>
 
-#define DEVMAN_NAME_MAXLEN 256
+#define DEVMAN_NAME_MAXLEN  256
 
 typedef sysarg_t devman_handle_t;
+
+typedef enum {
+        /** Invalid value for debugging purposes */
+        fun_invalid = 0,
+        /** Function to which child devices attach */
+        fun_inner,
+        /** Fuction exported to external clients (leaf function) */
+        fun_exposed
+} fun_type_t;
 
 /** Ids of device models used for device-to-driver matching.
@@ -67 +75 @@
 } match_id_list_t;
 
-
-static inline match_id_t * create_match_id()
+static inline match_id_t *create_match_id(void)
 {
         match_id_t *id = malloc(sizeof(match_id_t));
@@ -85 +92 @@
 }
 
-static inline void add_match_id(match_id_list_t *ids, match_id_t *id) 
+static inline void add_match_id(match_id_list_t *ids, match_id_t *id)
 {
         match_id_t *mid = NULL;
-        link_t *link = ids->ids.next;   
+        link_t *link = ids->ids.next;
         
         while (link != &ids->ids) {
@@ -98 +105 @@
         }
         
-        list_insert_before(&id->link, link);    
+        list_insert_before(&id->link, link);
 }
 
@@ -129 +136 @@
 typedef enum {
         DEVMAN_DRIVER_REGISTER = IPC_FIRST_USER_METHOD,
-        DEVMAN_ADD_CHILD_DEVICE,
+        DEVMAN_ADD_FUNCTION,
         DEVMAN_ADD_MATCH_ID,
         DEVMAN_ADD_DEVICE_TO_CLASS
@@ -141 +148 @@
 
 typedef enum {
-        DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD
+        DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD,
+        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS
 } client_to_devman_t;