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 42... | Line 42... | ||
42 | 42 | ||
43 | #include <genarch/multiboot/multiboot.h> |
43 | #include <genarch/multiboot/multiboot.h> |
44 | #include <genarch/drivers/legacy/ia32/io.h> |
44 | #include <genarch/drivers/legacy/ia32/io.h> |
45 | #include <genarch/drivers/ega/ega.h> |
45 | #include <genarch/drivers/ega/ega.h> |
46 | #include <arch/drivers/vesa.h> |
46 | #include <arch/drivers/vesa.h> |
- | 47 | #include <genarch/drivers/i8042/i8042.h> |
|
47 | #include <genarch/kbd/i8042.h> |
48 | #include <genarch/kbrd/kbrd.h> |
48 | #include <arch/drivers/i8254.h> |
49 | #include <arch/drivers/i8254.h> |
49 | #include <arch/drivers/i8259.h> |
50 | #include <arch/drivers/i8259.h> |
50 | 51 | ||
51 | #include <arch/context.h> |
52 | #include <arch/context.h> |
52 | 53 | ||
Line 145... | Line 146... | ||
145 | } |
146 | } |
146 | 147 | ||
147 | void arch_post_smp_init(void) |
148 | void arch_post_smp_init(void) |
148 | { |
149 | { |
149 | devno_t devno = device_assign_devno(); |
150 | devno_t devno = device_assign_devno(); |
- | 151 | ||
- | 152 | /* |
|
- | 153 | * Initialize the keyboard module and conect it to stdin. Then |
|
- | 154 | * initialize the i8042 controller and connect it to kbrdin. Enable |
|
150 | /* keyboard controller */ |
155 | * keyboard interrupts. |
- | 156 | */ |
|
- | 157 | kbrd_init(stdin); |
|
151 | (void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD); |
158 | (void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD, &kbrdin); |
- | 159 | trap_virtual_enable_irqs(1 << IRQ_KBD); |
|
152 | 160 | ||
153 | /* |
161 | /* |
154 | * This is the necessary evil until the userspace driver is entirely |
162 | * This is the necessary evil until the userspace driver is entirely |
155 | * self-sufficient. |
163 | * self-sufficient. |
156 | */ |
164 | */ |