Changeset 3ad953c in mainline for kernel/generic/src

Timestamp:

2008-12-30T19:55:10Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f58321c4

Parents:

6b21292

Message:

send notification to uspace console when switching from kernel console

Location:

kernel/generic/src

Files:

• console/cmd.c (modified) (1 diff)
• console/kconsole.c (modified) (2 diffs)
• main/main.c (modified) (3 diffs)

kernel/generic/src/console/cmd.c

@@ -977 +977 @@
 {
         printf("The kernel will now relinquish the console.\n");
-        printf("Use userspace controls to redraw the screen.\n");
         arch_release_console();
+        
+        if ((kconsole_notify) && (kconsole_irq.notif_cfg.notify))
+                ipc_irq_send_msg_0(&kconsole_irq);
+        
         return 1;
 }

kernel/generic/src/console/kconsole.c

@@ -52 +52 @@
 #include <symtab.h>
 #include <macros.h>
+#include <sysinfo/sysinfo.h>
+#include <ddi/device.h>
 
 /** Simple kernel console.
@@ -84 +86 @@
 static char history[KCONSOLE_HISTORY][MAX_CMDLINE] = {};
 
-/** Initialize kconsole data structures. */
+/*
+ * For now, we use 0 as INR.
+ * However, it is therefore desirable to have architecture specific
+ * definition of KCONSOLE_VIRT_INR in the future.
+ */
+#define KCONSOLE_VIRT_INR  0
+
+bool kconsole_notify = false;
+irq_t kconsole_irq;
+
+
+/** Allways refuse IRQ ownership.
+ *
+ * This is not a real IRQ, so we always decline.
+ *
+ * @return Always returns IRQ_DECLINE.
+ *
+ */
+static irq_ownership_t kconsole_claim(void)
+{
+        return IRQ_DECLINE;
+}
+
+
+/** Initialize kconsole data structures
+ *
+ * This is the most basic initialization, almost no
+ * other kernel subsystem is ready yet.
+ *
+ */
 void kconsole_init(void)
 {
-        int i;
+        unsigned int i;
 
         cmd_init();
         for (i = 0; i < KCONSOLE_HISTORY; i++)
                 history[i][0] = '\0';
+}
+
+
+/** Initialize kconsole notification mechanism
+ *
+ * Initialize the virtual IRQ notification mechanism.
+ *
+ */
+void kconsole_notify_init(void)
+{
+        devno_t devno = device_assign_devno();
+        
+        sysinfo_set_item_val("kconsole.present", NULL, true);
+        sysinfo_set_item_val("kconsole.devno", NULL, devno);
+        sysinfo_set_item_val("kconsole.inr", NULL, KCONSOLE_VIRT_INR);
+        
+        irq_initialize(&kconsole_irq);
+        kconsole_irq.devno = devno;
+        kconsole_irq.inr = KCONSOLE_VIRT_INR;
+        kconsole_irq.claim = kconsole_claim;
+        irq_register(&kconsole_irq);
+        
+        kconsole_notify = true;
 }
 

kernel/generic/src/main/main.c

@@ -199 +199 @@
             config.base, config.kernel_size, config.stack_base,
             config.stack_size);
-
+        
 #ifdef CONFIG_KCONSOLE
         /*
@@ -214 +214 @@
          */
         LOG_EXEC(exc_init());
-
+        
         /*
          * Memory management subsystems initialization.
@@ -260 +260 @@
         LOG_EXEC(ipc_init());
         LOG_EXEC(klog_init());
-
+        
+#ifdef CONFIG_KCONSOLE
+        LOG_EXEC(kconsole_notify_init());
+#endif
+        
         /*
          * Create kernel task.