778a2dc592
The previous commit enables conversion of
foo(..., &err);
if (err) {
...
}
to
if (!foo(..., errp)) {
...
}
for QOM functions that now return true / false on success / error.
Coccinelle script:
@@
identifier fun = {
object_apply_global_props, object_initialize_child_with_props,
object_initialize_child_with_propsv, object_property_get,
object_property_get_bool, object_property_parse, object_property_set,
object_property_set_bool, object_property_set_int,
object_property_set_link, object_property_set_qobject,
object_property_set_str, object_property_set_uint, object_set_props,
object_set_propv, user_creatable_add_dict,
user_creatable_complete, user_creatable_del
};
expression list args, args2;
typedef Error;
Error *err;
@@
- fun(args, &err, args2);
- if (err)
+ if (!fun(args, &err, args2))
{
...
}
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Line breaks tidied up manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-29-armbru@redhat.com>
113 lines
3.1 KiB
C
113 lines
3.1 KiB
C
/*
|
|
* QEMU model of the Canon DIGIC SoC.
|
|
*
|
|
* Copyright (C) 2013 Antony Pavlov <antonynpavlov@gmail.com>
|
|
*
|
|
* This model is based on reverse engineering efforts
|
|
* made by CHDK (http://chdk.wikia.com) and
|
|
* Magic Lantern (http://www.magiclantern.fm) projects
|
|
* contributors.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "hw/arm/digic.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "sysemu/sysemu.h"
|
|
|
|
#define DIGIC4_TIMER_BASE(n) (0xc0210000 + (n) * 0x100)
|
|
|
|
#define DIGIC_UART_BASE 0xc0800000
|
|
|
|
static void digic_init(Object *obj)
|
|
{
|
|
DigicState *s = DIGIC(obj);
|
|
int i;
|
|
|
|
object_initialize_child(obj, "cpu", &s->cpu, ARM_CPU_TYPE_NAME("arm946"));
|
|
|
|
for (i = 0; i < DIGIC4_NB_TIMERS; i++) {
|
|
#define DIGIC_TIMER_NAME_MLEN 11
|
|
char name[DIGIC_TIMER_NAME_MLEN];
|
|
|
|
snprintf(name, DIGIC_TIMER_NAME_MLEN, "timer[%d]", i);
|
|
object_initialize_child(obj, name, &s->timer[i], TYPE_DIGIC_TIMER);
|
|
}
|
|
|
|
object_initialize_child(obj, "uart", &s->uart, TYPE_DIGIC_UART);
|
|
}
|
|
|
|
static void digic_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
DigicState *s = DIGIC(dev);
|
|
Error *err = NULL;
|
|
SysBusDevice *sbd;
|
|
int i;
|
|
|
|
if (!object_property_set_bool(OBJECT(&s->cpu), "reset-hivecs", true,
|
|
&err)) {
|
|
error_propagate(errp, err);
|
|
return;
|
|
}
|
|
|
|
if (!qdev_realize(DEVICE(&s->cpu), NULL, &err)) {
|
|
error_propagate(errp, err);
|
|
return;
|
|
}
|
|
|
|
for (i = 0; i < DIGIC4_NB_TIMERS; i++) {
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->timer[i]), &err)) {
|
|
error_propagate(errp, err);
|
|
return;
|
|
}
|
|
|
|
sbd = SYS_BUS_DEVICE(&s->timer[i]);
|
|
sysbus_mmio_map(sbd, 0, DIGIC4_TIMER_BASE(i));
|
|
}
|
|
|
|
qdev_prop_set_chr(DEVICE(&s->uart), "chardev", serial_hd(0));
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->uart), &err)) {
|
|
error_propagate(errp, err);
|
|
return;
|
|
}
|
|
|
|
sbd = SYS_BUS_DEVICE(&s->uart);
|
|
sysbus_mmio_map(sbd, 0, DIGIC_UART_BASE);
|
|
}
|
|
|
|
static void digic_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
dc->realize = digic_realize;
|
|
/* Reason: Uses serial_hds in the realize function --> not usable twice */
|
|
dc->user_creatable = false;
|
|
}
|
|
|
|
static const TypeInfo digic_type_info = {
|
|
.name = TYPE_DIGIC,
|
|
.parent = TYPE_DEVICE,
|
|
.instance_size = sizeof(DigicState),
|
|
.instance_init = digic_init,
|
|
.class_init = digic_class_init,
|
|
};
|
|
|
|
static void digic_register_types(void)
|
|
{
|
|
type_register_static(&digic_type_info);
|
|
}
|
|
|
|
type_init(digic_register_types)
|