WebSVN – HelenOS – Diff – /branches/network/kernel/generic/src/console/console.c

 #include <console/chardev.h>
 #include <sysinfo/sysinfo.h>
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
 #include <arch/types.h>
-#include <ddi/device.h>
 #include <ddi/irq.h>
 #include <ddi/ddi.h>
 #include <ipc/irq.h>
 #include <arch.h>
 #include <func.h>
 #include <print.h>
 #include <atomic.h>
+#include <syscall/copy.h>
+#include <errno.h>
 #define KLOG_SIZE PAGE_SIZE
 #define KLOG_LATENCY 8
-/**< Kernel log cyclic buffer */
+/** Kernel log cyclic buffer */
 static char klog[KLOG_SIZE] __attribute__ ((aligned (PAGE_SIZE)));
-/**< Kernel log initialized */
+/** Kernel log initialized */
 static bool klog_inited = false;
-/**< First kernel log characters */
+/** First kernel log characters */
 static index_t klog_start = 0;
-/**< Number of valid kernel log characters */
+/** Number of valid kernel log characters */
 static size_t klog_len = 0;
-/**< Number of stored (not printed) kernel log characters */
+/** Number of stored (not printed) kernel log characters */
 static size_t klog_stored = 0;
-/**< Number of stored kernel log characters for uspace */
+/** Number of stored kernel log characters for uspace */
 static size_t klog_uspace = 0;
+/** Silence output */
+bool silent = false;
-/**< Kernel log spinlock */
+/** Kernel log spinlock */
 SPINLOCK_INITIALIZE(klog_lock);
 /** Physical memory area used for klog buffer */
 static parea_t klog_parea;
-/*
- * For now, we use 0 as INR.
- * However, it is therefore desirable to have architecture specific
- * definition of KLOG_VIRT_INR in the future.
- */
-#define KLOG_VIRT_INR   0
-static irq_t klog_irq;
-static chardev_operations_t null_stdout_ops = {
-    .suspend = NULL,
-    .resume = NULL,
-    .write = NULL,
-    .read = NULL
-};
-chardev_t null_stdout = {
-    .name = "null",
-    .op = &null_stdout_ops
-};
-/** Allways refuse IRQ ownership.
- *
- * This is not a real IRQ, so we always decline.
- *
- * @return Always returns IRQ_DECLINE.
- */
-static irq_ownership_t klog_claim(void)
-{
-    return IRQ_DECLINE;
-}
-/** Standard input character device */
+/** Standard input and output character devices */
-chardev_t *stdin = NULL;
+indev_t *stdin = NULL;
-chardev_t *stdout = &null_stdout;
+outdev_t *stdout = NULL;
 /** Initialize kernel logging facility
+ *
  * The shared area contains kernel cyclic buffer. Userspace application may
  * be notified on new data with indication of position and size
  * of the data within the circular buffer.
+ *
  */
 void klog_init(void)
+{
     void *faddr = (void *) KA2PA(klog);
     ASSERT((uintptr_t) faddr % FRAME_SIZE == 0);
     ASSERT(KLOG_SIZE % FRAME_SIZE == 0);
-    devno_t devno = device_assign_devno();
     klog_parea.pbase = (uintptr_t) faddr;
-    klog_parea.vbase = (uintptr_t) klog;
     klog_parea.frames = SIZE2FRAMES(KLOG_SIZE);
-    klog_parea.cacheable = true;
     ddi_parea_register(&klog_parea);
     sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr);
     sysinfo_set_item_val("klog.pages", NULL, SIZE2FRAMES(KLOG_SIZE));
-    sysinfo_set_item_val("klog.devno", NULL, devno);
-    sysinfo_set_item_val("klog.inr", NULL, KLOG_VIRT_INR);
-    irq_initialize(&klog_irq);
+    //irq_initialize(&klog_irq);
-    klog_irq.devno = devno;
+    //klog_irq.devno = devno;
-    klog_irq.inr = KLOG_VIRT_INR;
+    //klog_irq.inr = KLOG_VIRT_INR;
-    klog_irq.claim = klog_claim;
+    //klog_irq.claim = klog_claim;
-    irq_register(&klog_irq);
+    //irq_register(&klog_irq);
     spinlock_lock(&klog_lock);
     klog_inited = true;
     spinlock_unlock(&klog_lock);
+}
+void grab_console(void)
+{
+    silent = false;
+    arch_grab_console();
+}
+void release_console(void)
+{
+    silent = true;
+    arch_release_console();
+}
-/** Get character from character device. Do not echo character.
+/** 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;
+}
+bool check_poll(indev_t *indev)
+{
+    if (indev == NULL)
+        return false;
+    if (indev->op == NULL)
+        return false;
- *
- * @param chardev Character device.
+    return (indev->op->poll != NULL);
+}
+/** Get character from input character device. Do not echo character.
+ *
+ * @param indev Input character device.
  * @return Character read.
+ *
  */
-uint8_t _getc(chardev_t *chardev)
+uint8_t _getc(indev_t *indev)
+{
-    uint8_t ch;
-    ipl_t ipl;
     if (atomic_get(&haltstate)) {
-        /* If we are here, we are hopefully on the processor, that
+        /* If we are here, we are hopefully on the processor that
          * issued the 'halt' command, so proceed to read the character
          * directly from input
          */
-        if (chardev->op->read)
+        if (check_poll(indev))
-            return chardev->op->read(chardev);
+            return indev->op->poll(indev);
-        /* no other way of interacting with user, halt */
+        /* No other way of interacting with user */
+        interrupts_disable();
         if (CPU)
             printf("cpu%u: ", CPU->id);
         else
             printf("cpu: ");
-        printf("halted - no kconsole\n");
+        printf("halted (no polling input)\n");
         cpu_halt();
+    }
-    waitq_sleep(&chardev->wq);
+    waitq_sleep(&indev->wq);
-    ipl = interrupts_disable();
+    ipl_t ipl = interrupts_disable();
-    spinlock_lock(&chardev->lock);
+    spinlock_lock(&indev->lock);
-    ch = chardev->buffer[(chardev->index - chardev->counter) % CHARDEV_BUFLEN];
+    uint8_t ch = indev->buffer[(indev->index - indev->counter) % INDEV_BUFLEN];
-    chardev->counter--;
+    indev->counter--;
-    spinlock_unlock(&chardev->lock);
+    spinlock_unlock(&indev->lock);
     interrupts_restore(ipl);
-    chardev->op->resume(chardev);
     return ch;
+}
-/** Get string from character device.
+/** Get string from input character device.
+ *
- * Read characters from character device until first occurrence
+ * Read characters from input character device until first occurrence
  * of newline character.
+ *
- * @param chardev Character device.
+ * @param indev  Input character device.
- * @param buf Buffer where to store string terminated by '\0'.
+ * @param buf    Buffer where to store string terminated by '\0'.
  * @param buflen Size of the buffer.
+ *
  * @return Number of characters read.
+ *
  */
-count_t gets(chardev_t *chardev, char *buf, size_t buflen)
+count_t gets(indev_t *indev, char *buf, size_t buflen)
+{
     index_t index = 0;
-    char ch;
     while (index < buflen) {
-        ch = _getc(chardev);
+        char ch = _getc(indev);
         if (ch == '\b') {
             if (index > 0) {
                 index--;
                 /* Space backspace, space */
                 putchar('\b');
                 putchar('\b');
+            }
             continue;
+        }
         putchar(ch);
         if (ch == '\n') { /* end of string => write 0, return */
             buf[index] = '\0';
             return (count_t) index;
+        }
         buf[index++] = ch;
+    }
     return (count_t) index;
+}
-/** Get character from device & echo it to screen */
+/** Get character from input device & echo it to screen */
-uint8_t getc(chardev_t *chardev)
+uint8_t getc(indev_t *indev)
+{
-    uint8_t ch;
-    ch = _getc(chardev);
+    uint8_t ch = _getc(indev);
     putchar(ch);
     return ch;
+}
 void klog_update(void)
+{
     spinlock_lock(&klog_lock);
-    if ((klog_inited) && (klog_irq.notif_cfg.notify) && (klog_uspace > 0)) {
+//  if ((klog_inited) && (klog_irq.notif_cfg.notify) && (klog_uspace > 0)) {
-        ipc_irq_send_msg_3(&klog_irq, klog_start, klog_len, klog_uspace);
+//      ipc_irq_send_msg_3(&klog_irq, klog_start, klog_len, klog_uspace);
-        klog_uspace = 0;
+//      klog_uspace = 0;
-    }
+//  }
     spinlock_unlock(&klog_lock);
+}
 void putchar(char c)
+{
     spinlock_lock(&klog_lock);
-    if ((klog_stored > 0) && (stdout->op->write)) {
+    if ((klog_stored > 0) && (stdout) && (stdout->op->write)) {
         /* Print charaters stored in kernel log */
         index_t i;
         for (i = klog_len - klog_stored; i < klog_len; i++)
-            stdout->op->write(stdout, klog[(klog_start + i) % KLOG_SIZE]);
+            stdout->op->write(stdout, klog[(klog_start + i) % KLOG_SIZE], silent);
         klog_stored = 0;
+    }
     /* Store character in the cyclic kernel log */
     klog[(klog_start + klog_len) % KLOG_SIZE] = c;
     if (klog_len < KLOG_SIZE)
         klog_len++;
     else
         klog_start = (klog_start + 1) % KLOG_SIZE;
-    if (stdout->op->write)
+    if ((stdout) && (stdout->op->write))
-        stdout->op->write(stdout, c);
+        stdout->op->write(stdout, c, silent);
     else {
         /* The character is just in the kernel log */
         if (klog_stored < klog_len)
             klog_stored++;
+    }
     if (update)
         klog_update();
+}
+/** 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;
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/network/kernel/generic/src/console/console.c – Rev 3386 → 4153