Changeset 5f7d96e in mainline for uspace/lib/c/include

Timestamp:

2010-12-27T18:18:03Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

43c3937

Parents:

e080332 (diff), e84d65a (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 from development

Location:

uspace/lib/c/include

Files:

• device/hw_res.h (modified) (1 diff)
• fibril_synch.h (modified) (2 diffs)
• ipc/kbd.h (modified) (1 diff)

uspace/lib/c/include/device/hw_res.h

@@ -95 +95 @@
 
 
-bool get_hw_resources(int dev_phone, hw_resource_list_t *hw_resources);
-
-bool enable_interrupt(int dev_phone);
+extern int get_hw_resources(int, hw_resource_list_t *);
+extern bool enable_interrupt(int);
 
 

uspace/lib/c/include/fibril_synch.h

@@ -105 +105 @@
 extern bool fibril_mutex_trylock(fibril_mutex_t *);
 extern void fibril_mutex_unlock(fibril_mutex_t *);
+extern bool fibril_mutex_is_locked(fibril_mutex_t *);
 
 extern void fibril_rwlock_initialize(fibril_rwlock_t *);
@@ -111 +112 @@
 extern void fibril_rwlock_read_unlock(fibril_rwlock_t *);
 extern void fibril_rwlock_write_unlock(fibril_rwlock_t *);
+extern bool fibril_rwlock_is_read_locked(fibril_rwlock_t *);
+extern bool fibril_rwlock_is_write_locked(fibril_rwlock_t *);
+extern bool fibril_rwlock_is_locked(fibril_rwlock_t *);
 
 extern void fibril_condvar_initialize(fibril_condvar_t *);

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

@@ -39 +39 @@
 
 #include <ipc/ipc.h>
+#include <ipc/dev_iface.h>
 
 typedef enum {
-        KBD_YIELD = IPC_FIRST_USER_METHOD,
+        KBD_YIELD = DEV_FIRST_CUSTOM_METHOD,
         KBD_RECLAIM
 } kbd_request_t;