Changeset 63530c62 in mainline for kernel/arch/sparc64/src/drivers/kbd.c

Timestamp:

2006-10-14T19:31:03Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e3890b3f

Parents:

7dcf22a

Message:

Changes in ns16550 and z8530 drivers.
Add some stuff for IRQ notifications to irq_t.

File:

• kernel/arch/sparc64/src/drivers/kbd.c (modified) (5 diffs)

kernel/arch/sparc64/src/drivers/kbd.c

@@ -50 +50 @@
 #include <print.h>
 
-volatile uint8_t *kbd_virt_address = NULL;
-
 kbd_type_t kbd_type = KBD_UNKNOWN;
-
-static irq_t kbd_irq;
 
 /** Initialize keyboard.
@@ -103 +99 @@
         uintptr_t pa;
         size_t size;
-        int inr;
-        
-        irq_initialize(&kbd_irq);
+        inr_t inr;
+        devno_t devno = device_assign_devno();
         
         switch (kbd_type) {
@@ -117 +112 @@
                         printf("Failed to determine keyboard interrupt.\n");
                         return;
-                } else {
-                        kbd_irq.inr = inr;
-                        kbd_irq.devno = device_assign_devno();
-                        kbd_irq.trigger = IRQ_TRIGGER_LEVEL;
-                        kbd_irq.claim = z8530_claim;
-                        kbd_irq.handler = z8530_irq_handler;
-                        irq_register(&kbd_irq);
                 }
                 break;
@@ -136 +124 @@
                         printf("Failed to determine keyboard interrupt.\n");
                         return;
-                } else {
-                        kbd_irq.inr = inr;
-                        kbd_irq.devno = device_assign_devno();
-                        kbd_irq.trigger = IRQ_TRIGGER_LEVEL;
-                        kbd_irq.claim = ns16550_claim;
-                        kbd_irq.handler = ns16550_irq_handler;
-                        irq_register(&kbd_irq);
-                }
+                };
                 break;
 
@@ -158 +139 @@
         aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE);
         offset = pa - aligned_addr;
-        kbd_virt_address = (uint8_t *) hw_map(aligned_addr, offset + size) + offset;
+        uintptr_t vaddr = hw_map(aligned_addr, offset + size) + offset;
 
         switch (kbd_type) {
 #ifdef CONFIG_Z8530
         case KBD_Z8530:
-                z8530_init();
+                z8530_init(devno, inr, vaddr);
                 break;
 #endif
 #ifdef CONFIG_NS16550
         case KBD_NS16550:
-                ns16550_init();
+                ns16550_init(devno, inr, vaddr);
                 break;
 #endif