Revision d537cf6c hw/pckbd.c
b/hw/pckbd.c | ||
---|---|---|
122 | 122 |
void *kbd; |
123 | 123 |
void *mouse; |
124 | 124 |
|
125 |
int irq_kbd;
|
|
126 |
int irq_mouse;
|
|
125 |
qemu_irq irq_kbd;
|
|
126 |
qemu_irq irq_mouse;
|
|
127 | 127 |
} KBDState; |
128 | 128 |
|
129 | 129 |
KBDState kbd_state; |
... | ... | |
151 | 151 |
irq_kbd_level = 1; |
152 | 152 |
} |
153 | 153 |
} |
154 |
pic_set_irq(s->irq_kbd, irq_kbd_level);
|
|
155 |
pic_set_irq(s->irq_mouse, irq_mouse_level);
|
|
154 |
qemu_set_irq(s->irq_kbd, irq_kbd_level);
|
|
155 |
qemu_set_irq(s->irq_mouse, irq_mouse_level);
|
|
156 | 156 |
} |
157 | 157 |
|
158 | 158 |
static void kbd_update_kbd_irq(void *opaque, int level) |
... | ... | |
356 | 356 |
return 0; |
357 | 357 |
} |
358 | 358 |
|
359 |
void i8042_init(int kbd_irq_lvl, int mouse_irq_lvl, uint32_t io_base)
|
|
359 |
void i8042_init(qemu_irq kbd_irq, qemu_irq mouse_irq, uint32_t io_base)
|
|
360 | 360 |
{ |
361 | 361 |
KBDState *s = &kbd_state; |
362 | 362 |
|
363 |
s->irq_kbd = kbd_irq_lvl;
|
|
364 |
s->irq_mouse = mouse_irq_lvl;
|
|
363 |
s->irq_kbd = kbd_irq; |
|
364 |
s->irq_mouse = mouse_irq; |
|
365 | 365 |
|
366 | 366 |
kbd_reset(s); |
367 | 367 |
register_savevm("pckbd", 0, 3, kbd_save, kbd_load, s); |
... | ... | |
377 | 377 |
#endif |
378 | 378 |
qemu_register_reset(kbd_reset, s); |
379 | 379 |
} |
380 |
|
|
381 |
void kbd_init(void) |
|
382 |
{ |
|
383 |
return i8042_init(1, 12, 0x60); |
|
384 |
} |
Also available in: Unified diff