From patchwork Wed Sep 30 10:17:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 34542 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 C5B32B70B3 for ; Wed, 30 Sep 2009 21:14:15 +1000 (EST) Received: from localhost ([127.0.0.1]:33791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Msx8O-0007Bo-NV for incoming@patchwork.ozlabs.org; Wed, 30 Sep 2009 07:14:12 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MswId-0004kn-4Z for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:20:43 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MswIL-0004Xo-RO for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:20:35 -0400 Received: from [199.232.76.173] (port=43883 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MswIK-0004X2-RW for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:20:25 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:55876) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MswIJ-0005qF-K3 for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:20:24 -0400 Received: from nm.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with ESMTP id E752649C17; Wed, 30 Sep 2009 19:20:16 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1MswGc-0003rW-ES; Wed, 30 Sep 2009 19:18:38 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, anthony@codemonkey.ws Date: Wed, 30 Sep 2009 19:17:52 +0900 Message-Id: <1254305917-14784-17-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1254305917-14784-1-git-send-email-yamahata@valinux.co.jp> References: <1254305917-14784-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH 16/61] pc: split out basic device init from pc_init1() into pc_basic_device_init() 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 Split out basic device, i.e. legacy devices like floppy, initialization from pc_init1() into pc_basic_device_init(). Later it will be used. Signed-off-by: Isaku Yamahata --- hw/pc.c | 97 +++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 54 insertions(+), 43 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 5c461a6..380a66f 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1309,6 +1309,58 @@ static void pc_vga_init(PCIBus *pci_bus) } } +static void pc_basic_device_init(qemu_irq *isa_irq, + ISADevice **isa_dev, + fdctrl_t **floppy_controller, + RTCState **rtc_state) +{ + int i; + DriveInfo *dinfo; + BlockDriverState *fd[MAX_FD]; + PITState *pit; + + register_ioport_write(0x80, 1, 1, ioport80_write, NULL); + + register_ioport_write(0xf0, 1, 1, ioportF0_write, NULL); + + *rtc_state = rtc_init(2000); + cmos_set_s3_resume_init(*rtc_state); + + qemu_register_boot_set(pc_boot_set, *rtc_state); + + register_ioport_read(0x92, 1, 1, ioport92_read, NULL); + register_ioport_write(0x92, 1, 1, ioport92_write, NULL); + + pit = pit_init(0x40, isa_reserve_irq(0)); + pcspk_init(pit); + if (!no_hpet) { + hpet_init(isa_irq); + } + + for(i = 0; i < MAX_SERIAL_PORTS; i++) { + if (serial_hds[i]) { + serial_init(serial_io[i], isa_reserve_irq(serial_irq[i]), 115200, + serial_hds[i]); + } + } + + for(i = 0; i < MAX_PARALLEL_PORTS; i++) { + if (parallel_hds[i]) { + parallel_init(parallel_io[i], isa_reserve_irq(parallel_irq[i]), + parallel_hds[i]); + } + } + + *isa_dev = isa_create_simple("i8042"); + DMA_init(0); + + for(i = 0; i < MAX_FD; i++) { + dinfo = drive_get(IF_FLOPPY, 0, i); + fd[i] = dinfo ? dinfo->bdrv : NULL; + } + *floppy_controller = fdctrl_init_isa(fd); +} + /* PC hardware initialisation */ static void pc_init1(ram_addr_t ram_size, const char *boot_device, @@ -1328,12 +1380,9 @@ static void pc_init1(ram_addr_t ram_size, qemu_irq *isa_irq; qemu_irq *i8259; IsaIrqState *isa_irq_state; - DriveInfo *dinfo; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; - BlockDriverState *fd[MAX_FD]; fdctrl_t *floppy_controller; RTCState *rtc_state; - PITState *pit; pc_cpus_init(cpu_model); @@ -1359,43 +1408,13 @@ static void pc_init1(ram_addr_t ram_size, pc_register_ferr_irq(isa_reserve_irq(13)); - /* init basic PC hardware */ - register_ioport_write(0x80, 1, 1, ioport80_write, NULL); - - register_ioport_write(0xf0, 1, 1, ioportF0_write, NULL); - pc_vga_init(pci_enabled? pci_bus: NULL); - rtc_state = rtc_init(2000); - cmos_set_s3_resume_init(rtc_state); - - qemu_register_boot_set(pc_boot_set, rtc_state); - - register_ioport_read(0x92, 1, 1, ioport92_read, NULL); - register_ioport_write(0x92, 1, 1, ioport92_write, NULL); - + /* init basic PC hardware */ + pc_basic_device_init(isa_irq, &isa_dev, &floppy_controller, &rtc_state); if (pci_enabled) { isa_irq_state->ioapic = ioapic_init(); } - pit = pit_init(0x40, isa_reserve_irq(0)); - pcspk_init(pit); - if (!no_hpet) { - hpet_init(isa_irq); - } - - for(i = 0; i < MAX_SERIAL_PORTS; i++) { - if (serial_hds[i]) { - serial_init(serial_io[i], isa_reserve_irq(serial_irq[i]), 115200, - serial_hds[i]); - } - } - - for(i = 0; i < MAX_PARALLEL_PORTS; i++) { - if (parallel_hds[i]) { - parallel_init(parallel_io[i], isa_reserve_irq(parallel_irq[i]), - parallel_hds[i]); - } - } for(i = 0; i < nb_nics; i++) { NICInfo *nd = &nd_table[i]; @@ -1426,18 +1445,10 @@ static void pc_init1(ram_addr_t ram_size, } } - isa_dev = isa_create_simple("i8042"); - DMA_init(0); #ifdef HAS_AUDIO audio_init(pci_enabled ? pci_bus : NULL, isa_irq); #endif - for(i = 0; i < MAX_FD; i++) { - dinfo = drive_get(IF_FLOPPY, 0, i); - fd[i] = dinfo ? dinfo->bdrv : NULL; - } - floppy_controller = fdctrl_init_isa(fd); - cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, hd, floppy_controller, rtc_state);