mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/stellaris: Convert ADC controller to Resettable interface

Browse Source 
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20240213155214.13619-2-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-02-13 16:52:11 +01:00 committed by Peter Maydell
parent 15f6c16e6e
commit bebd89e166
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/arm/stellaris.c
View File

@ -773,8 +773,9 @@ static void stellaris_adc_trigger(void *opaque, int irq, int level)
} }
} }
static void stellaris_adc_reset(StellarisADCState *s) static void stellaris_adc_reset_hold(Object *obj)
{ {
StellarisADCState *s = STELLARIS_ADC(obj);
int n; int n;
for (n = 0; n < 4; n++) { for (n = 0; n < 4; n++) {
@ -946,7 +947,6 @@ static void stellaris_adc_init(Object *obj)
memory_region_init_io(&s->iomem, obj, &stellaris_adc_ops, s, memory_region_init_io(&s->iomem, obj, &stellaris_adc_ops, s,
"adc", 0x1000); "adc", 0x1000);
sysbus_init_mmio(sbd, &s->iomem); sysbus_init_mmio(sbd, &s->iomem);
stellaris_adc_reset(s);
qdev_init_gpio_in(dev, stellaris_adc_trigger, 1); qdev_init_gpio_in(dev, stellaris_adc_trigger, 1);
} }
@ -1411,7 +1411,9 @@ static const TypeInfo stellaris_i2c_info = {
static void stellaris_adc_class_init(ObjectClass *klass, void *data) static void stellaris_adc_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);
rc->phases.hold = stellaris_adc_reset_hold;
dc->vmsd = &vmstate_stellaris_adc; dc->vmsd = &vmstate_stellaris_adc;
} }