Changeset e1a27be in mainline for kernel/generic

Timestamp:

2012-12-29T10:48:35Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

17cc8f4f

Parents:

8f88beb7 (diff), c928bb7 (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

Files:

• include/console/console.h (modified) (1 diff)
• src/console/console.c (modified) (3 diffs)
• src/proc/scheduler.c (modified) (2 diffs)

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:
+                        if (!stdin)
+                                break;
+                        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;
 }

kernel/generic/src/proc/scheduler.c

@@ -92 +92 @@
         else
                 fpu_disable();
-#else
+#elif defined CONFIG_FPU
         fpu_enable();
         if (THREAD->fpu_context_exists)
@@ -327 +327 @@
                 THREAD->kcycles += get_cycle() - THREAD->last_cycle;
                 
-#ifndef CONFIG_FPU_LAZY
+#if (defined CONFIG_FPU) && (!defined CONFIG_FPU_LAZY)
                 fpu_context_save(THREAD->saved_fpu_context);
 #endif