[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 50/61] hw/timer/i8254: rename pit_init() -> i8254_pit
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 50/61] hw/timer/i8254: rename pit_init() -> i8254_pit_init() |
Date: |
Mon, 18 Dec 2017 00:27:55 +0300 |
From: Philippe Mathieu-Daudé <address@hidden>
and remove the old i386/pc dependency
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Hervé Poussineau <address@hidden>
---
hw/alpha/dp264.c | 2 +-
hw/i386/pc.c | 2 +-
hw/isa/i82378.c | 2 +-
hw/mips/mips_fulong2e.c | 2 +-
hw/mips/mips_jazz.c | 2 +-
hw/mips/mips_malta.c | 2 +-
hw/mips/mips_r4k.c | 2 +-
hw/timer/i8254.c | 1 -
hw/timer/i8254_common.c | 1 -
include/hw/timer/i8254.h | 5 +++--
include/hw/timer/i8254_internal.h | 2 +-
11 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index babd6ea514..887a7401f1 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -80,7 +80,7 @@ static void clipper_init(MachineState *machine)
/* Since we have an SRM-compatible PALcode, use the SRM epoch. */
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");
/* VGA setup. Don't bother loading the bios. */
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 186545d2a4..6a6041573f 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1573,7 +1573,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
if (kvm_pit_in_kernel()) {
pit = kvm_pit_init(isa_bus, 0x40);
} 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) {
/* connect PIT to output control line of the HPET */
diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c
index d20ea4c2ee..a9c15f858d 100644
--- a/hw/isa/i82378.c
+++ b/hw/isa/i82378.c
@@ -97,7 +97,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp)
isa_bus_irqs(isabus, s->i8259);
/* 1 82C54 (pit) */
- isa = pit_init(isabus, 0x40, 0, NULL);
+ isa = i8254_pit_init(isabus, 0x40, 0, NULL);
/* speaker */
pcspk_init(isabus, isa);
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 146cf0fccd..2a2a09c9de 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -359,7 +359,7 @@ static void mips_fulong2e_init(MachineState *machine)
smbus_eeprom_init(smbus, 1, eeprom_spd, sizeof(eeprom_spd));
/* 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);
/* Super I/O */
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index fe4f17389f..995419344d 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -218,7 +218,7 @@ static void mips_jazz_init(MachineState *machine,
i8259 = i8259_init(isa_bus, env->irq[4]);
isa_bus_irqs(isa_bus, i8259);
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);
/* Video card */
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index ec6af4a277..88b4733743 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1208,7 +1208,7 @@ void mips_malta_init(MachineState *machine)
isa_get_irq(NULL, 9), NULL, 0, NULL);
smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);
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);
/* Super I/O */
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index 3bbb1827e1..58d7bac18b 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -272,7 +272,7 @@ void mips_r4k_init(MachineState *machine)
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);
diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c
index 5e61ad50a8..dbc4a0baec 100644
--- a/hw/timer/i8254.c
+++ b/hw/timer/i8254.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
-#include "hw/i386/pc.h"
#include "hw/isa/isa.h"
#include "qemu/timer.h"
#include "hw/timer/i8254.h"
diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c
index b623c96198..6190b6fc5d 100644
--- a/hw/timer/i8254_common.c
+++ b/hw/timer/i8254_common.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
-#include "hw/i386/pc.h"
#include "hw/isa/isa.h"
#include "qemu/timer.h"
#include "hw/timer/i8254.h"
diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h
index 5adae9fa44..5b12eb918e 100644
--- a/include/hw/timer/i8254.h
+++ b/include/hw/timer/i8254.h
@@ -26,6 +26,7 @@
#define HW_I8254_H
#include "hw/hw.h"
+#include "hw/qdev.h"
#include "hw/isa/isa.h"
#define PIT_FREQ 1193182
@@ -48,8 +49,8 @@ typedef struct PITChannelInfo {
#define TYPE_I8254 "isa-pit"
#define TYPE_KVM_I8254 "kvm-pit"
-static inline ISADevice *pit_init(ISABus *bus, int base, int isa_irq,
- qemu_irq alt_irq)
+static inline ISADevice *i8254_pit_init(ISABus *bus, int base, int isa_irq,
+ qemu_irq alt_irq)
{
DeviceState *dev;
ISADevice *d;
diff --git a/include/hw/timer/i8254_internal.h
b/include/hw/timer/i8254_internal.h
index dc09cc0467..c37a438f82 100644
--- a/include/hw/timer/i8254_internal.h
+++ b/include/hw/timer/i8254_internal.h
@@ -26,8 +26,8 @@
#define QEMU_I8254_INTERNAL_H
#include "hw/hw.h"
-#include "hw/i386/pc.h"
#include "hw/isa/isa.h"
+#include "qemu/timer.h"
typedef struct PITChannelState {
int count; /* can be 65536 */
--
2.11.0
- [Qemu-devel] [PULL 51/61] hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init(), (continued)
- [Qemu-devel] [PULL 51/61] hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init(), Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 38/61] numa: remove unused #include, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 46/61] hw/i2c: remove old i386 dependency, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 12/61] build: fix typo in error message, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 18/61] hw/registerfields: add missing include, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 19/61] hw/input/hid: Add support for several keys., Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 37/61] misc: avoid "include/" in include path, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 31/61] misc: remove headers implicitly included, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 22/61] MAINTAINERS: add an entry for the i8257 (DMA controller), Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 16/61] hw/registerfields: fix a typo in the FIELD() documentation, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 50/61] hw/timer/i8254: rename pit_init() -> i8254_pit_init(),
Michael Tokarev <=
- [Qemu-devel] [PULL 20/61] MAINTAINERS: add entries for i2c/ppc4xx, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 24/61] MAINTAINERS: add an entry for watchdog/wdt_ib700, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 60/61] i386/pc: move vmmouse.c to hw/i386/, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 29/61] hw: remove "qemu/osdep.h" from header files, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 45/61] hw/ipmi: remove old i386 dependency, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 27/61] MAINTAINERS: add missing entry for include/hw/net/, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 53/61] hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 09/61] memory: remove unused memory_region_set_global_locking(), Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 42/61] amd_iommu: avoid needless includes in header file, Michael Tokarev, 2017/12/17
- [Qemu-devel] [PULL 54/61] hw/display/vga: "vga.h" only contains registers defs, rename it "vga_regs.h", Michael Tokarev, 2017/12/17