Changeset 8e7c9fe in mainline for kernel/generic/src/ipc/event.c

Timestamp:

2014-09-12T03:45:25Z (11 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:

• kernel/generic/src/ipc/event.c (modified) (8 diffs)

kernel/generic/src/ipc/event.c

@@ -58 +58 @@
 }
 
-static event_t *evno2event(int evno, task_t *t)
+static event_t *evno2event(int evno, task_t *task)
 {
         ASSERT(evno < EVENT_TASK_END);
-
+        
         event_t *event;
-
+        
         if (evno < EVENT_END)
                 event = &events[(event_type_t) evno];
         else
-                event = &t->events[(event_task_type_t) evno - EVENT_END];
-
+                event = &task->events[(event_task_type_t) evno - EVENT_END];
+        
         return event;
 }
@@ -86 +86 @@
                 event_initialize(evno2event(i, task));
 }
-
 
 /** Unsubscribe kernel events associated with an answerbox
@@ -260 +259 @@
 {
         int res;
-
+        
         spinlock_lock(&event->lock);
         
@@ -277 +276 @@
 }
 
+/** Unsubscribe event notifications
+ *
+ * @param evno      Event type.
+ * @param answerbox Answerbox used to send the notifications to.
+ *
+ * @return EOK if the subscription was successful.
+ * @return EEXISTS if the notifications of the given type are
+ *         already subscribed.
+ *
+ */
+static int event_unsubscribe(event_t *event, answerbox_t *answerbox)
+{
+        int res;
+        
+        spinlock_lock(&event->lock);
+        
+        if (event->answerbox == answerbox) {
+                event->answerbox = NULL;
+                event->counter = 0;
+                event->imethod = 0;
+                event->masked = false;
+                res = EOK;
+        } else
+                res = ENOENT;
+        
+        spinlock_unlock(&event->lock);
+        
+        return res;
+}
+
 /** Unmask event notifications
  *
@@ -297 +326 @@
 }
 
-/** Event notification syscall wrapper
+/** Event notification subscription syscall wrapper
  *
  * @param evno    Event type to subscribe.
@@ -309 +338 @@
  *
  */
-sysarg_t sys_event_subscribe(sysarg_t evno, sysarg_t imethod)
+sysarg_t sys_ipc_event_subscribe(sysarg_t evno, sysarg_t imethod)
 {
         if (evno >= EVENT_TASK_END)
@@ -316 +345 @@
         return (sysarg_t) event_subscribe(evno2event(evno, TASK),
             (sysarg_t) imethod, &TASK->answerbox);
+}
+
+/** Event notification unsubscription syscall wrapper
+ *
+ * @param evno    Event type to unsubscribe.
+ *
+ * @return EOK on success.
+ * @return ELIMIT on unknown event type.
+ * @return ENOENT if the notification of the given type is not
+           subscribed.
+ *
+ */
+sysarg_t sys_ipc_event_unsubscribe(sysarg_t evno)
+{
+        if (evno >= EVENT_TASK_END)
+                return ELIMIT;
+        
+        return (sysarg_t) event_unsubscribe(evno2event(evno, TASK),
+            &TASK->answerbox);
 }
 
@@ -331 +379 @@
  *
  */
-sysarg_t sys_event_unmask(sysarg_t evno)
+sysarg_t sys_ipc_event_unmask(sysarg_t evno)
 {
         if (evno >= EVENT_TASK_END)