Changeset 8e7c9fe in mainline for uspace/lib/c/generic/event.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/lib/c/generic/event.c (modified) (3 diffs)

uspace/lib/c/generic/event.c

@@ -38 +38 @@
 
 #include <libc.h>
-#include <event.h>
+#include <ipc/event.h>
 
-/** Subscribe event notifications.
+/** Subscribe to event notifications.
  *
  * @param evno    Event type to subscribe.
@@ -48 +48 @@
  *
  */
-int event_subscribe(event_type_t evno, sysarg_t imethod)
+int ipc_event_subscribe(event_type_t evno, sysarg_t imethod)
 {
-        return __SYSCALL2(SYS_EVENT_SUBSCRIBE, (sysarg_t) evno,
+        return __SYSCALL2(SYS_IPC_EVENT_SUBSCRIBE, (sysarg_t) evno,
             (sysarg_t) imethod);
 }
 
-int event_task_subscribe(event_task_type_t evno, sysarg_t imethod)
+/** Subscribe to task event notifications.
+ *
+ * @param evno    Event type to subscribe.
+ * @param imethod Use this interface and method for notifying me.
+ *
+ * @return Value returned by the kernel.
+ *
+ */
+int ipc_event_task_subscribe(event_task_type_t evno, sysarg_t imethod)
 {
-        return __SYSCALL2(SYS_EVENT_SUBSCRIBE, (sysarg_t) evno,
+        return __SYSCALL2(SYS_IPC_EVENT_SUBSCRIBE, (sysarg_t) evno,
             (sysarg_t) imethod);
+}
+
+/** Unsubscribe from event notifications.
+ *
+ * @param evno    Event type to unsubscribe.
+ *
+ * @return Value returned by the kernel.
+ *
+ */
+int ipc_event_unsubscribe(event_type_t evno)
+{
+        return __SYSCALL1(SYS_IPC_EVENT_UNSUBSCRIBE, (sysarg_t) evno);
+}
+
+/** Unsubscribe from task event notifications.
+ *
+ * @param evno    Event type to unsubscribe.
+ *
+ * @return Value returned by the kernel.
+ *
+ */
+int ipc_event_task_unsubscribe(event_task_type_t evno)
+{
+        return __SYSCALL1(SYS_IPC_EVENT_UNSUBSCRIBE, (sysarg_t) evno);
 }
 
@@ -67 +99 @@
  *
  */
-int event_unmask(event_type_t evno)
+int ipc_event_unmask(event_type_t evno)
 {
-        return __SYSCALL1(SYS_EVENT_UNMASK, (sysarg_t) evno);
+        return __SYSCALL1(SYS_IPC_EVENT_UNMASK, (sysarg_t) evno);
 }
 
-int event_task_unmask(event_task_type_t evno)
+/** Unmask task event notifications.
+ *
+ * @param evno Event type to unmask.
+ *
+ * @return Value returned by the kernel.
+ *
+ */
+int ipc_event_task_unmask(event_task_type_t evno)
 {
-        return __SYSCALL1(SYS_EVENT_UNMASK, (sysarg_t) evno);
+        return __SYSCALL1(SYS_IPC_EVENT_UNMASK, (sysarg_t) evno);
 }