This will make the type name constant consistent with the name of the type checking macro.
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> --- Cc: Yoshinori Sato <ys...@users.sourceforge.jp> Cc: Magnus Damm <magnus.d...@gmail.com> Cc: "Marc-André Lureau" <marcandre.lur...@redhat.com> Cc: Paolo Bonzini <pbonz...@redhat.com> Cc: qemu-devel@nongnu.org --- include/hw/char/renesas_sci.h | 2 +- hw/char/renesas_sci.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/hw/char/renesas_sci.h b/include/hw/char/renesas_sci.h index a4764e3eee..1349d2d003 100644 --- a/include/hw/char/renesas_sci.h +++ b/include/hw/char/renesas_sci.h @@ -15,7 +15,7 @@ #define TYPE_RENESAS_SCI "renesas-sci" typedef struct RSCIState RSCIState; -DECLARE_INSTANCE_CHECKER(RSCIState, RSCI, +DECLARE_INSTANCE_CHECKER(RSCIState, RENESAS_SCI, TYPE_RENESAS_SCI) enum { diff --git a/hw/char/renesas_sci.c b/hw/char/renesas_sci.c index 5d7c6e6523..286fd28a39 100644 --- a/hw/char/renesas_sci.c +++ b/hw/char/renesas_sci.c @@ -70,7 +70,7 @@ REG8(SEMR, 7) static int can_receive(void *opaque) { - RSCIState *sci = RSCI(opaque); + RSCIState *sci = RENESAS_SCI(opaque); if (sci->rx_next > qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)) { return 0; } else { @@ -80,7 +80,7 @@ static int can_receive(void *opaque) static void receive(void *opaque, const uint8_t *buf, int size) { - RSCIState *sci = RSCI(opaque); + RSCIState *sci = RENESAS_SCI(opaque); sci->rx_next = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + sci->trtime; if (FIELD_EX8(sci->ssr, SSR, RDRF) || size > 1) { sci->ssr = FIELD_DP8(sci->ssr, SSR, ORER, 1); @@ -112,7 +112,7 @@ static void send_byte(RSCIState *sci) static void txend(void *opaque) { - RSCIState *sci = RSCI(opaque); + RSCIState *sci = RENESAS_SCI(opaque); if (!FIELD_EX8(sci->ssr, SSR, TDRE)) { send_byte(sci); } else { @@ -143,7 +143,7 @@ static bool sci_is_tr_enabled(RSCIState *sci) static void sci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) { - RSCIState *sci = RSCI(opaque); + RSCIState *sci = RENESAS_SCI(opaque); switch (offset) { case A_SMR: @@ -208,7 +208,7 @@ static void sci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) static uint64_t sci_read(void *opaque, hwaddr offset, unsigned size) { - RSCIState *sci = RSCI(opaque); + RSCIState *sci = RENESAS_SCI(opaque); switch (offset) { case A_SMR: @@ -246,7 +246,7 @@ static const MemoryRegionOps sci_ops = { static void rsci_reset(DeviceState *dev) { - RSCIState *sci = RSCI(dev); + RSCIState *sci = RENESAS_SCI(dev); sci->smr = sci->scr = 0x00; sci->brr = 0xff; sci->tdr = 0xff; @@ -259,7 +259,7 @@ static void rsci_reset(DeviceState *dev) static void sci_event(void *opaque, QEMUChrEvent event) { - RSCIState *sci = RSCI(opaque); + RSCIState *sci = RENESAS_SCI(opaque); if (event == CHR_EVENT_BREAK) { sci->ssr = FIELD_DP8(sci->ssr, SSR, FER, 1); if (FIELD_EX8(sci->scr, SCR, RIE)) { @@ -270,7 +270,7 @@ static void sci_event(void *opaque, QEMUChrEvent event) static void rsci_realize(DeviceState *dev, Error **errp) { - RSCIState *sci = RSCI(dev); + RSCIState *sci = RENESAS_SCI(dev); if (sci->input_freq == 0) { qemu_log_mask(LOG_GUEST_ERROR, @@ -284,7 +284,7 @@ static void rsci_realize(DeviceState *dev, Error **errp) static void rsci_init(Object *obj) { SysBusDevice *d = SYS_BUS_DEVICE(obj); - RSCIState *sci = RSCI(obj); + RSCIState *sci = RENESAS_SCI(obj); int i; memory_region_init_io(&sci->memory, OBJECT(sci), &sci_ops, -- 2.26.2