Changeset 0fa34dd in mainline for kernel

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.

Location:

kernel

Files:

• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/amd64/src/amd64.c (modified) (2 diffs)
• arch/amd64/src/debugger.c (deleted)
• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia32/include/debugger.h (deleted)
• arch/ia32/src/debugger.c (deleted)
• arch/ia32/src/ia32.c (modified) (2 diffs)
• generic/include/console/console.h (modified) (1 diff)
• generic/src/console/console.c (modified) (3 diffs)

kernel/arch/amd64/Makefile.inc

@@ -76 +76 @@
         arch/$(KARCH)/src/proc/thread.c \
         arch/$(KARCH)/src/userspace.c \
-        arch/$(KARCH)/src/syscall.c \
-        arch/$(KARCH)/src/debugger.c
+        arch/$(KARCH)/src/syscall.c
 
 ifeq ($(CONFIG_SMP),y)

kernel/arch/amd64/src/amd64.c

@@ -43 +43 @@
 #include <arch/bios/bios.h>
 #include <arch/boot/boot.h>
-#include <arch/debugger.h>
 #include <arch/drivers/i8254.h>
 #include <arch/drivers/i8259.h>
@@ -161 +160 @@
 #endif
                 
-                /* Enable debugger */
-                debugger_init();
                 /* Merge all memory zones to 1 big zone */
                 zone_merge_all();

kernel/arch/ia32/Makefile.inc

@@ -105 +105 @@
         arch/$(KARCH)/src/boot/memmap.c \
         arch/$(KARCH)/src/fpu_context.c \
-        arch/$(KARCH)/src/debugger.c \
         arch/$(KARCH)/src/syscall.c

kernel/arch/ia32/src/ia32.c

@@ -45 +45 @@
 #include <arch/bios/bios.h>
 #include <arch/boot/boot.h>
-#include <arch/debugger.h>
 #include <arch/drivers/i8254.h>
 #include <arch/drivers/i8259.h>
@@ -118 +117 @@
 #endif
                 
-                /* Enable debugger */
-                debugger_init();
                 /* Merge all memory zones to 1 big zone */
                 zone_merge_all();

kernel/generic/include/console/console.h

@@ -67 +67 @@
 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 fd, const void *buf, size_t size);
+extern sysarg_t sys_klog(int cmd, const void *buf, size_t size);
 
 extern void grab_console(void);

kernel/generic/src/console/console.c

@@ -52 +52 @@
 #include <errno.h>
 #include <str.h>
+#include <abi/klog.h>
 
 #define KLOG_PAGES    8
@@ -335 +336 @@
  *
  */
-sysarg_t sys_klog(int fd, const void *buf, size_t size)
+sysarg_t sys_klog(int cmd, const void *buf, size_t size)
 {
         char *data;
         int rc;
-        
+
+        switch (cmd) {
+        case KLOG_UPDATE:
+                klog_update(NULL);
+                return EOK;
+        case KLOG_WRITE:
+        case KLOG_COMMAND:
+                break;
+        default:
+                return ENOTSUP;
+        }
+
         if (size > PAGE_SIZE)
                 return (sysarg_t) ELIMIT;
@@ -355 +367 @@
                 data[size] = 0;
                 
-                printf("%s", data);
+                switch (cmd) {
+                case KLOG_WRITE:
+                        printf("%s", data);
+                        break;
+                case KLOG_COMMAND:
+                        for (unsigned int i = 0; i < size; i++)
+                                indev_push_character(stdin, data[i]);
+                        indev_push_character(stdin, '\n');
+                        break;
+                }
+
                 free(data);
-        } else
-                klog_update(NULL);
-        
+        }
+
         return size;
 }