diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-02-05 16:32:23 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-02-20 09:33:46 +0000 |
| commit | 63ffb564dca94f8bda01ed6d209784104630a4d2 (patch) | |
| tree | 4804b4a3feea7e6854e9fe869901f4a964391e06 /hw/pc_piix.c | |
| parent | d288c7ba7beb7975fe4bc15b0b14b9fd14da0a03 (diff) | |
| download | qemu-63ffb564dca94f8bda01ed6d209784104630a4d2.zip qemu-63ffb564dca94f8bda01ed6d209784104630a4d2.tar.gz qemu-63ffb564dca94f8bda01ed6d209784104630a4d2.tar.bz2 | |
fdc: refactor device creation
Turn fdc_init_isa into an inline function.
Get floppy geometry directly from the drives.
Don't expose FDCtrl.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 2918454..b4ca9ec 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -82,7 +82,6 @@ static void pc_init1(ram_addr_t ram_size, qemu_irq *smi_irq; IsaIrqState *isa_irq_state; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; - FDCtrl *floppy_controller; BusState *idebus[MAX_IDE_BUS]; ISADevice *rtc_state; @@ -119,7 +118,7 @@ static void pc_init1(ram_addr_t ram_size, pc_vga_init(pci_enabled? pci_bus: NULL); /* init basic PC hardware */ - pc_basic_device_init(isa_irq, &floppy_controller, &rtc_state); + pc_basic_device_init(isa_irq, &rtc_state); for(i = 0; i < nb_nics; i++) { NICInfo *nd = &nd_table[i]; @@ -156,7 +155,7 @@ static void pc_init1(ram_addr_t ram_size, audio_init(isa_irq, pci_enabled ? pci_bus : NULL); pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, - idebus[0], idebus[1], floppy_controller, rtc_state); + idebus[0], idebus[1], rtc_state); if (pci_enabled && usb_enabled) { usb_uhci_piix3_init(pci_bus, piix3_devfn + 2); |