aboutsummaryrefslogtreecommitdiff
path: root/hw/pckbd.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-09-10 11:43:26 +0200
committermalc <av1474@comtv.ru>2009-09-10 19:47:58 +0400
commit86c861578453b544fa67ad50d28c4460bee068c5 (patch)
tree639b1de76d4c0fdbd8ae2501da3288bc62ae28ce /hw/pckbd.c
parent316940b06273c43ec8d58fcb0908267f7fa5d333 (diff)
downloadqemu-86c861578453b544fa67ad50d28c4460bee068c5.zip
qemu-86c861578453b544fa67ad50d28c4460bee068c5.tar.gz
qemu-86c861578453b544fa67ad50d28c4460bee068c5.tar.bz2
qdev: drop iobase properties from isa bus
Lot of ISA devices work at fixed addresses, so having iobase as bus property doesn't make much sense. Devices which can have different iobases will get a device property. Also simply hard-code stuff which can't be configured anyway. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/pckbd.c')
-rw-r--r--hw/pckbd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/pckbd.c b/hw/pckbd.c
index 3f83320..b4b65a6 100644
--- a/hw/pckbd.c
+++ b/hw/pckbd.c
@@ -455,10 +455,10 @@ static int i8042_initfn(ISADevice *dev)
kbd_reset(s);
register_savevm("pckbd", 0, 3, kbd_save, kbd_load, s);
- register_ioport_read(dev->iobase[0], 1, 1, kbd_read_data, s);
- register_ioport_write(dev->iobase[0], 1, 1, kbd_write_data, s);
- register_ioport_read(dev->iobase[1], 1, 1, kbd_read_status, s);
- register_ioport_write(dev->iobase[1], 1, 1, kbd_write_command, s);
+ register_ioport_read(0x60, 1, 1, kbd_read_data, s);
+ register_ioport_write(0x60, 1, 1, kbd_write_data, s);
+ register_ioport_read(0x64, 1, 1, kbd_read_status, s);
+ register_ioport_write(0x64, 1, 1, kbd_write_command, s);
s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s);
s->mouse = ps2_mouse_init(kbd_update_aux_irq, s);