Changes in uspace/lib/c/include/ipc/devman.h [fc8c2b6:692c40cb] in mainline

File:

• uspace/lib/c/include/ipc/devman.h (modified) (7 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 <malloc.h>
-#include <mem.h>
+#include <ipc/ipc.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <str.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;
+typedef ipcarg_t device_handle_t;
 
 /** Ids of device models used for device-to-driver matching.
@@ -75 +67 @@
 } match_id_list_t;
 
-static inline match_id_t *create_match_id(void)
+
+static inline match_id_t * create_match_id()
 {
         match_id_t *id = malloc(sizeof(match_id_t));
@@ -92 +85 @@
 }
 
-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) {
@@ -105 +98 @@
         }
         
-        list_insert_before(&id->link, link);
+        list_insert_before(&id->link, link);    
 }
 
@@ -130 +123 @@
         DEVMAN_CLIENT,
         DEVMAN_CONNECT_TO_DEVICE,
-        DEVMAN_CONNECT_FROM_DEVMAP,
         DEVMAN_CONNECT_TO_PARENTS_DEVICE
 } devman_interface_t;
@@ -136 +128 @@
 typedef enum {
         DEVMAN_DRIVER_REGISTER = IPC_FIRST_USER_METHOD,
-        DEVMAN_ADD_FUNCTION,
+        DEVMAN_ADD_CHILD_DEVICE,
         DEVMAN_ADD_MATCH_ID,
         DEVMAN_ADD_DEVICE_TO_CLASS
@@ -148 +140 @@
 
 typedef enum {
-        DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD,
-        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS
+        DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD
 } client_to_devman_t;