In preparation of raising -Wimplicit-fallthrough to 5, replace all fall-through comments with the fallthrough attribute pseudo-keyword.
Signed-off-by: Emmanouil Pitsidianakis <manos.pitsidiana...@linaro.org> --- hw/adc/aspeed_adc.c | 12 ++++++------ hw/adc/zynq-xadc.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/adc/aspeed_adc.c b/hw/adc/aspeed_adc.c index 0d29663129..f9f5f7bb17 100644 --- a/hw/adc/aspeed_adc.c +++ b/hw/adc/aspeed_adc.c @@ -107,59 +107,59 @@ static uint32_t read_channel_sample(AspeedADCEngineState *s, int reg) static uint64_t aspeed_adc_engine_read(void *opaque, hwaddr addr, unsigned int size) { AspeedADCEngineState *s = ASPEED_ADC_ENGINE(opaque); int reg = TO_REG(addr); uint32_t value = 0; switch (reg) { case BOUNDS_CHANNEL_8 ... BOUNDS_CHANNEL_15: if (s->nr_channels <= 8) { qemu_log_mask(LOG_GUEST_ERROR, "%s: engine[%u]: " "bounds register %u invalid, only 0...7 valid\n", __func__, s->engine_id, reg - BOUNDS_CHANNEL_0); break; } - /* fallthrough */ + fallthrough; case HYSTERESIS_CHANNEL_8 ... HYSTERESIS_CHANNEL_15: if (s->nr_channels <= 8) { qemu_log_mask(LOG_GUEST_ERROR, "%s: engine[%u]: " "hysteresis register %u invalid, only 0...7 valid\n", __func__, s->engine_id, reg - HYSTERESIS_CHANNEL_0); break; } - /* fallthrough */ + fallthrough; case BOUNDS_CHANNEL_0 ... BOUNDS_CHANNEL_7: case HYSTERESIS_CHANNEL_0 ... HYSTERESIS_CHANNEL_7: case ENGINE_CONTROL: case INTERRUPT_CONTROL: case VGA_DETECT_CONTROL: case CLOCK_CONTROL: case INTERRUPT_SOURCE: case COMPENSATING_AND_TRIMMING: value = s->regs[reg]; break; case DATA_CHANNEL_9_AND_8 ... DATA_CHANNEL_15_AND_14: if (s->nr_channels <= 8) { qemu_log_mask(LOG_GUEST_ERROR, "%s: engine[%u]: " "data register %u invalid, only 0...3 valid\n", __func__, s->engine_id, reg - DATA_CHANNEL_1_AND_0); break; } - /* fallthrough */ + fallthrough; case DATA_CHANNEL_1_AND_0 ... DATA_CHANNEL_7_AND_6: value = read_channel_sample(s, reg); /* Allow 16-bit reads of the data registers */ if (addr & 0x2) { assert(size == 2); value >>= 16; } break; default: qemu_log_mask(LOG_UNIMP, "%s: engine[%u]: 0x%" HWADDR_PRIx "\n", __func__, s->engine_id, addr); break; } trace_aspeed_adc_engine_read(s->engine_id, addr, value); return value; } @@ -167,69 +167,69 @@ static uint64_t aspeed_adc_engine_read(void *opaque, hwaddr addr, static void aspeed_adc_engine_write(void *opaque, hwaddr addr, uint64_t value, unsigned int size) { AspeedADCEngineState *s = ASPEED_ADC_ENGINE(opaque); int reg = TO_REG(addr); uint32_t init = 0; trace_aspeed_adc_engine_write(s->engine_id, addr, value); switch (reg) { case ENGINE_CONTROL: init = !!(value & ASPEED_ADC_ENGINE_EN); init *= ASPEED_ADC_ENGINE_INIT; value &= ~ASPEED_ADC_ENGINE_INIT; value |= init; value &= ~ASPEED_ADC_ENGINE_AUTO_COMP; break; case INTERRUPT_CONTROL: case VGA_DETECT_CONTROL: case CLOCK_CONTROL: break; case DATA_CHANNEL_9_AND_8 ... DATA_CHANNEL_15_AND_14: if (s->nr_channels <= 8) { qemu_log_mask(LOG_GUEST_ERROR, "%s: engine[%u]: " "data register %u invalid, only 0...3 valid\n", __func__, s->engine_id, reg - DATA_CHANNEL_1_AND_0); return; } - /* fallthrough */ + fallthrough; case BOUNDS_CHANNEL_8 ... BOUNDS_CHANNEL_15: if (s->nr_channels <= 8) { qemu_log_mask(LOG_GUEST_ERROR, "%s: engine[%u]: " "bounds register %u invalid, only 0...7 valid\n", __func__, s->engine_id, reg - BOUNDS_CHANNEL_0); return; } - /* fallthrough */ + fallthrough; case DATA_CHANNEL_1_AND_0 ... DATA_CHANNEL_7_AND_6: case BOUNDS_CHANNEL_0 ... BOUNDS_CHANNEL_7: value &= ASPEED_ADC_LH_MASK; break; case HYSTERESIS_CHANNEL_8 ... HYSTERESIS_CHANNEL_15: if (s->nr_channels <= 8) { qemu_log_mask(LOG_GUEST_ERROR, "%s: engine[%u]: " "hysteresis register %u invalid, only 0...7 valid\n", __func__, s->engine_id, reg - HYSTERESIS_CHANNEL_0); return; } - /* fallthrough */ + fallthrough; case HYSTERESIS_CHANNEL_0 ... HYSTERESIS_CHANNEL_7: value &= (ASPEED_ADC_HYST_EN | ASPEED_ADC_LH_MASK); break; case INTERRUPT_SOURCE: value &= 0xffff; break; case COMPENSATING_AND_TRIMMING: value &= 0xf; break; default: qemu_log_mask(LOG_UNIMP, "%s: engine[%u]: " "0x%" HWADDR_PRIx " 0x%" PRIx64 "\n", __func__, s->engine_id, addr, value); break; } s->regs[reg] = value; } diff --git a/hw/adc/zynq-xadc.c b/hw/adc/zynq-xadc.c index 032e19cbd0..a74de3a4fd 100644 --- a/hw/adc/zynq-xadc.c +++ b/hw/adc/zynq-xadc.c @@ -189,61 +189,61 @@ static uint64_t zynq_xadc_read(void *opaque, hwaddr offset, unsigned size) static void zynq_xadc_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) { ZynqXADCState *s = (ZynqXADCState *)opaque; int reg = offset / 4; int xadc_reg; int xadc_cmd; int xadc_data; if (!zynq_xadc_check_offset(reg, false)) { qemu_log_mask(LOG_GUEST_ERROR, "zynq_xadc: Invalid write access " "to addr %" HWADDR_PRIx "\n", offset); return; } switch (reg) { case CFG: s->regs[CFG] = val; break; case INT_STS: s->regs[INT_STS] &= ~val; break; case INT_MASK: s->regs[INT_MASK] = val & INT_ALL; break; case CMDFIFO: xadc_cmd = extract32(val, 26, 4); xadc_reg = extract32(val, 16, 10); xadc_data = extract32(val, 0, 16); if (s->regs[MCTL] & MCTL_RESET) { qemu_log_mask(LOG_GUEST_ERROR, "zynq_xadc: Sending command " "while comm channel held in reset: %" PRIx32 "\n", (uint32_t) val); break; } if (xadc_reg >= ZYNQ_XADC_NUM_ADC_REGS && xadc_cmd != CMD_NOP) { qemu_log_mask(LOG_GUEST_ERROR, "read/write op to invalid xadc " "reg 0x%x\n", xadc_reg); break; } switch (xadc_cmd) { case CMD_READ: xadc_push_dfifo(s, s->xadc_regs[xadc_reg]); break; case CMD_WRITE: s->xadc_regs[xadc_reg] = xadc_data; - /* fallthrough */ + fallthrough; case CMD_NOP: xadc_push_dfifo(s, 0); break; } break; case MCTL: s->regs[MCTL] = val & 0x00fffeff; break; } zynq_xadc_update_ints(s); } -- 2.39.2