Revision 11d23c35

b/hw/mips_r4k.c
241 241

  
242 242
    /* The PIC is attached to the MIPS CPU INT0 pin */
243 243
    i8259 = i8259_init(env->irq[2]);
244
    isa_bus_new(NULL);
245
    isa_bus_irqs(i8259);
244 246

  
245 247
    rtc_state = rtc_init(0x70, i8259[8], 2000);
246 248

  
......
276 278
                     hd[MAX_IDE_DEVS * i],
277 279
		     hd[MAX_IDE_DEVS * i + 1]);
278 280

  
279
    i8042_init(i8259[1], i8259[12], 0x60);
281
    isa_create_simple("i8042");
280 282
}
281 283

  
282 284
static QEMUMachine mips_machine = {
b/hw/pckbd.c
362 362
    return 0;
363 363
}
364 364

  
365
void i8042_init(qemu_irq kbd_irq, qemu_irq mouse_irq, uint32_t io_base)
366
{
367
    KBDState *s = &kbd_state;
368

  
369
    s->irq_kbd = kbd_irq;
370
    s->irq_mouse = mouse_irq;
371

  
372
    kbd_reset(s);
373
    register_savevm("pckbd", 0, 3, kbd_save, kbd_load, s);
374
    register_ioport_read(io_base, 1, 1, kbd_read_data, s);
375
    register_ioport_write(io_base, 1, 1, kbd_write_data, s);
376
    register_ioport_read(io_base + 4, 1, 1, kbd_read_status, s);
377
    register_ioport_write(io_base + 4, 1, 1, kbd_write_command, s);
378

  
379
    s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s);
380
    s->mouse = ps2_mouse_init(kbd_update_aux_irq, s);
381
#ifdef TARGET_I386
382
    vmmouse_init(s->mouse);
383
#endif
384
    qemu_register_reset(kbd_reset, s);
385
}
386

  
387 365
/* Memory mapped interface */
388 366
static uint32_t kbd_mm_readb (void *opaque, target_phys_addr_t addr)
389 367
{
b/hw/ppc_prep.c
711 711
                     hd[2 * i],
712 712
		     hd[2 * i + 1]);
713 713
    }
714
    i8042_init(i8259[1], i8259[12], 0x60);
714
    isa_create_simple("i8042");
715 715
    DMA_init(1);
716 716
    //    SB16_init();
717 717

  

Also available in: Unified diff