From patchwork Wed Sep 8 20:39:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 64210 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7470EB6EEC for ; Thu, 9 Sep 2010 06:46:41 +1000 (EST) Received: from localhost ([127.0.0.1]:60292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OtRXR-0007F1-6T for incoming@patchwork.ozlabs.org; Wed, 08 Sep 2010 16:46:37 -0400 Received: from [140.186.70.92] (port=40520 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OtRRR-00043U-1q for qemu-devel@nongnu.org; Wed, 08 Sep 2010 16:40:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OtRRP-0007tQ-TP for qemu-devel@nongnu.org; Wed, 08 Sep 2010 16:40:25 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:49308) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtRRP-0007s1-CQ for qemu-devel@nongnu.org; Wed, 08 Sep 2010 16:40:23 -0400 Received: from localhost.localdomain (unknown [88.171.126.33]) by smtp5-g21.free.fr (Postfix) with ESMTP id 46D90D480DA; Wed, 8 Sep 2010 22:40:18 +0200 (CEST) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Wed, 8 Sep 2010 22:39:48 +0200 Message-Id: <1283978392-6313-5-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.1.GIT In-Reply-To: <1283978392-6313-1-git-send-email-hpoussin@reactos.org> References: <1283978392-6313-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH 4/8] [MIPS] qdev: Use qdev floppy disk controller in Jazz emulation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Remove fdctrl_init_sysbus() function, which is not used anymore Signed-off-by: Hervé Poussineau --- hw/fdc.c | 24 ------------------------ hw/fdc.h | 2 -- hw/mips_jazz.c | 10 +--------- 3 files changed, 1 insertions(+), 35 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index c159dcb..57d7e06 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1889,30 +1889,6 @@ FDCtrl *fdctrl_init_isa(DriveInfo **fds) return &(DO_UPCAST(FDCtrlISABus, busdev, dev)->state); } -FDCtrl *fdctrl_init_sysbus(qemu_irq irq, int dma_chann, - target_phys_addr_t mmio_base, DriveInfo **fds) -{ - FDCtrl *fdctrl; - DeviceState *dev; - FDCtrlSysBus *sys; - - dev = qdev_create(NULL, "sysbus-fdc"); - sys = DO_UPCAST(FDCtrlSysBus, busdev.qdev, dev); - fdctrl = &sys->state; - fdctrl->dma_chann = dma_chann; /* FIXME */ - if (fds[0]) { - qdev_prop_set_drive_nofail(dev, "driveA", fds[0]->bdrv); - } - if (fds[1]) { - qdev_prop_set_drive_nofail(dev, "driveB", fds[1]->bdrv); - } - qdev_init_nofail(dev); - sysbus_connect_irq(&sys->busdev, 0, irq); - sysbus_mmio_map(&sys->busdev, 0, mmio_base); - - return fdctrl; -} - FDCtrl *sun4m_fdctrl_init(qemu_irq irq, target_phys_addr_t io_base, DriveInfo **fds, qemu_irq *fdc_tc) { diff --git a/hw/fdc.h b/hw/fdc.h index 242730a..c99e08a 100644 --- a/hw/fdc.h +++ b/hw/fdc.h @@ -7,8 +7,6 @@ typedef struct FDCtrl FDCtrl; FDCtrl *fdctrl_init_isa(DriveInfo **fds); -FDCtrl *fdctrl_init_sysbus(qemu_irq irq, int dma_chann, - target_phys_addr_t mmio_base, DriveInfo **fds); FDCtrl *sun4m_fdctrl_init(qemu_irq irq, target_phys_addr_t io_base, DriveInfo **fds, qemu_irq *fdc_tc); int fdctrl_get_drive_type(FDCtrl *fdctrl, int drive_num); diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 0af4044..5c66cd4 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -137,7 +137,6 @@ void mips_jazz_init (ram_addr_t ram_size, int s_rtc, s_dma_dummy; NICInfo *nd; PITState *pit; - DriveInfo *fds[MAX_FD]; qemu_irq esp_reset; qemu_irq *cpu_exit_irq; ram_addr_t ram_offset; @@ -249,14 +248,7 @@ void mips_jazz_init (ram_addr_t ram_size, rc4030[5], &esp_reset); /* Floppy */ - if (drive_get_max_bus(IF_FLOPPY) >= MAX_FD) { - fprintf(stderr, "qemu: too many floppy drives\n"); - exit(1); - } - for (n = 0; n < MAX_FD; n++) { - fds[n] = drive_get(IF_FLOPPY, 0, n); - } - fdctrl_init_sysbus(rc4030[1], 0, 0x80003000, fds); + sysbus_create_simple("sysbus-fdc", 0x80003000, rc4030[1]); /* Real time clock */ rtc_init(1980, NULL);