[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V9 16/20] pc: split out basic device init from pc_in
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH V9 16/20] pc: split out basic device init from pc_init1() into pc_basic_device_init() |
Date: |
Tue, 8 Dec 2009 17:33:35 +0900 |
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 <address@hidden>
---
hw/pc.c | 89 +++++++++++++++++++++++++++++++++++---------------------------
1 files changed, 50 insertions(+), 39 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index 34a2337..7d7c800 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1131,6 +1131,54 @@ 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 *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_isa_init(i, serial_hds[i]);
+ }
+ }
+
+ for(i = 0; i < MAX_PARALLEL_PORTS; i++) {
+ if (parallel_hds[i]) {
+ parallel_init(i, parallel_hds[i]);
+ }
+ }
+
+ *isa_dev = isa_create_simple("i8042");
+ DMA_init(0);
+
+ for(i = 0; i < MAX_FD; i++) {
+ fd[i] = drive_get(IF_FLOPPY, 0, i);
+ }
+ *floppy_controller = fdctrl_init_isa(fd);
+}
+
/* PC hardware initialisation */
static void pc_init1(ram_addr_t ram_size,
const char *boot_device,
@@ -1151,10 +1199,8 @@ static void pc_init1(ram_addr_t ram_size,
qemu_irq *i8259;
IsaIrqState *isa_irq_state;
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
- DriveInfo *fd[MAX_FD];
fdctrl_t *floppy_controller;
RTCState *rtc_state;
- PITState *pit;
pc_cpus_init(cpu_model);
@@ -1183,38 +1229,10 @@ 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);
-
- 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_isa_init(i, serial_hds[i]);
- }
- }
-
- for(i = 0; i < MAX_PARALLEL_PORTS; i++) {
- if (parallel_hds[i]) {
- parallel_init(i, parallel_hds[i]);
- }
- }
+ /* init basic PC hardware */
+ pc_basic_device_init(isa_irq, &isa_dev, &floppy_controller, &rtc_state);
for(i = 0; i < nb_nics; i++) {
NICInfo *nd = &nd_table[i];
@@ -1243,17 +1261,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++) {
- fd[i] = drive_get(IF_FLOPPY, 0, i);
- }
- floppy_controller = fdctrl_init_isa(fd);
-
cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, hd,
floppy_controller, rtc_state);
--
1.6.5.4
- [Qemu-devel] [PATCH V9 02/20] acpi: split out apm register emulation from acpi.c, (continued)
- [Qemu-devel] [PATCH V9 02/20] acpi: split out apm register emulation from acpi.c, Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 08/20] pc: make an unnecessary global variable, pit, local., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 18/20] pc: split out piix specific part from pc.c into pc_piix.c, Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 09/20] pc: remove a global variable, floppy_controller., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 11/20] pc: introduce a function to allocate cpu irq., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 14/20] pc: split out memory allocation from pc_init1() into pc_memory_init(), Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 06/20] pc: initialize ioapic before use., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 05/20] acpi_piix4: remove unused variable in get_pmsts()., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 13/20] pc: split out cpu initialization from pc_init1() into pc_cpus_init()., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 20/20] rtc: make rtc_xxx accept/return ISADevice instead of RTCState., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 16/20] pc: split out basic device init from pc_init1() into pc_basic_device_init(),
Isaku Yamahata <=
- [Qemu-devel] [PATCH V9 04/20] acpi: split acpi.c into the common part and the piix4 part., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 01/20] acpi: split out pc smbus routines from acpi.c into pc_smbus.c, Isaku Yamahata, 2009/12/08