| Message ID | a20e14cd76c0080c7741c0f304767a426e729932.1436563183.git.jcd@tribudubois.net |
|---|---|
| State | New |
| Headers | show |
On Fri, Jul 10, 2015 at 4:31 PM, Jean-Christophe Dubois <jcd@tribudubois.net> wrote: > Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net> Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> > --- > > Changes since v1: > * not present on v1 > > Changes since v2: > * not present on v2 > > Changes since v3: > * not present on v3 > > Changes since v4: > * not present on v4 > > Changes since v5: > * not present on v5 > > Changes since v6: > * not present on v6 > > Changes since v7: > * not present on v7 > > Changes since v8: > * improve log > * Do style cleaning > > Changes since v9: > * Change patch title. > > Changes since v10: > * no change. > > Changes since v11: > * no change. > > hw/intc/imx_avic.c | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/hw/intc/imx_avic.c b/hw/intc/imx_avic.c > index c5eecb5..96c376b 100644 > --- a/hw/intc/imx_avic.c > +++ b/hw/intc/imx_avic.c > @@ -22,7 +22,7 @@ > > #ifdef DEBUG_INT > #define DPRINTF(fmt, args...) \ > -do { printf("imx_avic: " fmt , ##args); } while (0) > +do { printf("%s: " fmt , TYPE_IMX_AVIC, ##args); } while (0) > #else > #define DPRINTF(fmt, args...) do {} while (0) > #endif > @@ -34,13 +34,13 @@ do { printf("imx_avic: " fmt , ##args); } while (0) > #define DEBUG_IMPLEMENTATION 1 > #if DEBUG_IMPLEMENTATION > # define IPRINTF(fmt, args...) \ > - do { fprintf(stderr, "imx_avic: " fmt, ##args); } while (0) > + do { fprintf(stderr, "%s: " fmt, TYPE_IMX_AVIC, ##args); } while (0) > #else > # define IPRINTF(fmt, args...) do {} while (0) > #endif > > static const VMStateDescription vmstate_imx_avic = { > - .name = "imx-avic", > + .name = TYPE_IMX_AVIC, > .version_id = 1, > .minimum_version_id = 1, > .fields = (VMStateField[]) { > @@ -54,8 +54,6 @@ static const VMStateDescription vmstate_imx_avic = { > }, > }; > > - > - > static inline int imx_avic_prio(IMXAVICState *s, int irq) > { > uint32_t word = irq / PRIO_PER_WORD; > @@ -215,7 +213,7 @@ static uint64_t imx_avic_read(void *opaque, > return 0x4; > > default: > - IPRINTF("imx_avic_read: Bad offset 0x%x\n", (int)offset); > + IPRINTF("%s: Bad offset 0x%x\n", __func__, (int)offset); > return 0; > } > } > @@ -227,12 +225,12 @@ static void imx_avic_write(void *opaque, hwaddr offset, > > /* Vector Registers not yet supported */ > if (offset >= 0x100 && offset <= 0x2fc) { > - IPRINTF("imx_avic_write to vector register %d ignored\n", > + IPRINTF("%s to vector register %d ignored\n", __func__, > (unsigned int)((offset - 0x100) >> 2)); > return; > } > > - DPRINTF("imx_avic_write(0x%x) = %x\n", > + DPRINTF("%s(0x%x) = %x\n", __func__, > (unsigned int)offset>>2, (unsigned int)val); > switch (offset >> 2) { > case 0: /* Interrupt Control Register, INTCNTL */ > @@ -307,7 +305,7 @@ static void imx_avic_write(void *opaque, hwaddr offset, > return; > > default: > - IPRINTF("imx_avic_write: Bad offset %x\n", (int)offset); > + IPRINTF("%s: Bad offset %x\n", __func__, (int)offset); > } > imx_avic_update(s); > } > -- > 2.1.4 > >
diff --git a/hw/intc/imx_avic.c b/hw/intc/imx_avic.c index c5eecb5..96c376b 100644 --- a/hw/intc/imx_avic.c +++ b/hw/intc/imx_avic.c @@ -22,7 +22,7 @@ #ifdef DEBUG_INT #define DPRINTF(fmt, args...) \ -do { printf("imx_avic: " fmt , ##args); } while (0) +do { printf("%s: " fmt , TYPE_IMX_AVIC, ##args); } while (0) #else #define DPRINTF(fmt, args...) do {} while (0) #endif @@ -34,13 +34,13 @@ do { printf("imx_avic: " fmt , ##args); } while (0) #define DEBUG_IMPLEMENTATION 1 #if DEBUG_IMPLEMENTATION # define IPRINTF(fmt, args...) \ - do { fprintf(stderr, "imx_avic: " fmt, ##args); } while (0) + do { fprintf(stderr, "%s: " fmt, TYPE_IMX_AVIC, ##args); } while (0) #else # define IPRINTF(fmt, args...) do {} while (0) #endif static const VMStateDescription vmstate_imx_avic = { - .name = "imx-avic", + .name = TYPE_IMX_AVIC, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -54,8 +54,6 @@ static const VMStateDescription vmstate_imx_avic = { }, }; - - static inline int imx_avic_prio(IMXAVICState *s, int irq) { uint32_t word = irq / PRIO_PER_WORD; @@ -215,7 +213,7 @@ static uint64_t imx_avic_read(void *opaque, return 0x4; default: - IPRINTF("imx_avic_read: Bad offset 0x%x\n", (int)offset); + IPRINTF("%s: Bad offset 0x%x\n", __func__, (int)offset); return 0; } } @@ -227,12 +225,12 @@ static void imx_avic_write(void *opaque, hwaddr offset, /* Vector Registers not yet supported */ if (offset >= 0x100 && offset <= 0x2fc) { - IPRINTF("imx_avic_write to vector register %d ignored\n", + IPRINTF("%s to vector register %d ignored\n", __func__, (unsigned int)((offset - 0x100) >> 2)); return; } - DPRINTF("imx_avic_write(0x%x) = %x\n", + DPRINTF("%s(0x%x) = %x\n", __func__, (unsigned int)offset>>2, (unsigned int)val); switch (offset >> 2) { case 0: /* Interrupt Control Register, INTCNTL */ @@ -307,7 +305,7 @@ static void imx_avic_write(void *opaque, hwaddr offset, return; default: - IPRINTF("imx_avic_write: Bad offset %x\n", (int)offset); + IPRINTF("%s: Bad offset %x\n", __func__, (int)offset); } imx_avic_update(s); }
Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net> --- Changes since v1: * not present on v1 Changes since v2: * not present on v2 Changes since v3: * not present on v3 Changes since v4: * not present on v4 Changes since v5: * not present on v5 Changes since v6: * not present on v6 Changes since v7: * not present on v7 Changes since v8: * improve log * Do style cleaning Changes since v9: * Change patch title. Changes since v10: * no change. Changes since v11: * no change. hw/intc/imx_avic.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)