Commit 70705261e1c9762b149a2180e60b974ea9a5c2f0
1 parent
b7678d96
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
Showing
2 changed files
with
4 additions
and
0 deletions
hw/mips_malta.c
| @@ -490,6 +490,7 @@ static void main_cpu_reset(void *opaque) | @@ -490,6 +490,7 @@ static void main_cpu_reset(void *opaque) | ||
| 490 | load_kernel (env); | 490 | load_kernel (env); |
| 491 | } | 491 | } |
| 492 | 492 | ||
| 493 | +static | ||
| 493 | void mips_malta_init (int ram_size, int vga_ram_size, int boot_device, | 494 | void mips_malta_init (int ram_size, int vga_ram_size, int boot_device, |
| 494 | DisplayState *ds, const char **fd_filename, int snapshot, | 495 | DisplayState *ds, const char **fd_filename, int snapshot, |
| 495 | const char *kernel_filename, const char *kernel_cmdline, | 496 | const char *kernel_filename, const char *kernel_cmdline, |
hw/mips_r4k.c
| @@ -126,6 +126,7 @@ static void main_cpu_reset(void *opaque) | @@ -126,6 +126,7 @@ static void main_cpu_reset(void *opaque) | ||
| 126 | env->kernel_cmdline, env->initrd_filename); | 126 | env->kernel_cmdline, env->initrd_filename); |
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | +static | ||
| 129 | void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device, | 130 | void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device, |
| 130 | DisplayState *ds, const char **fd_filename, int snapshot, | 131 | DisplayState *ds, const char **fd_filename, int snapshot, |
| 131 | const char *kernel_filename, const char *kernel_cmdline, | 132 | 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, | @@ -212,6 +213,8 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device, | ||
| 212 | for(i = 0; i < 2; i++) | 213 | for(i = 0; i < 2; i++) |
| 213 | isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i], | 214 | isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i], |
| 214 | bs_table[2 * i], bs_table[2 * i + 1]); | 215 | bs_table[2 * i], bs_table[2 * i + 1]); |
| 216 | + | ||
| 217 | + kbd_init(); | ||
| 215 | } | 218 | } |
| 216 | 219 | ||
| 217 | QEMUMachine mips_machine = { | 220 | QEMUMachine mips_machine = { |