Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-08 08:05:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

i8254: Move PITCommonState/PITCommonClass typedefs to i8254.h

Browse Source 
Move typedef closer to the type check macros, to make it easier
to convert the code to OBJECT_DEFINE_TYPE() in the future.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-By: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200825192110.3528606-19-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2020-08-25 15:20:14 -04:00
parent 616bbde342
commit cc963dcd72
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/hw/timer/i8254.h
View File

@ -39,6 +39,8 @@ typedef struct PITChannelInfo {
} PITChannelInfo; } PITChannelInfo;
#define TYPE_PIT_COMMON "pit-common" #define TYPE_PIT_COMMON "pit-common"
typedef struct PITCommonState PITCommonState;
typedef struct PITCommonClass PITCommonClass;
#define PIT_COMMON(obj) \ #define PIT_COMMON(obj) \
OBJECT_CHECK(PITCommonState, (obj), TYPE_PIT_COMMON) OBJECT_CHECK(PITCommonState, (obj), TYPE_PIT_COMMON)
#define PIT_COMMON_CLASS(klass) \ #define PIT_COMMON_CLASS(klass) \

8
include/hw/timer/i8254_internal.h
View File

@ -50,14 +50,14 @@ typedef struct PITChannelState {
uint32_t irq_disabled; uint32_t irq_disabled;
} PITChannelState; } PITChannelState;
typedef struct PITCommonState { struct PITCommonState {
ISADevice dev; ISADevice dev;
MemoryRegion ioports; MemoryRegion ioports;
uint32_t iobase; uint32_t iobase;
PITChannelState channels[3]; PITChannelState channels[3];
} PITCommonState; };
typedef struct PITCommonClass { struct PITCommonClass {
ISADeviceClass parent_class; ISADeviceClass parent_class;
void (*set_channel_gate)(PITCommonState *s, PITChannelState *sc, int val); void (*set_channel_gate)(PITCommonState *s, PITChannelState *sc, int val);
@ -65,7 +65,7 @@ typedef struct PITCommonClass {
PITChannelInfo *info); PITChannelInfo *info);
void (*pre_save)(PITCommonState *s); void (*pre_save)(PITCommonState *s);
void (*post_load)(PITCommonState *s); void (*post_load)(PITCommonState *s);
} PITCommonClass; };
int pit_get_out(PITChannelState *s, int64_t current_time); int pit_get_out(PITChannelState *s, int64_t current_time);
int64_t pit_get_next_transition_time(PITChannelState *s, int64_t current_time); int64_t pit_get_next_transition_time(PITChannelState *s, int64_t current_time);