Revision d537cf6c hw/sun4u.c

b/hw/sun4u.c
223 223
{
224 224
}
225 225

  
226
void pic_set_irq(int irq, int level)
227
{
228
}
229

  
230
void pic_set_irq_new(void *opaque, int irq, int level)
231
{
232
}
233

  
234 226
void qemu_system_powerdown(void)
235 227
{
236 228
}
......
340 332

  
341 333
    for(i = 0; i < MAX_SERIAL_PORTS; i++) {
342 334
        if (serial_hds[i]) {
343
            serial_init(&pic_set_irq_new, NULL,
344
                        serial_io[i], serial_irq[i], serial_hds[i]);
335
            serial_init(serial_io[i], NULL/*serial_irq[i]*/, serial_hds[i]);
345 336
        }
346 337
    }
347 338

  
348 339
    for(i = 0; i < MAX_PARALLEL_PORTS; i++) {
349 340
        if (parallel_hds[i]) {
350
            parallel_init(parallel_io[i], parallel_irq[i], parallel_hds[i]);
341
            parallel_init(parallel_io[i], NULL/*parallel_irq[i]*/, parallel_hds[i]);
351 342
        }
352 343
    }
353 344

  
......
358 349
    }
359 350

  
360 351
    pci_cmd646_ide_init(pci_bus, bs_table, 1);
361
    kbd_init();
362
    floppy_controller = fdctrl_init(6, 2, 0, 0x3f0, fd_table);
363
    nvram = m48t59_init(8, 0, 0x0074, NVRAM_SIZE, 59);
352
    /* FIXME: wire up interrupts.  */
353
    i8042_init(NULL/*1*/, NULL/*12*/, 0x60);
354
    floppy_controller = fdctrl_init(NULL/*6*/, 2, 0, 0x3f0, fd_table);
355
    nvram = m48t59_init(NULL/*8*/, 0, 0x0074, NVRAM_SIZE, 59);
364 356
    sun4u_NVRAM_set_params(nvram, NVRAM_SIZE, "Sun4u", ram_size, boot_device,
365 357
                         KERNEL_LOAD_ADDR, kernel_size,
366 358
                         kernel_cmdline,

Also available in: Unified diff