hw/timer/i8254: rename pit_init() -> i8254_pit_init()
and remove the old i386/pc dependency Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Hervé Poussineau <hpoussin@reactos.org> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
parent
40a3bbc93e
commit
acf695eca6
|
@ -80,7 +80,7 @@ static void clipper_init(MachineState *machine)
|
||||||
/* Since we have an SRM-compatible PALcode, use the SRM epoch. */
|
/* Since we have an SRM-compatible PALcode, use the SRM epoch. */
|
||||||
rtc_init(isa_bus, 1900, rtc_irq);
|
rtc_init(isa_bus, 1900, rtc_irq);
|
||||||
|
|
||||||
pit_init(isa_bus, 0x40, 0, NULL);
|
i8254_pit_init(isa_bus, 0x40, 0, NULL);
|
||||||
isa_create_simple(isa_bus, "i8042");
|
isa_create_simple(isa_bus, "i8042");
|
||||||
|
|
||||||
/* VGA setup. Don't bother loading the bios. */
|
/* VGA setup. Don't bother loading the bios. */
|
||||||
|
|
|
@ -1573,7 +1573,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
|
||||||
if (kvm_pit_in_kernel()) {
|
if (kvm_pit_in_kernel()) {
|
||||||
pit = kvm_pit_init(isa_bus, 0x40);
|
pit = kvm_pit_init(isa_bus, 0x40);
|
||||||
} else {
|
} else {
|
||||||
pit = pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq);
|
pit = i8254_pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq);
|
||||||
}
|
}
|
||||||
if (hpet) {
|
if (hpet) {
|
||||||
/* connect PIT to output control line of the HPET */
|
/* connect PIT to output control line of the HPET */
|
||||||
|
|
|
@ -97,7 +97,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp)
|
||||||
isa_bus_irqs(isabus, s->i8259);
|
isa_bus_irqs(isabus, s->i8259);
|
||||||
|
|
||||||
/* 1 82C54 (pit) */
|
/* 1 82C54 (pit) */
|
||||||
isa = pit_init(isabus, 0x40, 0, NULL);
|
isa = i8254_pit_init(isabus, 0x40, 0, NULL);
|
||||||
|
|
||||||
/* speaker */
|
/* speaker */
|
||||||
pcspk_init(isabus, isa);
|
pcspk_init(isabus, isa);
|
||||||
|
|
|
@ -359,7 +359,7 @@ static void mips_fulong2e_init(MachineState *machine)
|
||||||
smbus_eeprom_init(smbus, 1, eeprom_spd, sizeof(eeprom_spd));
|
smbus_eeprom_init(smbus, 1, eeprom_spd, sizeof(eeprom_spd));
|
||||||
|
|
||||||
/* init other devices */
|
/* init other devices */
|
||||||
pit = pit_init(isa_bus, 0x40, 0, NULL);
|
pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
|
||||||
DMA_init(isa_bus, 0);
|
DMA_init(isa_bus, 0);
|
||||||
|
|
||||||
/* Super I/O */
|
/* Super I/O */
|
||||||
|
|
|
@ -218,7 +218,7 @@ static void mips_jazz_init(MachineState *machine,
|
||||||
i8259 = i8259_init(isa_bus, env->irq[4]);
|
i8259 = i8259_init(isa_bus, env->irq[4]);
|
||||||
isa_bus_irqs(isa_bus, i8259);
|
isa_bus_irqs(isa_bus, i8259);
|
||||||
DMA_init(isa_bus, 0);
|
DMA_init(isa_bus, 0);
|
||||||
pit = pit_init(isa_bus, 0x40, 0, NULL);
|
pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
|
||||||
pcspk_init(isa_bus, pit);
|
pcspk_init(isa_bus, pit);
|
||||||
|
|
||||||
/* Video card */
|
/* Video card */
|
||||||
|
|
|
@ -1208,7 +1208,7 @@ void mips_malta_init(MachineState *machine)
|
||||||
isa_get_irq(NULL, 9), NULL, 0, NULL);
|
isa_get_irq(NULL, 9), NULL, 0, NULL);
|
||||||
smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);
|
smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);
|
||||||
g_free(smbus_eeprom_buf);
|
g_free(smbus_eeprom_buf);
|
||||||
pit = pit_init(isa_bus, 0x40, 0, NULL);
|
pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
|
||||||
DMA_init(isa_bus, 0);
|
DMA_init(isa_bus, 0);
|
||||||
|
|
||||||
/* Super I/O */
|
/* Super I/O */
|
||||||
|
|
|
@ -272,7 +272,7 @@ void mips_r4k_init(MachineState *machine)
|
||||||
|
|
||||||
rtc_init(isa_bus, 2000, NULL);
|
rtc_init(isa_bus, 2000, NULL);
|
||||||
|
|
||||||
pit = pit_init(isa_bus, 0x40, 0, NULL);
|
pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
|
||||||
|
|
||||||
serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);
|
serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
*/
|
*/
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "hw/i386/pc.h"
|
|
||||||
#include "hw/isa/isa.h"
|
#include "hw/isa/isa.h"
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#include "hw/timer/i8254.h"
|
#include "hw/timer/i8254.h"
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
*/
|
*/
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "hw/i386/pc.h"
|
|
||||||
#include "hw/isa/isa.h"
|
#include "hw/isa/isa.h"
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#include "hw/timer/i8254.h"
|
#include "hw/timer/i8254.h"
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#define HW_I8254_H
|
#define HW_I8254_H
|
||||||
|
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
|
#include "hw/qdev.h"
|
||||||
#include "hw/isa/isa.h"
|
#include "hw/isa/isa.h"
|
||||||
|
|
||||||
#define PIT_FREQ 1193182
|
#define PIT_FREQ 1193182
|
||||||
|
@ -48,7 +49,7 @@ typedef struct PITChannelInfo {
|
||||||
#define TYPE_I8254 "isa-pit"
|
#define TYPE_I8254 "isa-pit"
|
||||||
#define TYPE_KVM_I8254 "kvm-pit"
|
#define TYPE_KVM_I8254 "kvm-pit"
|
||||||
|
|
||||||
static inline ISADevice *pit_init(ISABus *bus, int base, int isa_irq,
|
static inline ISADevice *i8254_pit_init(ISABus *bus, int base, int isa_irq,
|
||||||
qemu_irq alt_irq)
|
qemu_irq alt_irq)
|
||||||
{
|
{
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
|
|
|
@ -26,8 +26,8 @@
|
||||||
#define QEMU_I8254_INTERNAL_H
|
#define QEMU_I8254_INTERNAL_H
|
||||||
|
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "hw/i386/pc.h"
|
|
||||||
#include "hw/isa/isa.h"
|
#include "hw/isa/isa.h"
|
||||||
|
#include "qemu/timer.h"
|
||||||
|
|
||||||
typedef struct PITChannelState {
|
typedef struct PITChannelState {
|
||||||
int count; /* can be 65536 */
|
int count; /* can be 65536 */
|
||||||
|
|
Loading…
Reference in a new issue