Rev 4026 | Rev 4070 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4026 | Rev 4042 | ||
|---|---|---|---|
| Line 32... | Line 32... | ||
| 32 | /** @file |
32 | /** @file |
| 33 | */ |
33 | */ |
| 34 | 34 | ||
| 35 | #include <arch/drivers/kbd.h> |
35 | #include <arch/drivers/kbd.h> |
| 36 | #include <genarch/ofw/ofw_tree.h> |
36 | #include <genarch/ofw/ofw_tree.h> |
| - | 37 | ||
| - | 38 | #ifdef CONFIG_SUN_KBD |
|
| - | 39 | #include <genarch/kbrd/kbrd.h> |
|
| - | 40 | #endif |
|
| 37 | #ifdef CONFIG_Z8530 |
41 | #ifdef CONFIG_Z8530 |
| 38 | #include <genarch/kbd/z8530.h> |
42 | #include <genarch/drivers/z8530/z8530.h> |
| 39 | #endif |
43 | #endif |
| 40 | #ifdef CONFIG_NS16550 |
44 | #ifdef CONFIG_NS16550 |
| 41 | #include <genarch/kbd/ns16550.h> |
45 | #include <genarch/drivers/ns16550/ns16550.h> |
| 42 | #endif |
46 | #endif |
| - | 47 | ||
| - | 48 | #include <console/console.h> |
|
| 43 | #include <ddi/device.h> |
49 | #include <ddi/device.h> |
| 44 | #include <ddi/irq.h> |
50 | #include <ddi/irq.h> |
| 45 | #include <arch/mm/page.h> |
51 | #include <arch/mm/page.h> |
| 46 | #include <arch/types.h> |
52 | #include <arch/types.h> |
| 47 | #include <align.h> |
53 | #include <align.h> |
| Line 157... | Line 163... | ||
| 157 | #ifdef CONFIG_Z8530 |
163 | #ifdef CONFIG_Z8530 |
| 158 | case KBD_Z8530: |
164 | case KBD_Z8530: |
| 159 | devno = device_assign_devno(); |
165 | devno = device_assign_devno(); |
| 160 | z8530 = (z8530_t *) hw_map(aligned_addr, offset + size) + |
166 | z8530 = (z8530_t *) hw_map(aligned_addr, offset + size) + |
| 161 | offset; |
167 | offset; |
| - | 168 | kbrd_init(stdin); |
|
| 162 | (void) z8530_init(z8530, devno, inr, cir, cir_arg); |
169 | (void) z8530_init(z8530, devno, inr, cir, cir_arg, &kbrdin); |
| 163 | 170 | ||
| 164 | /* |
171 | /* |
| 165 | * This is the necessary evil until the userspace drivers are |
172 | * This is the necessary evil until the userspace drivers are |
| 166 | * entirely self-sufficient. |
173 | * entirely self-sufficient. |
| 167 | */ |
174 | */ |
| Line 177... | Line 184... | ||
| 177 | #ifdef CONFIG_NS16550 |
184 | #ifdef CONFIG_NS16550 |
| 178 | case KBD_NS16550: |
185 | case KBD_NS16550: |
| 179 | devno = device_assign_devno(); |
186 | devno = device_assign_devno(); |
| 180 | ns16550 = (ns16550_t *) hw_map(aligned_addr, offset + size) + |
187 | ns16550 = (ns16550_t *) hw_map(aligned_addr, offset + size) + |
| 181 | offset; |
188 | offset; |
| - | 189 | kbrd_init(stdin); |
|
| 182 | (void) ns16550_init(ns16550, devno, inr, cir, cir_arg); |
190 | (void) ns16550_init(ns16550, devno, inr, cir, cir_arg, &kbrdin); |
| 183 | 191 | ||
| 184 | /* |
192 | /* |
| 185 | * This is the necessary evil until the userspace driver is |
193 | * This is the necessary evil until the userspace driver is |
| 186 | * entirely self-sufficient. |
194 | * entirely self-sufficient. |
| 187 | */ |
195 | */ |