diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2017-10-17 13:44:15 -0300 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2017-12-18 17:07:02 +0300 |
| commit | acf695eca605ed18fd485af3414e78d1edf93082 (patch) | |
| tree | 771418d816da1da50f957b3108a05fe3e3aae55c /include | |
| parent | 40a3bbc93e5a75bbfc1d220b8bf9bfc33bb1b4e5 (diff) | |
| download | qemu-acf695eca605ed18fd485af3414e78d1edf93082.zip qemu-acf695eca605ed18fd485af3414e78d1edf93082.tar.gz qemu-acf695eca605ed18fd485af3414e78d1edf93082.tar.bz2 | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/timer/i8254.h | 5 | ||||
| -rw-r--r-- | include/hw/timer/i8254_internal.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h index 5adae9f..5b12eb9 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 dc09cc0..c37a438 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 */ |