mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/stellaris: Use CamelCase for STELLARIS_ADC type name

Browse Source 
Following docs/devel/style.rst guidelines, rename
stellaris_adc_state -> StellarisADCState. This also remove a
use of 'struct' in the DECLARE_INSTANCE_CHECKER() macro call.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230109140306.23161-9-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-01-09 15:03:00 +01:00 committed by Peter Maydell
parent 66f02065b7
commit d6b109daee
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
hw/arm/stellaris.c
View File

@ -674,9 +674,8 @@ static void stellaris_i2c_init(Object *obj)
#define STELLARIS_ADC_FIFO_FULL 0x1000 #define STELLARIS_ADC_FIFO_FULL 0x1000
#define TYPE_STELLARIS_ADC "stellaris-adc" #define TYPE_STELLARIS_ADC "stellaris-adc"
typedef struct StellarisADCState stellaris_adc_state; typedef struct StellarisADCState StellarisADCState;
DECLARE_INSTANCE_CHECKER(stellaris_adc_state, STELLARIS_ADC, DECLARE_INSTANCE_CHECKER(StellarisADCState, STELLARIS_ADC, TYPE_STELLARIS_ADC)
TYPE_STELLARIS_ADC)
struct StellarisADCState { struct StellarisADCState {
SysBusDevice parent_obj; SysBusDevice parent_obj;
@ -700,7 +699,7 @@ struct StellarisADCState {
qemu_irq irq[4]; qemu_irq irq[4];
}; };
static uint32_t stellaris_adc_fifo_read(stellaris_adc_state *s, int n) static uint32_t stellaris_adc_fifo_read(StellarisADCState *s, int n)
{ {
int tail; int tail;
@ -716,7 +715,7 @@ static uint32_t stellaris_adc_fifo_read(stellaris_adc_state *s, int n)
return s->fifo[n].data[tail]; return s->fifo[n].data[tail];
} }
static void stellaris_adc_fifo_write(stellaris_adc_state *s, int n, static void stellaris_adc_fifo_write(StellarisADCState *s, int n,
uint32_t value) uint32_t value)
{ {
int head; int head;
@ -736,7 +735,7 @@ static void stellaris_adc_fifo_write(stellaris_adc_state *s, int n,
s->fifo[n].state |= STELLARIS_ADC_FIFO_FULL; s->fifo[n].state |= STELLARIS_ADC_FIFO_FULL;
} }
static void stellaris_adc_update(stellaris_adc_state *s) static void stellaris_adc_update(StellarisADCState *s)
{ {
int level; int level;
int n; int n;
@ -749,7 +748,7 @@ static void stellaris_adc_update(stellaris_adc_state *s)
static void stellaris_adc_trigger(void *opaque, int irq, int level) static void stellaris_adc_trigger(void *opaque, int irq, int level)
{ {
stellaris_adc_state *s = opaque; StellarisADCState *s = opaque;
int n; int n;
for (n = 0; n < 4; n++) { for (n = 0; n < 4; n++) {
@ -771,7 +770,7 @@ static void stellaris_adc_trigger(void *opaque, int irq, int level)
} }
} }
static void stellaris_adc_reset(stellaris_adc_state *s) static void stellaris_adc_reset(StellarisADCState *s)
{ {
int n; int n;
@ -785,7 +784,7 @@ static void stellaris_adc_reset(stellaris_adc_state *s)
static uint64_t stellaris_adc_read(void *opaque, hwaddr offset, static uint64_t stellaris_adc_read(void *opaque, hwaddr offset,
unsigned size) unsigned size)
{ {
stellaris_adc_state *s = opaque; StellarisADCState *s = opaque;
/* TODO: Implement this. */ /* TODO: Implement this. */
if (offset >= 0x40 && offset < 0xc0) { if (offset >= 0x40 && offset < 0xc0) {
@ -833,7 +832,7 @@ static uint64_t stellaris_adc_read(void *opaque, hwaddr offset,
static void stellaris_adc_write(void *opaque, hwaddr offset, static void stellaris_adc_write(void *opaque, hwaddr offset,
uint64_t value, unsigned size) uint64_t value, unsigned size)
{ {
stellaris_adc_state *s = opaque; StellarisADCState *s = opaque;
/* TODO: Implement this. */ /* TODO: Implement this. */
if (offset >= 0x40 && offset < 0xc0) { if (offset >= 0x40 && offset < 0xc0) {
@ -901,31 +900,31 @@ static const VMStateDescription vmstate_stellaris_adc = {
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_UINT32(actss, stellaris_adc_state), VMSTATE_UINT32(actss, StellarisADCState),
VMSTATE_UINT32(ris, stellaris_adc_state), VMSTATE_UINT32(ris, StellarisADCState),
VMSTATE_UINT32(im, stellaris_adc_state), VMSTATE_UINT32(im, StellarisADCState),
VMSTATE_UINT32(emux, stellaris_adc_state), VMSTATE_UINT32(emux, StellarisADCState),
VMSTATE_UINT32(ostat, stellaris_adc_state), VMSTATE_UINT32(ostat, StellarisADCState),
VMSTATE_UINT32(ustat, stellaris_adc_state), VMSTATE_UINT32(ustat, StellarisADCState),
VMSTATE_UINT32(sspri, stellaris_adc_state), VMSTATE_UINT32(sspri, StellarisADCState),
VMSTATE_UINT32(sac, stellaris_adc_state), VMSTATE_UINT32(sac, StellarisADCState),
VMSTATE_UINT32(fifo[0].state, stellaris_adc_state), VMSTATE_UINT32(fifo[0].state, StellarisADCState),
VMSTATE_UINT32_ARRAY(fifo[0].data, stellaris_adc_state, 16), VMSTATE_UINT32_ARRAY(fifo[0].data, StellarisADCState, 16),
VMSTATE_UINT32(ssmux[0], stellaris_adc_state), VMSTATE_UINT32(ssmux[0], StellarisADCState),
VMSTATE_UINT32(ssctl[0], stellaris_adc_state), VMSTATE_UINT32(ssctl[0], StellarisADCState),
VMSTATE_UINT32(fifo[1].state, stellaris_adc_state), VMSTATE_UINT32(fifo[1].state, StellarisADCState),
VMSTATE_UINT32_ARRAY(fifo[1].data, stellaris_adc_state, 16), VMSTATE_UINT32_ARRAY(fifo[1].data, StellarisADCState, 16),
VMSTATE_UINT32(ssmux[1], stellaris_adc_state), VMSTATE_UINT32(ssmux[1], StellarisADCState),
VMSTATE_UINT32(ssctl[1], stellaris_adc_state), VMSTATE_UINT32(ssctl[1], StellarisADCState),
VMSTATE_UINT32(fifo[2].state, stellaris_adc_state), VMSTATE_UINT32(fifo[2].state, StellarisADCState),
VMSTATE_UINT32_ARRAY(fifo[2].data, stellaris_adc_state, 16), VMSTATE_UINT32_ARRAY(fifo[2].data, StellarisADCState, 16),
VMSTATE_UINT32(ssmux[2], stellaris_adc_state), VMSTATE_UINT32(ssmux[2], StellarisADCState),
VMSTATE_UINT32(ssctl[2], stellaris_adc_state), VMSTATE_UINT32(ssctl[2], StellarisADCState),
VMSTATE_UINT32(fifo[3].state, stellaris_adc_state), VMSTATE_UINT32(fifo[3].state, StellarisADCState),
VMSTATE_UINT32_ARRAY(fifo[3].data, stellaris_adc_state, 16), VMSTATE_UINT32_ARRAY(fifo[3].data, StellarisADCState, 16),
VMSTATE_UINT32(ssmux[3], stellaris_adc_state), VMSTATE_UINT32(ssmux[3], StellarisADCState),
VMSTATE_UINT32(ssctl[3], stellaris_adc_state), VMSTATE_UINT32(ssctl[3], StellarisADCState),
VMSTATE_UINT32(noise, stellaris_adc_state), VMSTATE_UINT32(noise, StellarisADCState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };
@ -933,7 +932,7 @@ static const VMStateDescription vmstate_stellaris_adc = {
static void stellaris_adc_init(Object *obj) static void stellaris_adc_init(Object *obj)
{ {
DeviceState *dev = DEVICE(obj); DeviceState *dev = DEVICE(obj);
stellaris_adc_state *s = STELLARIS_ADC(obj); StellarisADCState *s = STELLARIS_ADC(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
int n; int n;
@ -1381,7 +1380,7 @@ static void stellaris_adc_class_init(ObjectClass *klass, void *data)
static const TypeInfo stellaris_adc_info = { static const TypeInfo stellaris_adc_info = {
.name = TYPE_STELLARIS_ADC, .name = TYPE_STELLARIS_ADC,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(stellaris_adc_state), .instance_size = sizeof(StellarisADCState),
.instance_init = stellaris_adc_init, .instance_init = stellaris_adc_init,
.class_init = stellaris_adc_class_init, .class_init = stellaris_adc_class_init,
}; };