WebSVN – HelenOS – Diff – /branches/arm/kernel/arch/arm32/src/drivers/gxemul.c

 #include <mm/page.h>
 #include <arch/machine.h>
 #include <arch/debug/print.h>
-/** Addresses of devices. */
+/* Addresses of devices. */
 #define GXEMUL_VIDEORAM            0x10000000
 #define GXEMUL_KBD                 0x10000000
 #define GXEMUL_HALT_OFFSET         0x10
 #define GXEMUL_RTC                 0x15000000
 #define GXEMUL_RTC_FREQ_OFFSET     0x100
 #define GXEMUL_MP                  0x11000000
 #define GXEMUL_MP_MEMSIZE_OFFSET   0x0090
 #define GXEMUL_FB                  0x12000000
-/** IRQs */
+/* IRQs */
 #define GXEMUL_KBD_IRQ      2
 #define GXEMUL_TIMER_IRQ    4
 static gxemul_hw_map_t gxemul_hw_map;
 static chardev_t console;
-static irq_t gxemul_irq;
+static irq_t gxemul_console_irq;
 static irq_t gxemul_timer_irq;
 static bool hw_map_init_called = false;
+static void gxemul_kbd_enable(chardev_t *dev);
+static void gxemul_kbd_disable(chardev_t *dev);
 static void gxemul_write(chardev_t *dev, const char ch);
-static void gxemul_enable(chardev_t *dev);
-static void gxemul_disable(chardev_t *dev);
 static char gxemul_do_read(chardev_t *dev);
 static chardev_operations_t gxemul_ops = {
-    .resume = gxemul_enable,
+    .resume = gxemul_kbd_enable,
-    .suspend = gxemul_disable,
+    .suspend = gxemul_kbd_disable,
     .write = gxemul_write,
     .read = gxemul_do_read,
 };
     hw_map_init_called = true;
+}
-/** Putchar that works with gxemul */
+/** Putchar that works with gxemul.
+ *
+ * @param dev Not used.
+ * @param ch Characted to be printed.
+ */
 static void gxemul_write(chardev_t *dev, const char ch)
+{
     *((char *) gxemul_hw_map.videoram) = ch;
+}
+/** Enables gxemul keyboard (interrupt unmasked).
+ *
+ * @param dev Not used.
+ *
-/* Called from getc(). */
+ * Called from getc().
+ */
-static void gxemul_enable(chardev_t *dev)
+static void gxemul_kbd_enable(chardev_t *dev)
+{
     gxemul_irqc_unmask(GXEMUL_KBD_IRQ);
+}
+/** Disables gxemul keyboard (interrupt masked).
+ *
+ * @param dev not used
+ *
-/* Called from getc(). */
+ * Called from getc().
+ */
-static void gxemul_disable(chardev_t *dev)
+static void gxemul_kbd_disable(chardev_t *dev)
+{
     gxemul_irqc_mask(GXEMUL_KBD_IRQ);
+}
+        }
+    }
+}
-/** Process keyboard interrupt. */
+/** Process keyboard interrupt.
+ *
+ *  @param irq IRQ information.
+ *  @param arg Not used.
+ */
 static void gxemul_irq_handler(irq_t *irq, void *arg, ...)
+{
     if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox)) {
         ipc_irq_send_notif(irq);
     } else {
 /** Acquire console back for kernel. */
 void gxemul_grab_console(void)
+{
     ipl_t ipl = interrupts_disable();
-    spinlock_lock(&gxemul_irq.lock);
+    spinlock_lock(&gxemul_console_irq.lock);
-    gxemul_irq.notif_cfg.notify = false;
+    gxemul_console_irq.notif_cfg.notify = false;
-    spinlock_unlock(&gxemul_irq.lock);
+    spinlock_unlock(&gxemul_console_irq.lock);
     interrupts_restore(ipl);
+}
 /** Return console to userspace. */
 void gxemul_release_console(void)
+{
     ipl_t ipl = interrupts_disable();
-    spinlock_lock(&gxemul_irq.lock);
+    spinlock_lock(&gxemul_console_irq.lock);
-    if (gxemul_irq.notif_cfg.answerbox) {
+    if (gxemul_console_irq.notif_cfg.answerbox) {
-        gxemul_irq.notif_cfg.notify = true;
+        gxemul_console_irq.notif_cfg.notify = true;
+    }
-    spinlock_unlock(&gxemul_irq.lock);
+    spinlock_unlock(&gxemul_console_irq.lock);
     interrupts_restore(ipl);
+}
 /** Initializes console object representing gxemul console.
+{
     chardev_initialize("gxemul_console", &console, &gxemul_ops);
     stdin = &console;
     stdout = &console;
-    irq_initialize(&gxemul_irq);
+    irq_initialize(&gxemul_console_irq);
-    gxemul_irq.devno = devno;
+    gxemul_console_irq.devno = devno;
-    gxemul_irq.inr = GXEMUL_KBD_IRQ;
+    gxemul_console_irq.inr = GXEMUL_KBD_IRQ;
-    gxemul_irq.claim = gxemul_claim;
+    gxemul_console_irq.claim = gxemul_claim;
-    gxemul_irq.handler = gxemul_irq_handler;
+    gxemul_console_irq.handler = gxemul_irq_handler;
-    irq_register(&gxemul_irq);
+    irq_register(&gxemul_console_irq);
     gxemul_irqc_unmask(GXEMUL_KBD_IRQ);
     sysinfo_set_item_val("kbd", NULL, true);
     sysinfo_set_item_val("kbd.devno", NULL, devno);
  * @param irq Interrupt information.
  * @param arg Not used.
  */
 static void gxemul_timer_irq_handler(irq_t *irq, void *arg, ...)
+{
-    /* TODO time drifts ??
-    unsigned long drift;
-    drift = cp0_count_read() - nextcount;
-    while (drift > cp0_compare_value) {
-        drift -= cp0_compare_value;
-        CPU->missed_clock_ticks++;
-    }
-    nextcount = cp0_count_read() + cp0_compare_value - drift;
-    cp0_compare_write(nextcount);
-    */
     /*
     * We are holding a lock which prevents preemption.
     * Release the lock, call clock() and reacquire the lock again.
     */
     spinlock_unlock(&irq->lock);
     clock();
     spinlock_lock(&irq->lock);
     /* acknowledge tick */
     *(uint32_t*) gxemul_hw_map.rtc_ack = 0;
-    /* TODO what's that? *
-    if (virtual_timer_fnc != NULL)
-        virtual_timer_fnc();
-    */
+}
 /** Initializes and registers timer interrupt handler. */
 static void gxemul_timer_irq_init()

Subversion Repositories HelenOS

(root)/branches/arm/kernel/arch/arm32/src/drivers/gxemul.c – Rev 2412 → 2414