[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 07/16] hw/i386/pc: factor out pc_cmos_init_floppy(
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 07/16] hw/i386/pc: factor out pc_cmos_init_floppy() |
Date: |
Wed, 8 Jul 2015 12:41:47 +0300 |
From: Laszlo Ersek <address@hidden>
Extract the pc_cmos_init_floppy() function from pc_cmos_init(). The
function sets two RTC registers: floppy drive types (0x10), overwriting
the earlier value in there), and REG_EQUIPMENT_BYTE (0x14), setting bits
in the prior value.
Cc: Jan Tomko <address@hidden>
Cc: John Snow <address@hidden>
Cc: Markus Armbruster <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/pc.c | 67 ++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 38 insertions(+), 29 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 7959b44..6f1b137 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -293,6 +293,42 @@ static void pc_boot_set(void *opaque, const char
*boot_device, Error **errp)
set_boot_dev(opaque, boot_device, errp);
}
+static void pc_cmos_init_floppy(ISADevice *rtc_state, ISADevice *floppy)
+{
+ int val, nb, i;
+ FDriveType fd_type[2] = { FDRIVE_DRV_NONE, FDRIVE_DRV_NONE };
+
+ /* floppy type */
+ if (floppy) {
+ for (i = 0; i < 2; i++) {
+ fd_type[i] = isa_fdc_get_drive_type(floppy, i);
+ }
+ }
+ val = (cmos_get_fd_drive_type(fd_type[0]) << 4) |
+ cmos_get_fd_drive_type(fd_type[1]);
+ rtc_set_memory(rtc_state, 0x10, val);
+
+ val = rtc_get_memory(rtc_state, REG_EQUIPMENT_BYTE);
+ nb = 0;
+ if (fd_type[0] < FDRIVE_DRV_NONE) {
+ nb++;
+ }
+ if (fd_type[1] < FDRIVE_DRV_NONE) {
+ nb++;
+ }
+ switch (nb) {
+ case 0:
+ break;
+ case 1:
+ val |= 0x01; /* 1 drive, ready for boot */
+ break;
+ case 2:
+ val |= 0x41; /* 2 drives, ready for boot */
+ break;
+ }
+ rtc_set_memory(rtc_state, REG_EQUIPMENT_BYTE, val);
+}
+
typedef struct pc_cmos_init_late_arg {
ISADevice *rtc_state;
BusState *idebus[2];
@@ -343,8 +379,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t
above_4g_mem_size,
ISADevice *floppy, BusState *idebus0, BusState *idebus1,
ISADevice *s)
{
- int val, nb, i;
- FDriveType fd_type[2] = { FDRIVE_DRV_NONE, FDRIVE_DRV_NONE };
+ int val;
static pc_cmos_init_late_arg arg;
PCMachineState *pc_machine = PC_MACHINE(machine);
Error *local_err = NULL;
@@ -401,37 +436,11 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t
above_4g_mem_size,
exit(1);
}
- /* floppy type */
- if (floppy) {
- for (i = 0; i < 2; i++) {
- fd_type[i] = isa_fdc_get_drive_type(floppy, i);
- }
- }
- val = (cmos_get_fd_drive_type(fd_type[0]) << 4) |
- cmos_get_fd_drive_type(fd_type[1]);
- rtc_set_memory(s, 0x10, val);
-
val = 0;
- nb = 0;
- if (fd_type[0] < FDRIVE_DRV_NONE) {
- nb++;
- }
- if (fd_type[1] < FDRIVE_DRV_NONE) {
- nb++;
- }
- switch (nb) {
- case 0:
- break;
- case 1:
- val |= 0x01; /* 1 drive, ready for boot */
- break;
- case 2:
- val |= 0x41; /* 2 drives, ready for boot */
- break;
- }
val |= 0x02; /* FPU is there */
val |= 0x04; /* PS/2 mouse installed */
rtc_set_memory(s, REG_EQUIPMENT_BYTE, val);
+ pc_cmos_init_floppy(s, floppy);
/* hard drives */
arg.rtc_state = s;
--
MST
- [Qemu-devel] [PULL v2 00/16] pc,virtio,pci: fixes and updates, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 01/16] dataplane: fix cross-endian issues, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 03/16] acpi: split out ICH ACPI support, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 02/16] Revert "dataplane: allow virtio-1 devices", Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 04/16] ich9: add TCO interface emulation, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 06/16] ich9: implement strap SPKR pin logic, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 05/16] tests: add testcase for TCO watchdog emulation, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 07/16] hw/i386/pc: factor out pc_cmos_init_floppy(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 08/16] hw/i386/pc: reflect any FDC @ ioport 0x3f0 in the CMOS, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 09/16] hw/i386/pc: don't carry FDC from pc_basic_device_init() to pc_cmos_init(), Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 10/16] virtio_net: reuse constants from linux, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 12/16] pcie: Set the "link active" in the link status register, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 13/16] virtio: define virtio_pci_cfg_cap in header., Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 15/16] virtio fix cfg endian-ness for BE targets, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 14/16] virtio-pci: implement cfg capability, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 11/16] pci_regs.h: import from linux, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 16/16] tco-test: fix up config accesses and re-enable, Michael S. Tsirkin, 2015/07/08
- Re: [Qemu-devel] [PULL v2 00/16] pc,virtio,pci: fixes and updates, Peter Maydell, 2015/07/08