Rev 3928 | Rev 3932 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3928 | Rev 3931 | ||
|---|---|---|---|
| Line 48... | Line 48... | ||
| 48 | #include <console/console.h> |
48 | #include <console/console.h> |
| 49 | #include <interrupt.h> |
49 | #include <interrupt.h> |
| 50 | #include <sysinfo/sysinfo.h> |
50 | #include <sysinfo/sysinfo.h> |
| 51 | #include <ipc/irq.h> |
51 | #include <ipc/irq.h> |
| 52 | 52 | ||
| 53 | #define i8042_DATA 0x60 |
53 | i8042_instance_t lgcy_i8042_instance = { |
| 54 | #define i8042_STATUS 0x64 |
54 | .i8042 = (i8042_t *) 0x60, |
| - | 55 | }; |
|
| 55 | 56 | ||
| 56 | /* Keyboard commands. */ |
57 | /* Keyboard commands. */ |
| 57 | #define KBD_ENABLE 0xf4 |
58 | #define KBD_ENABLE 0xf4 |
| 58 | #define KBD_DISABLE 0xf5 |
59 | #define KBD_DISABLE 0xf5 |
| 59 | #define KBD_ACK 0xfa |
60 | #define KBD_ACK 0xfa |
| Line 125... | Line 126... | ||
| 125 | interrupts_restore(ipl); |
126 | interrupts_restore(ipl); |
| 126 | } |
127 | } |
| 127 | 128 | ||
| 128 | static irq_ownership_t i8042_claim(void *instance) |
129 | static irq_ownership_t i8042_claim(void *instance) |
| 129 | { |
130 | { |
| - | 131 | i8042_instance_t *i8042_instance = instance; |
|
| - | 132 | i8042_t *dev = i8042_instance->i8042; |
|
| - | 133 | if (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK) |
|
| 130 | return IRQ_ACCEPT; |
134 | return IRQ_ACCEPT; |
| - | 135 | else |
|
| - | 136 | return IRQ_DECLINE; |
|
| 131 | } |
137 | } |
| 132 | 138 | ||
| 133 | static void i8042_irq_handler(irq_t *irq) |
139 | static void i8042_irq_handler(irq_t *irq) |
| 134 | { |
140 | { |
| 135 | if (irq->notif_cfg.notify && irq->notif_cfg.answerbox) |
141 | if (irq->notif_cfg.notify && irq->notif_cfg.answerbox) { |
| - | 142 | /* |
|
| - | 143 | * This will hopefully go to the IRQ dispatcher code soon. |
|
| - | 144 | */ |
|
| 136 | ipc_irq_send_notif(irq); |
145 | ipc_irq_send_notif(irq); |
| 137 | else { |
146 | return; |
| - | 147 | } |
|
| - | 148 | ||
| - | 149 | i8042_instance_t *instance = irq->instance; |
|
| - | 150 | i8042_t *dev = instance->i8042; |
|
| - | 151 | ||
| 138 | uint8_t data; |
152 | uint8_t data; |
| 139 | uint8_t status; |
153 | uint8_t status; |
| 140 | 154 | ||
| 141 | while (((status = pio_read_8(i8042_STATUS)) & |
155 | if (((status = pio_read_8(&dev->status)) & i8042_BUFFER_FULL_MASK)) { |
| 142 | i8042_BUFFER_FULL_MASK)) { |
- | |
| 143 | data = pio_read_8(i8042_DATA); |
156 | data = pio_read_8(&dev->data); |
| 144 | 157 | ||
| 145 | if ((status & i8042_MOUSE_DATA)) |
158 | if ((status & i8042_MOUSE_DATA)) |
| 146 | continue; |
159 | return; |
| 147 | 160 | ||
| 148 | if (data & KEY_RELEASE) |
161 | if (data & KEY_RELEASE) |
| 149 | key_released(data ^ KEY_RELEASE); |
162 | key_released(data ^ KEY_RELEASE); |
| 150 | else |
163 | else |
| 151 | key_pressed(data); |
164 | key_pressed(data); |
| 152 | } |
- | |
| 153 | } |
165 | } |
| 154 | } |
166 | } |
| 155 | 167 | ||
| 156 | /** Initialize i8042. */ |
168 | /** Initialize i8042. */ |
| 157 | void |
169 | void |
| 158 | i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno, |
170 | i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno, |
| 159 | inr_t mouse_inr) |
171 | inr_t mouse_inr) |
| 160 | { |
172 | { |
| - | 173 | i8042_t *dev = lgcy_i8042_instance.i8042; |
|
| - | 174 | ||
| 161 | chardev_initialize("i8042_kbd", &kbrd, &ops); |
175 | chardev_initialize("i8042_kbd", &kbrd, &ops); |
| 162 | stdin = &kbrd; |
176 | stdin = &kbrd; |
| 163 | 177 | ||
| 164 | irq_initialize(&i8042_kbd_irq); |
178 | irq_initialize(&i8042_kbd_irq); |
| 165 | i8042_kbd_irq.devno = kbd_devno; |
179 | i8042_kbd_irq.devno = kbd_devno; |
| 166 | i8042_kbd_irq.inr = kbd_inr; |
180 | i8042_kbd_irq.inr = kbd_inr; |
| 167 | i8042_kbd_irq.claim = i8042_claim; |
181 | i8042_kbd_irq.claim = i8042_claim; |
| 168 | i8042_kbd_irq.handler = i8042_irq_handler; |
182 | i8042_kbd_irq.handler = i8042_irq_handler; |
| - | 183 | i8042_kbd_irq.instance = &lgcy_i8042_instance; |
|
| 169 | irq_register(&i8042_kbd_irq); |
184 | irq_register(&i8042_kbd_irq); |
| 170 | 185 | ||
| 171 | irq_initialize(&i8042_mouse_irq); |
186 | irq_initialize(&i8042_mouse_irq); |
| 172 | i8042_mouse_irq.devno = mouse_devno; |
187 | i8042_mouse_irq.devno = mouse_devno; |
| 173 | i8042_mouse_irq.inr = mouse_inr; |
188 | i8042_mouse_irq.inr = mouse_inr; |
| 174 | i8042_mouse_irq.claim = i8042_claim; |
189 | i8042_mouse_irq.claim = i8042_claim; |
| 175 | i8042_mouse_irq.handler = i8042_irq_handler; |
190 | i8042_mouse_irq.handler = i8042_irq_handler; |
| - | 191 | i8042_mouse_irq.instance = &lgcy_i8042_instance; |
|
| 176 | irq_register(&i8042_mouse_irq); |
192 | irq_register(&i8042_mouse_irq); |
| 177 | 193 | ||
| 178 | trap_virtual_enable_irqs(1 << kbd_inr); |
194 | trap_virtual_enable_irqs(1 << kbd_inr); |
| 179 | trap_virtual_enable_irqs(1 << mouse_inr); |
195 | trap_virtual_enable_irqs(1 << mouse_inr); |
| 180 | 196 | ||
| 181 | /* |
197 | /* |
| 182 | * Clear input buffer. |
198 | * Clear input buffer. |
| 183 | * Number of iterations is limited to prevent infinite looping. |
199 | * Number of iterations is limited to prevent infinite looping. |
| 184 | */ |
200 | */ |
| 185 | int i; |
201 | int i; |
| 186 | for (i = 0; (pio_read_8(i8042_STATUS) & i8042_BUFFER_FULL_MASK) && |
202 | for (i = 0; (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK) && |
| 187 | i < 100; i++) { |
203 | i < 100; i++) { |
| 188 | (void) pio_read_8(i8042_DATA); |
204 | (void) pio_read_8(&dev->data); |
| 189 | } |
205 | } |
| 190 | 206 | ||
| 191 | sysinfo_set_item_val("kbd", NULL, true); |
207 | sysinfo_set_item_val("kbd", NULL, true); |
| 192 | sysinfo_set_item_val("kbd.devno", NULL, kbd_devno); |
208 | sysinfo_set_item_val("kbd.devno", NULL, kbd_devno); |
| 193 | sysinfo_set_item_val("kbd.inr", NULL, kbd_inr); |
209 | sysinfo_set_item_val("kbd.inr", NULL, kbd_inr); |
| Line 211... | Line 227... | ||
| 211 | { |
227 | { |
| 212 | } |
228 | } |
| 213 | 229 | ||
| 214 | char i8042_key_read(chardev_t *d) |
230 | char i8042_key_read(chardev_t *d) |
| 215 | { |
231 | { |
| - | 232 | i8042_t *dev = lgcy_i8042_instance.i8042; |
|
| 216 | char ch; |
233 | char ch; |
| 217 | 234 | ||
| 218 | while (!(ch = active_read_buff_read())) { |
235 | while (!(ch = active_read_buff_read())) { |
| 219 | uint8_t x; |
236 | uint8_t x; |
| 220 | 237 | ||
| 221 | while (!(pio_read_8(i8042_STATUS) & i8042_BUFFER_FULL_MASK)) |
238 | while (!(pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK)) |
| 222 | ; |
239 | ; |
| 223 | 240 | ||
| 224 | x = pio_read_8(i8042_STATUS); |
241 | x = pio_read_8(&dev->data); |
| 225 | if (x & KEY_RELEASE) |
242 | if (x & KEY_RELEASE) |
| 226 | key_released(x ^ KEY_RELEASE); |
243 | key_released(x ^ KEY_RELEASE); |
| 227 | else |
244 | else |
| 228 | active_read_key_pressed(x); |
245 | active_read_key_pressed(x); |
| 229 | } |
246 | } |