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

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/devmap.h (modified) (2 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 {
@@ -81 +79 @@
 
 typedef struct {
-        dev_handle_t handle;
+        devmap_handle_t handle;
         char name[DEVMAP_NAME_MAXLEN + 1];
 } dev_desc_t;