Changeset bd5f3b7 in mainline for abi/include/ipc/event.h

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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.

File:

• abi/include/ipc/event.h (moved) (moved from kernel/generic/include/ipc/event_types.h ) (2 diffs)

abi/include/ipc/event.h

@@ -33 +33 @@
  */
 
-#ifndef KERN_EVENT_TYPES_H_
-#define KERN_EVENT_TYPES_H_
+#ifndef ABI_IPC_EVENT_H_
+#define ABI_IPC_EVENT_H_
 
+/** Global events */
 typedef enum event_type {
         /** New data available in kernel log */
@@ -46 +47 @@
 } event_type_t;
 
+/** Per-task events. */
+typedef enum event_task_type {
+        EVENT_TASK_STATE_CHANGE = EVENT_END,
+        EVENT_TASK_END
+} event_task_type_t;
+
 #endif