From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33968 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pdp4e-0005cY-VP for qemu-devel@nongnu.org; Fri, 14 Jan 2011 14:12:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pdp4d-0007Jy-6b for qemu-devel@nongnu.org; Fri, 14 Jan 2011 14:12:36 -0500 Received: from sj-iport-5.cisco.com ([171.68.10.87]:2663) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pdp4d-0007IX-2O for qemu-devel@nongnu.org; Fri, 14 Jan 2011 14:12:35 -0500 From: David Ahern Date: Fri, 14 Jan 2011 12:12:19 -0700 Message-Id: <1295032341-6926-10-git-send-email-daahern@cisco.com> In-Reply-To: <1295032341-6926-1-git-send-email-daahern@cisco.com> References: <1295032341-6926-1-git-send-email-daahern@cisco.com> Subject: [Qemu-devel] [PATCH 09/11] config: fix compile for CONFIG_FDC=n List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: David Ahern Signed-off-by: David Ahern --- hw/pc.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 11b570f..b50bbc4 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -191,6 +191,7 @@ static void pic_irq_request(void *opaque, int irq, int level) #define REG_EQUIPMENT_BYTE 0x14 +#ifdef CONFIG_FDC static int cmos_get_fd_drive_type(int fd0) { int val; @@ -214,6 +215,7 @@ static int cmos_get_fd_drive_type(int fd0) } return val; } +#endif static void cmos_init_hd(int type_ofs, int info_ofs, BlockDriverState *hd, ISADevice *s) @@ -335,7 +337,9 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, FDCtrl *floppy_controller, ISADevice *s) { int val; +#ifdef CONFIG_FDC int fd0, fd1, nb; +#endif static pc_cmos_init_late_arg arg; /* various important CMOS locations needed by PC/Bochs bios */ @@ -376,6 +380,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, exit(1); } +#ifdef CONFIG_FDC /* floppy type */ fd0 = fdctrl_get_drive_type(floppy_controller, 0); @@ -400,6 +405,9 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, val |= 0x41; /* 2 drives, ready for boot */ break; } +#else + val = 0; +#endif val |= 0x02; /* FPU is there */ val |= 0x04; /* PS/2 mouse installed */ rtc_set_memory(s, REG_EQUIPMENT_BYTE, val); @@ -1162,7 +1170,9 @@ void pc_basic_device_init(qemu_irq *isa_irq, for(i = 0; i < MAX_FD; i++) { fd[i] = drive_get(IF_FLOPPY, 0, i); } +#ifdef CONFIG_FDC *floppy_controller = fdctrl_init_isa(fd); +#endif } void pc_pci_device_init(PCIBus *pci_bus) -- 1.7.3.4