From 07dc788054d714a07df08e2eacc8c2e1c47b9a58 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 4 Feb 2015 18:33:07 +0100 Subject: parallel: Factor out common parallel_hds_isa_init() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Maintainers of affected machines cc'ed. Cc: Anthony Liguori Cc: "Michael S. Tsirkin" Cc: Aurelien Jarno Cc: Leon Alrae Cc: Blue Swirl Signed-off-by: Markus Armbruster Signed-off-by: Andreas Färber --- hw/mips/mips_fulong2e.c | 5 +---- hw/mips/mips_malta.c | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'hw/mips') diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index bebf7defbe..ea73585a92 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -384,10 +384,7 @@ static void mips_fulong2e_init(MachineState *machine) rtc_init(isa_bus, 2000, NULL); serial_hds_isa_init(isa_bus, MAX_SERIAL_PORTS); - - if (parallel_hds[0]) { - parallel_init(isa_bus, 0, parallel_hds[0]); - } + parallel_hds_isa_init(isa_bus, 1); /* Sound card */ audio_init(pci_bus); diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index e57f78c1e5..533b2e60fe 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1173,8 +1173,8 @@ void mips_malta_init(MachineState *machine) rtc_init(isa_bus, 2000, NULL); serial_hds_isa_init(isa_bus, 2); - if (parallel_hds[0]) - parallel_init(isa_bus, 0, parallel_hds[0]); + parallel_hds_isa_init(isa_bus, 1); + for(i = 0; i < MAX_FD; i++) { fd[i] = drive_get(IF_FLOPPY, 0, i); } -- cgit v1.2.3