| 34,7 → 34,6 |
|---|
| */ |
| |
| #include <interrupt.h> |
| #include <ipc/irq.h> |
| #include <console/chardev.h> |
| #include <arch/drivers/gxemul.h> |
| #include <console/console.h> |
| 72,7 → 71,7 |
|---|
| |
| 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_write(chardev_t *dev, const char ch, bool silent); |
| static char gxemul_do_read(chardev_t *dev); |
| |
| static chardev_operations_t gxemul_ops = { |
| 133,9 → 132,10 |
|---|
| * @param dev Not used. |
| * @param ch Characted to be printed. |
| */ |
| static void gxemul_write(chardev_t *dev, const char ch) |
| static void gxemul_write(chardev_t *dev, const char ch, bool silent) |
| { |
| *((char *) gxemul_hw_map.videoram) = ch; |
| if (!silent) |
| *((char *) gxemul_hw_map.videoram) = ch; |
| } |
| |
| /** Enables gxemul keyboard (interrupt unmasked). |
| 183,54 → 183,26 |
|---|
| /** Process keyboard interrupt. |
| * |
| * @param irq IRQ information. |
| * @param arg Not used. |
| */ |
| static void gxemul_irq_handler(irq_t *irq, void *arg, ...) |
| static void gxemul_irq_handler(irq_t *irq) |
| { |
| if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox)) { |
| ipc_irq_send_notif(irq); |
| } else { |
| char ch = 0; |
| char ch = 0; |
| |
| ch = *((char *) gxemul_hw_map.kbd); |
| if (ch == '\r') { |
| ch = '\n'; |
| } |
| if (ch == 0x7f) { |
| ch = '\b'; |
| } |
| chardev_push_character(&console, ch); |
| ch = *((char *) gxemul_hw_map.kbd); |
| if (ch == '\r') { |
| ch = '\n'; |
| } |
| if (ch == 0x7f) { |
| ch = '\b'; |
| } |
| chardev_push_character(&console, ch); |
| } |
| |
| static irq_ownership_t gxemul_claim(void) |
| static irq_ownership_t gxemul_claim(irq_t *irq) |
| { |
| return IRQ_ACCEPT; |
| } |
| |
| |
| /** Acquire console back for kernel. */ |
| void gxemul_grab_console(void) |
| { |
| ipl_t ipl = interrupts_disable(); |
| spinlock_lock(&gxemul_console_irq.lock); |
| gxemul_console_irq.notif_cfg.notify = false; |
| 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_console_irq.lock); |
| if (gxemul_console_irq.notif_cfg.answerbox) { |
| gxemul_console_irq.notif_cfg.notify = true; |
| } |
| spinlock_unlock(&gxemul_console_irq.lock); |
| interrupts_restore(ipl); |
| } |
| |
| /** Initializes console object representing gxemul console. |
| * |
| * @param devno device number. |
| 265,7 → 237,7 |
|---|
| *((uint32_t*) gxemul_hw_map.rtc_freq) = frequency; |
| } |
| |
| static irq_ownership_t gxemul_timer_claim(void) |
| static irq_ownership_t gxemul_timer_claim(irq_t *irq) |
| { |
| return IRQ_ACCEPT; |
| } |
| 275,7 → 247,7 |
|---|
| * @param irq Interrupt information. |
| * @param arg Not used. |
| */ |
| static void gxemul_timer_irq_handler(irq_t *irq, void *arg, ...) |
| static void gxemul_timer_irq_handler(irq_t *irq) |
| { |
| /* |
| * We are holding a lock which prevents preemption. |
| 369,7 → 341,7 |
|---|
| irq_t *irq = irq_dispatch_and_lock(i); |
| if (irq) { |
| /* The IRQ handler was found. */ |
| irq->handler(irq, irq->arg); |
| irq->handler(irq); |
| spinlock_unlock(&irq->lock); |
| } else { |
| /* Spurious interrupt.*/ |