Changeset 8565a42 in mainline for kernel/generic/src/ipc/event.c

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

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

kernel/generic/src/ipc/event.c

@@ -61 +61 @@
 {
         assert(evno < EVENT_TASK_END);
-        
+
         event_t *event;
-        
+
         if (evno < EVENT_END)
                 event = &events[(event_type_t) evno];
         else
                 event = &task->events[(event_task_type_t) evno - EVENT_END];
-        
+
         return event;
 }
@@ -96 +96 @@
         for (unsigned int i = 0; i < EVENT_END; i++) {
                 spinlock_lock(&events[i].lock);
-                
+
                 if (events[i].answerbox == answerbox) {
                         events[i].answerbox = NULL;
@@ -103 +103 @@
                         events[i].masked = false;
                 }
-                
+
                 spinlock_unlock(&events[i].lock);
         }
@@ -125 +125 @@
 {
         assert(evno < EVENT_END);
-        
+
         _event_set_unmask_callback(evno2event(evno, NULL), callback);
 }
@@ -134 +134 @@
         assert(evno >= (int) EVENT_END);
         assert(evno < EVENT_TASK_END);
-                
+
         _event_set_unmask_callback(evno2event(evno, task), callback);
 }
@@ -144 +144 @@
 
         spinlock_lock(&event->lock);
-        
+
         if (event->answerbox != NULL) {
                 if (!event->masked) {
                         call_t *call = ipc_call_alloc(FRAME_ATOMIC);
-                        
+
                         if (call) {
                                 call->flags |= IPC_CALL_NOTIF;
                                 call->priv = ++event->counter;
-                                
+
                                 IPC_SET_IMETHOD(call->data, event->imethod);
                                 IPC_SET_ARG1(call->data, a1);
@@ -159 +159 @@
                                 IPC_SET_ARG4(call->data, a4);
                                 IPC_SET_ARG5(call->data, a5);
-                                
+
                                 call->data.task_id = TASK ? TASK->taskid : 0;
-                                
+
                                 irq_spinlock_lock(&event->answerbox->irq_lock,
                                     true);
@@ -168 +168 @@
                                 irq_spinlock_unlock(&event->answerbox->irq_lock,
                                     true);
-                                
+
                                 waitq_wakeup(&event->answerbox->wq,
                                     WAKEUP_FIRST);
-                                
+
                                 if (mask)
                                         event->masked = true;
-                                
+
                                 res = EOK;
                         } else
@@ -182 +182 @@
         } else
                 res = ENOENT;
-        
+
         spinlock_unlock(&event->lock);
         return res;
@@ -210 +210 @@
 {
         assert(evno < EVENT_END);
-        
+
         return event_enqueue(evno2event(evno, NULL), mask, a1, a2, a3, a4, a5);
 }
@@ -239 +239 @@
         assert(evno >= (int) EVENT_END);
         assert(evno < EVENT_TASK_END);
-        
+
         return event_enqueue(evno2event(evno, task), mask, a1, a2, a3, a4, a5);
 }
@@ -259 +259 @@
 {
         errno_t res;
-        
-        spinlock_lock(&event->lock);
-        
+
+        spinlock_lock(&event->lock);
+
         if (event->answerbox == NULL) {
                 event->answerbox = answerbox;
@@ -270 +270 @@
         } else
                 res = EEXIST;
-        
-        spinlock_unlock(&event->lock);
-        
+
+        spinlock_unlock(&event->lock);
+
         return res;
 }
@@ -289 +289 @@
 {
         errno_t res;
-        
-        spinlock_lock(&event->lock);
-        
+
+        spinlock_lock(&event->lock);
+
         if (event->answerbox == answerbox) {
                 event->answerbox = NULL;
@@ -300 +300 @@
         } else
                 res = ENOENT;
-        
-        spinlock_unlock(&event->lock);
-        
+
+        spinlock_unlock(&event->lock);
+
         return res;
 }
@@ -317 +317 @@
         event_callback_t callback = event->unmask_callback;
         spinlock_unlock(&event->lock);
-        
+
         /*
          * Check if there is an unmask callback
@@ -342 +342 @@
         if (evno >= EVENT_TASK_END)
                 return ELIMIT;
-        
+
         return (sys_errno_t) event_subscribe(evno2event(evno, TASK),
             (sysarg_t) imethod, &TASK->answerbox);
@@ -361 +361 @@
         if (evno >= EVENT_TASK_END)
                 return ELIMIT;
-        
+
         return (sys_errno_t) event_unsubscribe(evno2event(evno, TASK),
             &TASK->answerbox);
@@ -383 +383 @@
         if (evno >= EVENT_TASK_END)
                 return ELIMIT;
-        
+
         event_unmask(evno2event(evno, TASK));