[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 46/63] renesas: Rename RTMR to RENESAS_TMR
From: |
Eduardo Habkost |
Subject: |
[PATCH 46/63] renesas: Rename RTMR to RENESAS_TMR |
Date: |
Wed, 2 Sep 2020 18:42:54 -0400 |
This will make the type name constant consistent with the name of
the type checking macro.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: qemu-devel@nongnu.org
---
include/hw/timer/renesas_tmr.h | 6 +++---
hw/rx/rx62n.c | 2 +-
hw/timer/renesas_tmr.c | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/hw/timer/renesas_tmr.h b/include/hw/timer/renesas_tmr.h
index caf7eec0dc..5f2f156160 100644
--- a/include/hw/timer/renesas_tmr.h
+++ b/include/hw/timer/renesas_tmr.h
@@ -13,10 +13,10 @@
#include "hw/sysbus.h"
#include "qom/object.h"
-#define TYPE_RENESAS_TMR "renesas-tmr"
+#define TYPE_RTMR "renesas-tmr"
typedef struct RTMRState RTMRState;
-DECLARE_INSTANCE_CHECKER(RTMRState, RTMR,
- TYPE_RENESAS_TMR)
+DECLARE_INSTANCE_CHECKER(RTMRState, RENESAS_TMR,
+ TYPE_RTMR)
enum timer_event {
cmia = 0,
diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c
index 6eb4eea700..0f564c4dfb 100644
--- a/hw/rx/rx62n.c
+++ b/hw/rx/rx62n.c
@@ -166,7 +166,7 @@ static void register_tmr(RX62NState *s, int unit)
int i, irqbase;
object_initialize_child(OBJECT(s), "tmr[*]",
- &s->tmr[unit], TYPE_RENESAS_TMR);
+ &s->tmr[unit], TYPE_RTMR);
tmr = SYS_BUS_DEVICE(&s->tmr[unit]);
qdev_prop_set_uint64(DEVICE(tmr), "input-freq", s->pclk_freq_hz);
sysbus_realize(tmr, &error_abort);
diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c
index 446f2eacdd..53733586c2 100644
--- a/hw/timer/renesas_tmr.c
+++ b/hw/timer/renesas_tmr.c
@@ -396,7 +396,7 @@ static void timer_event1(void *opaque)
static void rtmr_reset(DeviceState *dev)
{
- RTMRState *tmr = RTMR(dev);
+ RTMRState *tmr = RENESAS_TMR(dev);
tmr->tcr[0] = tmr->tcr[1] = 0x00;
tmr->tcsr[0] = 0x00;
tmr->tcsr[1] = 0x10;
@@ -411,7 +411,7 @@ static void rtmr_reset(DeviceState *dev)
static void rtmr_init(Object *obj)
{
SysBusDevice *d = SYS_BUS_DEVICE(obj);
- RTMRState *tmr = RTMR(obj);
+ RTMRState *tmr = RENESAS_TMR(obj);
int i;
memory_region_init_io(&tmr->memory, OBJECT(tmr), &tmr_ops,
@@ -462,7 +462,7 @@ static void rtmr_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo rtmr_info = {
- .name = TYPE_RENESAS_TMR,
+ .name = TYPE_RTMR,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(RTMRState),
.instance_init = rtmr_init,
--
2.26.2
- [PATCH 39/63] esp: Rename ESP_STATE to ESP, (continued)
- [PATCH 39/63] esp: Rename ESP_STATE to ESP, Eduardo Habkost, 2020/09/02
- [PATCH 41/63] lance: Rename SYSBUS_PCNET to LANCE, Eduardo Habkost, 2020/09/02
- [PATCH 40/63] filter-rewriter: Rename FILTER_COLO_REWRITER to FILTER_REWRITER, Eduardo Habkost, 2020/09/02
- [PATCH 42/63] lasi_i82596: Rename SYSBUS_I82596 to LASI_82596, Eduardo Habkost, 2020/09/02
- [PATCH 43/63] pvpanic: Rename ISA_PVPANIC_DEVICE to PVPANIC, Eduardo Habkost, 2020/09/02
- [PATCH 44/63] renesas: Rename RCMT to RENESAS_CMT, Eduardo Habkost, 2020/09/02
- [PATCH 46/63] renesas: Rename RTMR to RENESAS_TMR,
Eduardo Habkost <=
- [PATCH 45/63] renesas: Rename RSCI to RENESAS_SCI, Eduardo Habkost, 2020/09/02
- [PATCH 47/63] rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC, Eduardo Habkost, 2020/09/02
- [PATCH 49/63] stm32f205: Rename STM32F2XXTIMER to STM32F2XX_TIMER, Eduardo Habkost, 2020/09/02
- [PATCH 48/63] sabre: Rename SABRE_DEVICE to SABRE, Eduardo Habkost, 2020/09/02
- [PATCH 50/63] tpm_crb: Rename CRB to TPM_CRB, Eduardo Habkost, 2020/09/02