Revision 5bc89ef6 hw/sun4u.c

b/hw/sun4u.c
326 326
    ptimer_set_limit(opaque, -limit, 0);
327 327
}
328 328

  
329
static const int ide_iobase[2] = { 0x1f0, 0x170 };
330
static const int ide_iobase2[2] = { 0x3f6, 0x376 };
331
static const int ide_irq[2] = { 14, 15 };
332

  
333 329
static const int serial_io[MAX_SERIAL_PORTS] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
334 330
static const int serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 };
335 331

  
336 332
static const int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc };
337 333
static const int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 };
338 334

  
339
static fdctrl_t *floppy_controller;
340

  
341 335
static void ebus_mmio_mapfunc(PCIDevice *pci_dev, int region_num,
342 336
                              uint32_t addr, uint32_t size, int type)
343 337
{
......
629 623
        dinfo = drive_get(IF_FLOPPY, 0, i);
630 624
        fd[i] = dinfo ? dinfo->bdrv : NULL;
631 625
    }
632
    floppy_controller = fdctrl_init_isa(6, 2, 0x3f0, fd);
626
    fdctrl_init_isa(6, 2, 0x3f0, fd);
633 627
    nvram = m48t59_init(NULL/*8*/, 0, 0x0074, NVRAM_SIZE, 59);
634 628

  
635 629
    initrd_size = 0;

Also available in: Unified diff