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
This commit is contained in:
parent
b7678d96c5
commit
70705261e1
@ -490,6 +490,7 @@ static void main_cpu_reset(void *opaque)
|
|||||||
load_kernel (env);
|
load_kernel (env);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static
|
||||||
void mips_malta_init (int ram_size, int vga_ram_size, int boot_device,
|
void mips_malta_init (int ram_size, int vga_ram_size, int boot_device,
|
||||||
DisplayState *ds, const char **fd_filename, int snapshot,
|
DisplayState *ds, const char **fd_filename, int snapshot,
|
||||||
const char *kernel_filename, const char *kernel_cmdline,
|
const char *kernel_filename, const char *kernel_cmdline,
|
||||||
|
@ -126,6 +126,7 @@ static void main_cpu_reset(void *opaque)
|
|||||||
env->kernel_cmdline, env->initrd_filename);
|
env->kernel_cmdline, env->initrd_filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static
|
||||||
void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
|
void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
|
||||||
DisplayState *ds, const char **fd_filename, int snapshot,
|
DisplayState *ds, const char **fd_filename, int snapshot,
|
||||||
const char *kernel_filename, const char *kernel_cmdline,
|
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++)
|
for(i = 0; i < 2; i++)
|
||||||
isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i],
|
isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i],
|
||||||
bs_table[2 * i], bs_table[2 * i + 1]);
|
bs_table[2 * i], bs_table[2 * i + 1]);
|
||||||
|
|
||||||
|
kbd_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
QEMUMachine mips_machine = {
|
QEMUMachine mips_machine = {
|
||||||
|
Loading…
Reference in New Issue
Block a user