Changeset 312cc68 in mainline

Timestamp:

2009-03-18T10:48:46Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8015eeec

Parents:

65513a5

Message:

move syscall wrappers to more suitable location

File:

• kernel/generic/src/console/console.c (modified) (4 diffs)

kernel/generic/src/console/console.c

@@ -40 +40 @@
 #include <synch/spinlock.h>
 #include <arch/types.h>
-#include <ddi/device.h>
 #include <ddi/irq.h>
 #include <ddi/ddi.h>
@@ -48 +47 @@
 #include <print.h>
 #include <atomic.h>
+#include <syscall/copy.h>
+#include <errno.h>
 
 #define KLOG_SIZE PAGE_SIZE
@@ -121 +122 @@
         silent = true;
         arch_release_console();
+}
+
+/** Tell kernel to get keyboard/console access again */
+unative_t sys_debug_enable_console(void)
+{
+#ifdef CONFIG_KCONSOLE
+        grab_console();
+        return true;
+#else
+        return false;
+#endif
+}
+
+/** Tell kernel to relinquish keyboard/console access */
+unative_t sys_debug_disable_console(void)
+{
+        release_console();
+        return true;
 }
 
@@ -276 +295 @@
 }
 
+/** Print using kernel facility
+ *
+ * Print to kernel log.
+ *
+ */
+unative_t sys_klog(int fd, const void * buf, size_t count) 
+{
+        char *data;
+        int rc;
+
+        if (count > PAGE_SIZE)
+                return ELIMIT;
+        
+        if (count > 0) {
+                data = (char *) malloc(count + 1, 0);
+                if (!data)
+                        return ENOMEM;
+                
+                rc = copy_from_uspace(data, buf, count);
+                if (rc) {
+                        free(data);
+                        return rc;
+                }
+                data[count] = 0;
+                
+                printf("%s", data);
+                free(data);
+        } else
+                klog_update();
+        
+        return count;
+}
+
 /** @}
  */