Rev 4042 | Rev 4060 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4042 | Rev 4043 | ||
---|---|---|---|
Line 53... | Line 53... | ||
53 | #include <ddi/device.h> |
53 | #include <ddi/device.h> |
54 | #include <arch/bootinfo.h> |
54 | #include <arch/bootinfo.h> |
55 | #include <genarch/drivers/legacy/ia32/io.h> |
55 | #include <genarch/drivers/legacy/ia32/io.h> |
56 | #include <genarch/drivers/ega/ega.h> |
56 | #include <genarch/drivers/ega/ega.h> |
57 | #include <genarch/kbrd/kbrd.h> |
57 | #include <genarch/kbrd/kbrd.h> |
- | 58 | #include <genarch/srln/srln.h> |
|
58 | #include <genarch/drivers/i8042/i8042.h> |
59 | #include <genarch/drivers/i8042/i8042.h> |
59 | #include <genarch/kbd/ns16550.h> |
60 | #include <genarch/drivers/ns16550/ns16550.h> |
- | 61 | #include <arch/drivers/kbd.h> |
|
60 | #include <smp/smp.h> |
62 | #include <smp/smp.h> |
61 | #include <smp/ipi.h> |
63 | #include <smp/ipi.h> |
62 | #include <arch/atomic.h> |
64 | #include <arch/atomic.h> |
63 | #include <panic.h> |
65 | #include <panic.h> |
64 | #include <print.h> |
66 | #include <print.h> |
Line 168... | Line 170... | ||
168 | devno_t devno = device_assign_devno(); |
170 | devno_t devno = device_assign_devno(); |
169 | inr_t inr; |
171 | inr_t inr; |
170 | 172 | ||
171 | #ifdef CONFIG_NS16550 |
173 | #ifdef CONFIG_NS16550 |
172 | inr = NS16550_IRQ; |
174 | inr = NS16550_IRQ; |
- | 175 | srln_init(stdin); |
|
173 | (void) ns16550_init((ns16550_t *)NS16550_BASE, devno, inr, NULL, NULL); |
176 | (void) ns16550_init((ns16550_t *)NS16550_BASE, devno, inr, NULL, NULL, |
- | 177 | &srlnin); |
|
174 | sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550); |
178 | sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550); |
175 | sysinfo_set_item_val("kbd.address.physical", NULL, |
179 | sysinfo_set_item_val("kbd.address.physical", NULL, |
176 | (uintptr_t) NS16550_BASE); |
180 | (uintptr_t) NS16550_BASE); |
177 | sysinfo_set_item_val("kbd.address.kernel", NULL, |
181 | sysinfo_set_item_val("kbd.address.kernel", NULL, |
178 | (uintptr_t) NS16550_BASE); |
182 | (uintptr_t) NS16550_BASE); |