Changeset 5828554 in mainline for abi/include

Timestamp:

2014-01-19T14:37:22Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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

Location:

abi/include/abi

Files:

• ipc/event.h (modified) (1 diff)
• kio.h (added)
• klog.h (modified) (2 diffs)
• log.h (moved) (moved from uspace/lib/usbhid/include/usb/hid/iface.h ) (2 diffs)
• 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/log.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2013 Martin Sucha
  * All rights reserved.
  *
@@ -27 +29 @@
  */
 
-/** @addtogroup libusbhid
+/** @addtogroup genericlog
  * @{
  */
 /** @file
- * Client functions for accessing USB HID interface.
  */
-#ifndef LIBUSBHID_CLASSES_HID_IFACE_H_
-#define LIBUSBHID_CLASSES_HID_IFACE_H_
 
-#include <sys/types.h>
-#include <async.h>
+#ifndef ABI_LOG_H_
+#define ABI_LOG_H_
 
-extern int usbhid_dev_get_event_length(async_sess_t *, size_t *);
-extern int usbhid_dev_get_event(async_sess_t *, uint8_t *, size_t, size_t *,
-    int *, unsigned int);
-extern int usbhid_dev_get_report_descriptor_length(async_sess_t *, size_t *);
-extern int usbhid_dev_get_report_descriptor(async_sess_t *, uint8_t *, size_t,
-    size_t *);
+/** Log message level. */
+typedef enum {
+        /** Fatal error, program is not able to recover at all. */
+        LVL_FATAL,
+        /** Serious error but the program can recover from it. */
+        LVL_ERROR,
+        /** Easily recoverable problem. */
+        LVL_WARN,
+        /** Information message that ought to be printed by default. */
+        LVL_NOTE,
+        /** Debugging purpose message. */
+        LVL_DEBUG,
+        /** More detailed debugging message. */
+        LVL_DEBUG2,
+        
+        /** For checking range of values */
+        LVL_LIMIT
+} log_level_t;
+
+/* Who is the source of the message? */
+typedef enum {
+        LF_OTHER = 0,
+        LF_USPACE,
+        LF_ARCH
+} log_facility_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;