david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance PC kbd debugging (patch from Hervé Poussineau)

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3972 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2008-02-10 13:39:24 +00:00
parent 52ccc5e0c5
commit e41c0f263f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/pckbd.c
View File

@ -30,9 +30,6 @@
/* debug PC keyboard */ /* debug PC keyboard */
//#define DEBUG_KBD //#define DEBUG_KBD
/* debug PC keyboard : only mouse */
//#define DEBUG_MOUSE
/* Keyboard Controller Commands */ /* Keyboard Controller Commands */
#define KBD_CCMD_READ_MODE 0x20 /* Read mode bits */ #define KBD_CCMD_READ_MODE 0x20 /* Read mode bits */
#define KBD_CCMD_WRITE_MODE 0x60 /* Write mode bits */ #define KBD_CCMD_WRITE_MODE 0x60 /* Write mode bits */
@ -283,11 +280,17 @@ static void kbd_write_command(void *opaque, uint32_t addr, uint32_t val)
static uint32_t kbd_read_data(void *opaque, uint32_t addr) static uint32_t kbd_read_data(void *opaque, uint32_t addr)
{ {
KBDState *s = opaque; KBDState *s = opaque;
uint32_t val;
if (s->pending == KBD_PENDING_AUX) if (s->pending == KBD_PENDING_AUX)
return ps2_read_data(s->mouse); val = ps2_read_data(s->mouse);
else
val = ps2_read_data(s->kbd);
return ps2_read_data(s->kbd); #if defined(DEBUG_KBD)
printf("kbd: read data=0x%02x\n", val);
#endif
return val;
} }
static void kbd_write_data(void *opaque, uint32_t addr, uint32_t val) static void kbd_write_data(void *opaque, uint32_t addr, uint32_t val)
@ -439,7 +442,7 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
kbd_reset(s); kbd_reset(s);
register_savevm("pckbd", 0, 3, kbd_save, kbd_load, s); register_savevm("pckbd", 0, 3, kbd_save, kbd_load, s);
s_io_memory = cpu_register_io_memory(0, kbd_mm_read, kbd_mm_write, s); s_io_memory = cpu_register_io_memory(0, kbd_mm_read, kbd_mm_write, s);
cpu_register_physical_memory(base, 8 << it_shift, s_io_memory); cpu_register_physical_memory(base, 2 << it_shift, s_io_memory);
s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s); s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s);
s->mouse = ps2_mouse_init(kbd_update_aux_irq, s); s->mouse = ps2_mouse_init(kbd_update_aux_irq, s);