motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

i8254: convert to qdev

Browse source 
Convert to qdev. Don't expose PITState.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2011-02-13 19:54:40 +00:00
parent c74b88dffc
commit 64d7e9a421
9 changed files with 75 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

61
hw/i8254.c
View file

@ -53,9 +53,12 @@ typedef struct PITChannelState {
qemu_irq irq;
} PITChannelState;
struct PITState {
typedef struct PITState {
ISADevice dev;
uint32_t irq;
uint32_t iobase;
PITChannelState channels[3];
};
} PITState;
static PITState pit_state;
@ -119,8 +122,9 @@ static int pit_get_out1(PITChannelState *s, int64_t current_time)
return out;
}
int pit_get_out(PITState *pit, int channel, int64_t current_time)
int pit_get_out(ISADevice *dev, int channel, int64_t current_time)
{
PITState *pit = DO_UPCAST(PITState, dev, dev);
PITChannelState *s = &pit->channels[channel];
return pit_get_out1(s, current_time);
}
@ -179,8 +183,9 @@ static int64_t pit_get_next_transition_time(PITChannelState *s,
}
/* val must be 0 or 1 */
void pit_set_gate(PITState *pit, int channel, int val)
void pit_set_gate(ISADevice *dev, int channel, int val)
{
PITState *pit = DO_UPCAST(PITState, dev, dev);
PITChannelState *s = &pit->channels[channel];
switch(s->mode) {
@ -210,20 +215,23 @@ void pit_set_gate(PITState *pit, int channel, int val)
s->gate = val;
}
int pit_get_gate(PITState *pit, int channel)
int pit_get_gate(ISADevice *dev, int channel)
{
PITState *pit = DO_UPCAST(PITState, dev, dev);
PITChannelState *s = &pit->channels[channel];
return s->gate;
}
int pit_get_initial_count(PITState *pit, int channel)
int pit_get_initial_count(ISADevice *dev, int channel)
{
PITState *pit = DO_UPCAST(PITState, dev, dev);
PITChannelState *s = &pit->channels[channel];
return s->count;
}
int pit_get_mode(PITState *pit, int channel)
int pit_get_mode(ISADevice *dev, int channel)
{
PITState *pit = DO_UPCAST(PITState, dev, dev);
PITChannelState *s = &pit->channels[channel];
return s->mode;
}
@ -462,9 +470,9 @@ static const VMStateDescription vmstate_pit = {
}
};
static void pit_reset(void *opaque)
static void pit_reset(DeviceState *dev)
{
PITState *pit = opaque;
PITState *pit = container_of(dev, PITState, dev.qdev);
PITChannelState *s;
int i;
@ -498,20 +506,39 @@ void hpet_pit_enable(void)
pit_load_count(s, 0);
}
PITState *pit_init(int base, qemu_irq irq)
static int pit_initfn(ISADevice *dev)
{
PITState *pit = &pit_state;
PITState *pit = DO_UPCAST(PITState, dev, dev);
PITChannelState *s;
s = &pit->channels[0];
/* the timer 0 is connected to an IRQ */
s->irq_timer = qemu_new_timer(vm_clock, pit_irq_timer, s);
s->irq = irq;
s->irq = isa_reserve_irq(pit->irq);
vmstate_register(NULL, base, &vmstate_pit, pit);
qemu_register_reset(pit_reset, pit);
register_ioport_write(base, 4, 1, pit_ioport_write, pit);
register_ioport_read(base, 3, 1, pit_ioport_read, pit);
register_ioport_write(pit->iobase, 4, 1, pit_ioport_write, pit);
register_ioport_read(pit->iobase, 3, 1, pit_ioport_read, pit);
isa_init_ioport(dev, pit->iobase);
return pit;
return 0;
}
static ISADeviceInfo pit_info = {
.qdev.name = "isa-pit",
.qdev.size = sizeof(PITState),
.qdev.vmsd = &vmstate_pit,
.qdev.reset = pit_reset,
.qdev.no_user = 1,
.init = pit_initfn,
.qdev.props = (Property[]) {
DEFINE_PROP_UINT32("irq", PITState, irq, -1),
DEFINE_PROP_HEX32("iobase", PITState, iobase, -1),
DEFINE_PROP_END_OF_LIST(),
},
};
static void pit_register(void)
{
isa_qdev_register(&pit_info);
}
device_init(pit_register)