Changeset 5828554 in mainline for kernel/generic/include

Timestamp:

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

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, 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:

kernel/generic/include

Files:

• console/console.h (modified) (2 diffs)
• debug.h (modified) (1 diff)
• log.h (moved) (moved from uspace/lib/c/include/device/ahci.h ) (2 diffs)
• synch/spinlock.h (modified) (2 diffs)

kernel/generic/include/console/console.h

@@ -39 +39 @@
 #include <print.h>
 #include <console/chardev.h>
+#include <synch/spinlock.h>
 
 #define PAGING(counter, increment, before, after) \
@@ -62 +63 @@
 extern void console_init(void);
 
-extern void klog_init(void);
-extern void klog_update(void *);
+extern void kio_init(void);
+extern void kio_update(void *);
+extern void kio_flush(void);
+extern void kio_push_char(const wchar_t);
+SPINLOCK_EXTERN(kio_lock);
 
 extern wchar_t getc(indev_t *indev);
 extern size_t gets(indev_t *indev, char *buf, size_t buflen);
-extern sysarg_t sys_klog(int cmd, const void *buf, size_t size);
+extern sysarg_t sys_kio(int cmd, const void *buf, size_t size);
 
 extern void grab_console(void);

kernel/generic/include/debug.h

@@ -107 +107 @@
 #define LOG(format, ...) \
         do { \
-                printf("%s() from %s at %s:%u: " format "\n", __func__, \
+                log(LF_OTHER, LVL_DEBUG, \
+                    "%s() from %s at %s:%u: " format,__func__, \
                     symtab_fmt_name_lookup(CALLER), __FILE__, __LINE__, \
                     ##__VA_ARGS__); \

kernel/generic/include/log.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Petr Jerman
+ * Copyright (c) 2013 Martin Sucha
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup genericlog
  * @{
  */
 /** @file
- * @brief AHCI interface definition.
  */
 
-#ifndef LIBC_DEVICE_AHCI_H_
-#define LIBC_DEVICE_AHCI_H_
+#ifndef KERN_LOG_H_
+#define KERN_LOG_H_
 
-#include <async.h>
-#include <devman.h>
+#include <typedefs.h>
+#include <stdarg.h>
+#include <printf/verify.h>
+#include <abi/log.h>
+#include <abi/klog.h>
 
-extern async_sess_t* ahci_get_sess(devman_handle_t, char **);
+extern void log_init(void);
+extern void log_begin(log_facility_t, log_level_t);
+extern void log_end(void);
+extern int log_vprintf(const char *, va_list);
+extern int log_printf(const char *, ...)
+    PRINTF_ATTRIBUTE(1, 2);
+extern int log(log_facility_t, log_level_t, const char *, ...)
+    PRINTF_ATTRIBUTE(3, 4);
 
-extern int ahci_get_sata_device_name(async_sess_t *, size_t, char *);
-extern int ahci_get_num_blocks(async_sess_t *, uint64_t *);
-extern int ahci_get_block_size(async_sess_t *, size_t *);
-extern int ahci_read_blocks(async_sess_t *, uint64_t, size_t, void *);
-extern int ahci_write_blocks(async_sess_t *, uint64_t, size_t, void *);
+extern sysarg_t sys_klog(sysarg_t, void *buf, size_t size,
+    sysarg_t level);
 
-#endif
+#endif /* KERN_LOG_H_ */
 
 /** @}

kernel/generic/include/synch/spinlock.h

@@ -137 +137 @@
 #ifdef CONFIG_DEBUG_SPINLOCK
 
-#include <print.h>
+#include <log.h>
 
 #define DEADLOCK_THRESHOLD  100000000
@@ -146 +146 @@
         if ((pname)++ > (value)) { \
                 (pname) = 0; \
-                printf("Deadlock probe %s: exceeded threshold %u\n" \
+                log(LF_OTHER, LVL_WARN, \
+                    "Deadlock probe %s: exceeded threshold %u\n" \
                     "cpu%u: function=%s, line=%u\n", \
                     #pname, (value), CPU->id, __func__, __LINE__); \