Changeset 0fa34dd in mainline for abi/include/klog.h

Timestamp:

2012-12-02T16:36:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

11527051

Parents:

3e6a98c5 (diff), 4a5ba372 (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 non contentious changesets from lp:~jakub/helenos/klog.

• Removal of the amd64 and ia32 kernel debugger.
• Allow klog to feed kconsole commands to kernel's stdin.

File:

• abi/include/klog.h (moved) (moved from kernel/arch/amd64/include/debugger.h ) (3 diffs)

abi/include/klog.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2012 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup amd64debug
+/** @addtogroup generic
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef KERN_amd64_DEBUGGER_H_
-#define KERN_amd64_DEBUGGER_H_
+#ifndef ABI_KLOG_H_
+#define ABI_KLOG_H_
 
-#include <typedefs.h>
-
-#define BKPOINTS_MAX  4
-
-/* Flags that are passed to breakpoint_add function */
-#define BKPOINT_INSTR       0x1U
-#define BKPOINT_WRITE       0x2U
-#define BKPOINT_READ_WRITE  0x4U
-
-#define BKPOINT_CHECK_ZERO  0x8U
-
-
-extern void debugger_init(void);
-extern int breakpoint_add(const void *, const unsigned int, int);
-extern void breakpoint_del(int);
+enum {
+        KLOG_UNKNOW,
+        KLOG_WRITE,
+        KLOG_UPDATE,
+        KLOG_COMMAND
+};
 
 #endif