| 33,7 → 33,6 |
|---|
| */ |
| |
| #include <arch/drivers/cuda.h> |
| #include <ipc/irq.h> |
| #include <arch/asm.h> |
| #include <console/console.h> |
| #include <console/chardev.h> |
| 236,6 → 235,7 |
|---|
| |
| int cuda_get_scancode(void) |
| { |
| if (cuda) { |
| uint8_t kind; |
| uint8_t data[4]; |
| |
| 243,15 → 243,13 |
|---|
| |
| if ((kind == PACKET_ADB) && (data[0] == 0x40) && (data[1] == 0x2c)) |
| return data[2]; |
| } |
| |
| return -1; |
| } |
| |
| static void cuda_irq_handler(irq_t *irq, void *arg, ...) |
| static void cuda_irq_handler(irq_t *irq) |
| { |
| if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox)) |
| ipc_irq_send_notif(irq); |
| else { |
| int scan_code = cuda_get_scancode(); |
| |
| if (scan_code != -1) { |
| 260,37 → 258,12 |
|---|
| chardev_push_character(&kbrd, lchars[scancode & 0x7f]); |
| } |
| } |
| } |
| |
| static irq_ownership_t cuda_claim(void) |
| static irq_ownership_t cuda_claim(irq_t *irq) |
| { |
| return IRQ_ACCEPT; |
| } |
| |
| |
| /** Initialize keyboard and service interrupts using kernel routine */ |
| void cuda_grab(void) |
| { |
| ipl_t ipl = interrupts_disable(); |
| spinlock_lock(&cuda_irq.lock); |
| cuda_irq.notif_cfg.notify = false; |
| spinlock_unlock(&cuda_irq.lock); |
| interrupts_restore(ipl); |
| } |
| |
| |
| /** Resume the former interrupt vector */ |
| void cuda_release(void) |
| { |
| ipl_t ipl = interrupts_disable(); |
| spinlock_lock(&cuda_irq.lock); |
| if (cuda_irq.notif_cfg.answerbox) |
| cuda_irq.notif_cfg.notify = true; |
| spinlock_unlock(&cuda_irq.unlock); |
| interrupts_restore(ipl); |
| } |
| |
| |
| void cuda_init(devno_t devno, uintptr_t base, size_t size) |
| { |
| cuda = (uint8_t *) hw_map(base, size); |
| 345,7 → 318,9 |
|---|
| } |
| |
| void arch_reboot(void) { |
| if (cuda) |
| send_packet(PACKET_CUDA, 1, CUDA_RESET); |
| |
| asm volatile ( |
| "b 0\n" |
| ); |