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

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 029e18e685ec231a2e65088e886281d660f47812..6df94dbaf292ee28736d391d40159c5d9a1bd430 100644 (file)
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -490,6 +490,7 @@ static void main_cpu_reset(void *opaque)
         load_kernel (env);
 }
 
+static
 void mips_malta_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,

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 8d1cac93929ee7a0b087e4082634fb12920f656a..7d3ddd934b8a9d20a98a744791f3cbc92c687e28 100644 (file)
--- 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 = {