@@ -15,13 +15,14 @@
#include "hw/sysbus.h"
#include "sysemu/runstate.h"
-typedef struct {
+typedef struct SECUREECState {
SysBusDevice parent_obj;
MemoryRegion iomem;
} SECUREECState;
-#define TYPE_SBSA_EC "sbsa-ec"
-#define SECURE_EC(obj) OBJECT_CHECK(SECUREECState, (obj), TYPE_SBSA_EC)
+#define TYPE_SBSA_SECURE_EC "sbsa-ec"
+#define SBSA_SECURE_EC(obj) \
+ OBJECT_CHECK(SECUREECState, (obj), TYPE_SBSA_SECURE_EC)
enum sbsa_ec_powerstates {
SBSA_EC_CMD_POWEROFF = 0x01,
@@ -36,7 +37,7 @@ static uint64_t sbsa_ec_read(void *opaque, hwaddr offset, unsigned size)
}
static void sbsa_ec_write(void *opaque, hwaddr offset,
- uint64_t value, unsigned size)
+ uint64_t value, unsigned size)
{
if (offset == 0) { /* PSCI machine power command register */
switch (value) {
@@ -65,7 +66,7 @@ static const MemoryRegionOps sbsa_ec_ops = {
static void sbsa_ec_init(Object *obj)
{
- SECUREECState *s = SECURE_EC(obj);
+ SECUREECState *s = SBSA_SECURE_EC(obj);
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
memory_region_init_io(&s->iomem, obj, &sbsa_ec_ops, s, "sbsa-ec",
@@ -82,7 +83,7 @@ static void sbsa_ec_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo sbsa_ec_info = {
- .name = TYPE_SBSA_EC,
+ .name = TYPE_SBSA_SECURE_EC,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(SECUREECState),
.instance_init = sbsa_ec_init,
The structure is named SECUREECState. Rename the type accordingly. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/misc/sbsa_ec.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)