Changeset 2b017ba in mainline for kernel/generic/src/console/klog.c

Timestamp:

2006-10-16T20:51:55Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5f9b4d9a

Parents:

e3890b3f

Message:

Replace the old IRQ dispatcher and IPC notifier with new implementation.
Note that all architectures except for sparc64 are now broken
and don't even compile.

File:

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

kernel/generic/src/console/klog.c

@@ -37 +37 @@
 #include <console/klog.h>
 #include <print.h>
+#include <ddi/device.h>
+#include <ddi/irq.h>
 #include <ipc/irq.h>
 
 /* Order of frame to be allocated for klog communication */
-#define KLOG_ORDER 0
+#define KLOG_ORDER      0
 
 static char *klog;
@@ -47 +49 @@
 
 SPINLOCK_INITIALIZE(klog_lock);
+
+static irq_t klog_irq;
+
+static irq_ownership_t klog_claim(void);
 
 /** Initialize kernel logging facility
@@ -64 +70 @@
         klog = (char *)PA2KA(faddr);
         
+        devno_t devno = device_assign_devno();
+        
         sysinfo_set_item_val("klog.faddr", NULL, (unative_t)faddr);
         sysinfo_set_item_val("klog.pages", NULL, 1 << KLOG_ORDER);
+        sysinfo_set_item_val("klog.devno", NULL, devno);
+        sysinfo_set_item_val("klog.inr", NULL, VIRT_INR_KLOG); 
+
+        irq_initialize(&klog_irq);
+        klog_irq.devno = devno;
+        klog_irq.inr = VIRT_INR_KLOG;
+        klog_irq.claim = klog_claim;
+        irq_register(&klog_irq);
 
         klogsize = PAGE_SIZE << KLOG_ORDER;
         klogpos = 0;
+}
+
+/** Allways refuse IRQ ownership.
+ *
+ * This is not a real IRQ, so we always decline.
+ *
+ * @return Always returns IRQ_DECLINE.
+ */
+irq_ownership_t klog_claim(void)
+{
+        return IRQ_DECLINE;
 }
 
@@ -85 +112 @@
                         goto out;
         }
-        ipc_irq_send_msg(IPC_IRQ_KLOG, klogpos, ret, 0);
+        ipc_irq_send_msg(&klog_irq, klogpos, ret, 0);
         klogpos += ret;
         if (klogpos >= klogsize)