Rev 4026 | Rev 4057 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4026 | Rev 4042 | ||
|---|---|---|---|
| Line 41... | Line 41... | ||
| 41 | #include <proc/thread.h> |
41 | #include <proc/thread.h> |
| 42 | #include <genarch/multiboot/multiboot.h> |
42 | #include <genarch/multiboot/multiboot.h> |
| 43 | #include <genarch/drivers/legacy/ia32/io.h> |
43 | #include <genarch/drivers/legacy/ia32/io.h> |
| 44 | #include <genarch/drivers/ega/ega.h> |
44 | #include <genarch/drivers/ega/ega.h> |
| 45 | #include <arch/drivers/vesa.h> |
45 | #include <arch/drivers/vesa.h> |
| - | 46 | #include <genarch/drivers/i8042/i8042.h> |
|
| 46 | #include <genarch/kbd/i8042.h> |
47 | #include <genarch/kbrd/kbrd.h> |
| 47 | #include <arch/drivers/i8254.h> |
48 | #include <arch/drivers/i8254.h> |
| 48 | #include <arch/drivers/i8259.h> |
49 | #include <arch/drivers/i8259.h> |
| 49 | #include <arch/boot/boot.h> |
50 | #include <arch/boot/boot.h> |
| 50 | 51 | ||
| 51 | #ifdef CONFIG_SMP |
52 | #ifdef CONFIG_SMP |
| Line 187... | Line 188... | ||
| 187 | } |
188 | } |
| 188 | 189 | ||
| 189 | void arch_post_smp_init(void) |
190 | void arch_post_smp_init(void) |
| 190 | { |
191 | { |
| 191 | devno_t devno = device_assign_devno(); |
192 | devno_t devno = device_assign_devno(); |
| - | 193 | ||
| - | 194 | /* |
|
| - | 195 | * Initialize the keyboard module and conect it to stdin. Then |
|
| - | 196 | * initialize the i8042 controller and connect it to kbrdin. Enable |
|
| 192 | /* keyboard controller */ |
197 | * keyboard interrupts. |
| - | 198 | */ |
|
| - | 199 | kbrd_init(stdin); |
|
| 193 | (void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD); |
200 | (void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD, &kbrdin); |
| - | 201 | trap_virtual_enable_irqs(1 << IRQ_KBD); |
|
| 194 | 202 | ||
| 195 | /* |
203 | /* |
| 196 | * This is the necessary evil until the userspace driver is entirely |
204 | * This is the necessary evil until the userspace driver is entirely |
| 197 | * self-sufficient. |
205 | * self-sufficient. |
| 198 | */ |
206 | */ |