Changeset 04803bf in mainline for uspace/lib/c/include/ipc/devmap.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/lib/c/include/ipc/devmap.h (moved) (moved from uspace/lib/libc/include/ipc/devmap.h ) (3 diffs)

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

@@ -34 +34 @@
 #define DEVMAP_DEVMAP_H_
 
-#include <atomic.h>
-#include <ipc/ipc.h>
-#include <adt/list.h>
+#include <ipc/common.h>
 
 #define DEVMAP_NAME_MAXLEN  255
 
-typedef ipcarg_t dev_handle_t;
+typedef sysarg_t devmap_handle_t;
+
+typedef enum {
+        DEV_HANDLE_NONE,
+        DEV_HANDLE_NAMESPACE,
+        DEV_HANDLE_DEVICE
+} devmap_handle_type_t;
 
 typedef enum {
@@ -47 +51 @@
         DEVMAP_DEVICE_REGISTER,
         DEVMAP_DEVICE_UNREGISTER,
-        DEVMAP_DEVICE_GET_NAME,
         DEVMAP_DEVICE_GET_HANDLE,
-        DEVMAP_DEVICE_NULL_CREATE,
-        DEVMAP_DEVICE_NULL_DESTROY,
-        DEVMAP_DEVICE_GET_COUNT,
-        DEVMAP_DEVICE_GET_DEVICES
+        DEVMAP_NAMESPACE_GET_HANDLE,
+        DEVMAP_HANDLE_PROBE,
+        DEVMAP_NULL_CREATE,
+        DEVMAP_NULL_DESTROY,
+        DEVMAP_GET_NAMESPACE_COUNT,
+        DEVMAP_GET_DEVICE_COUNT,
+        DEVMAP_GET_NAMESPACES,
+        DEVMAP_GET_DEVICES
 } devmap_request_t;
 
@@ -72 +79 @@
 
 typedef struct {
-        dev_handle_t handle;
+        devmap_handle_t handle;
         char name[DEVMAP_NAME_MAXLEN + 1];
 } dev_desc_t;