ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i.MX: Fix Coding style for AVIC emulator. 

Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Message-id: 01e1d9026220992405819f25640ebd5bb843fc93.1437080501.git.jcd@tribudubois.net
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Jean-Christophe Dubois 2015-08-13 11:26:20 +01:00 committed by Peter Maydell
parent f250c6a751
commit dbeedce78e
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/intc/imx_avic.c
View File

@ -22,7 +22,7 @@
#ifdef DEBUG_INT #ifdef DEBUG_INT
#define DPRINTF(fmt, args...) \ #define DPRINTF(fmt, args...) \
do { printf("imx_avic: " fmt , ##args); } while (0) do { printf("%s: " fmt , TYPE_IMX_AVIC, ##args); } while (0)
#else #else
#define DPRINTF(fmt, args...) do {} while (0) #define DPRINTF(fmt, args...) do {} while (0)
#endif #endif
@ -34,13 +34,13 @@ do { printf("imx_avic: " fmt , ##args); } while (0)
#define DEBUG_IMPLEMENTATION 1 #define DEBUG_IMPLEMENTATION 1
#if DEBUG_IMPLEMENTATION #if DEBUG_IMPLEMENTATION
# define IPRINTF(fmt, args...) \ # 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 #else
# define IPRINTF(fmt, args...) do {} while (0) # define IPRINTF(fmt, args...) do {} while (0)
#endif #endif
static const VMStateDescription vmstate_imx_avic = { static const VMStateDescription vmstate_imx_avic = {
.name = "imx-avic", .name = TYPE_IMX_AVIC,
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
@ -54,8 +54,6 @@ static const VMStateDescription vmstate_imx_avic = {
}, },
}; };
static inline int imx_avic_prio(IMXAVICState *s, int irq) static inline int imx_avic_prio(IMXAVICState *s, int irq)
{ {
uint32_t word = irq / PRIO_PER_WORD; uint32_t word = irq / PRIO_PER_WORD;
@ -215,7 +213,7 @@ static uint64_t imx_avic_read(void *opaque,
return 0x4; return 0x4;
default: default:
IPRINTF("imx_avic_read: Bad offset 0x%x\n", (int)offset); IPRINTF("%s: Bad offset 0x%x\n", __func__, (int)offset);
return 0; return 0;
} }
} }
@ -227,12 +225,12 @@ static void imx_avic_write(void *opaque, hwaddr offset,
/* Vector Registers not yet supported */ /* Vector Registers not yet supported */
if (offset >= 0x100 && offset <= 0x2fc) { 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)); (unsigned int)((offset - 0x100) >> 2));
return; return;
} }
DPRINTF("imx_avic_write(0x%x) = %x\n", DPRINTF("%s(0x%x) = %x\n", __func__,
(unsigned int)offset>>2, (unsigned int)val); (unsigned int)offset>>2, (unsigned int)val);
switch (offset >> 2) { switch (offset >> 2) {
case 0: /* Interrupt Control Register, INTCNTL */ case 0: /* Interrupt Control Register, INTCNTL */
@ -307,7 +305,7 @@ static void imx_avic_write(void *opaque, hwaddr offset,
return; return;
default: default:
IPRINTF("imx_avic_write: Bad offset %x\n", (int)offset); IPRINTF("%s: Bad offset %x\n", __func__, (int)offset);
} }
imx_avic_update(s); imx_avic_update(s);
} }