Changeset 8fb1bf82 in mainline for uspace/lib/c/include/ipc

Timestamp:

2010-11-25T13:42:50Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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:

• dev_iface.h (added)
• devman.h (added)
• devmap.h (modified) (2 diffs)
• driver.h (added)
• serial_ctl.h (added)
• services.h (modified) (2 diffs)

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

@@ -40 +40 @@
 #define DEVMAP_NAME_MAXLEN  255
 
-typedef ipcarg_t dev_handle_t;
+typedef ipcarg_t devmap_handle_t;
 
 typedef enum {
@@ -81 +81 @@
 
 typedef struct {
-        dev_handle_t handle;
+        devmap_handle_t handle;
         char name[DEVMAP_NAME_MAXLEN + 1];
 } dev_desc_t;

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

@@ -39 +39 @@
 
 typedef enum {
-        SERVICE_LOAD = 1,
+        SERVICE_NONE = 0,
+        SERVICE_LOAD,
         SERVICE_PCI,
         SERVICE_VIDEO,
@@ -45 +46 @@
         SERVICE_VFS,
         SERVICE_DEVMAP,
+        SERVICE_DEVMAN,
         SERVICE_FHC,
         SERVICE_OBIO,