summary refs log tree commit diff stats
path: root/hw/mips_r4k.c
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-02-18 00:10:59 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-02-18 00:10:59 +0000
commit70705261e1c9762b149a2180e60b974ea9a5c2f0 (patch)
tree5f8a95680e944f6b2cca0afadc32331d2c8080ef /hw/mips_r4k.c
parentb7678d96c52b5e902283e538007e7b8e001dbc19 (diff)
downloadfocaccia-qemu-70705261e1c9762b149a2180e60b974ea9a5c2f0.tar.gz
focaccia-qemu-70705261e1c9762b149a2180e60b974ea9a5c2f0.zip
Add PS/2 keyboard to MIPS R4K, by Herve Poussineau.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2432 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/mips_r4k.c')
-rw-r--r--hw/mips_r4k.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 8d1cac9392..7d3ddd934b 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -126,6 +126,7 @@ static void main_cpu_reset(void *opaque)
                      env->kernel_cmdline, env->initrd_filename);
 }
 
+static
 void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
                     DisplayState *ds, const char **fd_filename, int snapshot,
                     const char *kernel_filename, const char *kernel_cmdline,
@@ -212,6 +213,8 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
     for(i = 0; i < 2; i++)
         isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i],
                      bs_table[2 * i], bs_table[2 * i + 1]);
+
+    kbd_init();
 }
 
 QEMUMachine mips_machine = {