Changeset 66be0288 in mainline for abi/include

Timestamp:

2014-01-17T17:02:59Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

476f62c, facc34d

Parents:

2e80321 (diff), 61b5b73d (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:

Mainline changes

Location:

abi/include/abi

Files:

• ipc/event.h (modified) (1 diff)
• kio.h (added)
• klog.h (modified) (2 diffs)
• log.h (added)
• syscall.h (modified) (2 diffs)

abi/include/abi/ipc/event.h

@@ -38 +38 @@
 /** Global events */
 typedef enum event_type {
-        /** New data available in kernel log */
-        EVENT_KLOG = 0,
+        /** New data available in kernel character buffer */
+        EVENT_KIO = 0,
         /** Returning from kernel console to uspace */
         EVENT_KCONSOLE,
         /** A task/thread has faulted and will be terminated */
         EVENT_FAULT,
+        /** New data available in kernel log */
+        EVENT_KLOG,
         EVENT_END
 } event_type_t;

abi/include/abi/klog.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jakub Jermar
+ * Copyright (c) 2014 Martin Sucha
  * All rights reserved.
  *
@@ -36 +36 @@
 #define ABI_KLOG_H_
 
-enum {
-        KLOG_UNKNOW,
+typedef enum {
         KLOG_WRITE,
-        KLOG_UPDATE,
-        KLOG_COMMAND
-};
+        KLOG_READ
+} klog_operation_t;
 
 #endif

abi/include/abi/syscall.h

@@ -37 +37 @@
 
 typedef enum {
-        SYS_KLOG = 0,
+        SYS_KIO = 0,
         SYS_TLS_SET = 1,  /* Hardcoded for AMD64, IA-32 (fibril.S in uspace) */
         
@@ -99 +99 @@
         SYS_DEBUG_ACTIVATE_CONSOLE,
         
+        SYS_KLOG,
+        
         SYSCALL_END
 } syscall_t;