[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 34/38] hw/misc/sbsa_ec: Rename TYPE_SBSA_EC -> TYPE_SBSA_SECURE_EC
From: |
Peter Maydell |
Subject: |
[PULL 34/38] hw/misc/sbsa_ec: Rename TYPE_SBSA_EC -> TYPE_SBSA_SECURE_EC |
Date: |
Fri, 13 Jan 2023 14:11:22 +0000 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
The structure is named SECUREECState. Rename the type accordingly.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230109140306.23161-12-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/misc/sbsa_ec.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c
index 8d939fe31b1..6f19c21195a 100644
--- a/hw/misc/sbsa_ec.c
+++ b/hw/misc/sbsa_ec.c
@@ -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,
--
2.34.1
- [PULL 25/38] hw/gpio/omap_gpio: Add local variable to avoid embedded cast, (continued)
- [PULL 25/38] hw/gpio/omap_gpio: Add local variable to avoid embedded cast, Peter Maydell, 2023/01/13
- [PULL 32/38] hw/arm/bcm2836: Remove definitions generated by OBJECT_DECLARE_TYPE(), Peter Maydell, 2023/01/13
- [PULL 12/38] hw/arm/pxa2xx: Simplify pxa270_init(), Peter Maydell, 2023/01/13
- [PULL 14/38] hw/arm/collie: Simplify flash creation using for() loop, Peter Maydell, 2023/01/13
- [PULL 24/38] hw/arm/pxa: Avoid forward-declaring PXA2xxI2CState, Peter Maydell, 2023/01/13
- [PULL 17/38] hw/arm/mainstone: Use the IEC binary prefix definitions, Peter Maydell, 2023/01/13
- [PULL 22/38] hw/arm/vexpress: Remove dead code in vexpress_common_init(), Peter Maydell, 2023/01/13
- [PULL 38/38] target/arm: allow writes to SCR_EL3.HXEn bit when FEAT_HCX is enabled, Peter Maydell, 2023/01/13
- [PULL 26/38] hw/arm/omap: Drop useless casts from void * to pointer, Peter Maydell, 2023/01/13
- [PULL 33/38] hw/arm/npcm7xx: Declare QOM macros using OBJECT_DECLARE_SIMPLE_TYPE(), Peter Maydell, 2023/01/13
- [PULL 34/38] hw/misc/sbsa_ec: Rename TYPE_SBSA_EC -> TYPE_SBSA_SECURE_EC,
Peter Maydell <=
- [PULL 36/38] hw/intc/xilinx_intc: Use 'XpsIntc' typedef instead of 'struct xlx_pic', Peter Maydell, 2023/01/13
- Re: [PULL 00/38] target-arm queue, Peter Maydell, 2023/01/13