diff options
-rw-r--r-- | hw/arm/omap1.c | 65 | ||||
-rw-r--r-- | hw/arm/omap2.c | 12 | ||||
-rw-r--r-- | hw/char/omap_uart.c | 3 | ||||
-rw-r--r-- | hw/display/omap_dss.c | 15 | ||||
-rw-r--r-- | hw/dma/omap_dma.c | 8 | ||||
-rw-r--r-- | hw/gpio/omap_gpio.c | 3 | ||||
-rw-r--r-- | hw/misc/omap_gpmc.c | 3 | ||||
-rw-r--r-- | hw/misc/omap_l4.c | 3 | ||||
-rw-r--r-- | hw/misc/omap_sdrc.c | 3 | ||||
-rw-r--r-- | hw/misc/omap_tap.c | 3 | ||||
-rw-r--r-- | hw/sd/omap_mmc.c | 3 | ||||
-rw-r--r-- | hw/ssi/omap_spi.c | 3 | ||||
-rw-r--r-- | hw/timer/omap_gptimer.c | 2 |
13 files changed, 84 insertions, 42 deletions
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index abb183c..0615044 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -207,7 +207,8 @@ static void omap_mpu_timer_write(void *opaque, hwaddr addr, struct omap_mpu_timer_s *s = (struct omap_mpu_timer_s *) opaque; if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { @@ -314,7 +315,8 @@ static void omap_wd_timer_write(void *opaque, hwaddr addr, struct omap_watchdog_timer_s *s = (struct omap_watchdog_timer_s *) opaque; if (size != 2) { - return omap_badwidth_write16(opaque, addr, value); + omap_badwidth_write16(opaque, addr, value); + return; } switch (addr) { @@ -440,7 +442,8 @@ static void omap_os_timer_write(void *opaque, hwaddr addr, int offset = addr & OMAP_MPUI_REG_MASK; if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (offset) { @@ -585,7 +588,8 @@ static void omap_ulpd_pm_write(void *opaque, hwaddr addr, uint16_t diff; if (size != 2) { - return omap_badwidth_write16(opaque, addr, value); + omap_badwidth_write16(opaque, addr, value); + return; } switch (addr) { @@ -857,7 +861,8 @@ static void omap_pin_cfg_write(void *opaque, hwaddr addr, uint32_t diff; if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { @@ -1012,7 +1017,8 @@ static void omap_id_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } OMAP_BAD_REG(addr); @@ -1081,7 +1087,8 @@ static void omap_mpui_write(void *opaque, hwaddr addr, struct omap_mpu_state_s *s = (struct omap_mpu_state_s *) opaque; if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { @@ -1175,7 +1182,8 @@ static void omap_tipb_bridge_write(void *opaque, hwaddr addr, struct omap_tipb_bridge_s *s = (struct omap_tipb_bridge_s *) opaque; if (size < 2) { - return omap_badwidth_write16(opaque, addr, value); + omap_badwidth_write16(opaque, addr, value); + return; } switch (addr) { @@ -1284,7 +1292,8 @@ static void omap_tcmi_write(void *opaque, hwaddr addr, struct omap_mpu_state_s *s = (struct omap_mpu_state_s *) opaque; if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { @@ -1379,7 +1388,8 @@ static void omap_dpll_write(void *opaque, hwaddr addr, int div, mult; if (size != 2) { - return omap_badwidth_write16(opaque, addr, value); + omap_badwidth_write16(opaque, addr, value); + return; } if (addr == 0x00) { /* CTL_REG */ @@ -1647,7 +1657,8 @@ static void omap_clkm_write(void *opaque, hwaddr addr, }; if (size != 2) { - return omap_badwidth_write16(opaque, addr, value); + omap_badwidth_write16(opaque, addr, value); + return; } switch (addr) { @@ -1775,7 +1786,8 @@ static void omap_clkdsp_write(void *opaque, hwaddr addr, uint16_t diff; if (size != 2) { - return omap_badwidth_write16(opaque, addr, value); + omap_badwidth_write16(opaque, addr, value); + return; } switch (addr) { @@ -1982,7 +1994,8 @@ static void omap_mpuio_write(void *opaque, hwaddr addr, int ln; if (size != 2) { - return omap_badwidth_write16(opaque, addr, value); + omap_badwidth_write16(opaque, addr, value); + return; } switch (offset) { @@ -2210,7 +2223,8 @@ static void omap_uwire_write(void *opaque, hwaddr addr, int offset = addr & OMAP_MPUI_REG_MASK; if (size != 2) { - return omap_badwidth_write16(opaque, addr, value); + omap_badwidth_write16(opaque, addr, value); + return; } switch (offset) { @@ -2349,7 +2363,8 @@ static void omap_pwl_write(void *opaque, hwaddr addr, int offset = addr & OMAP_MPUI_REG_MASK; if (size != 1) { - return omap_badwidth_write8(opaque, addr, value); + omap_badwidth_write8(opaque, addr, value); + return; } switch (offset) { @@ -2444,7 +2459,8 @@ static void omap_pwt_write(void *opaque, hwaddr addr, int offset = addr & OMAP_MPUI_REG_MASK; if (size != 1) { - return omap_badwidth_write8(opaque, addr, value); + omap_badwidth_write8(opaque, addr, value); + return; } switch (offset) { @@ -2637,7 +2653,8 @@ static void omap_rtc_write(void *opaque, hwaddr addr, time_t ti[2]; if (size != 1) { - return omap_badwidth_write8(opaque, addr, value); + omap_badwidth_write8(opaque, addr, value); + return; } switch (offset) { @@ -3410,9 +3427,14 @@ static void omap_mcbsp_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { switch (size) { - case 2: return omap_mcbsp_writeh(opaque, addr, value); - case 4: return omap_mcbsp_writew(opaque, addr, value); - default: return omap_badwidth_write16(opaque, addr, value); + case 2: + omap_mcbsp_writeh(opaque, addr, value); + break; + case 4: + omap_mcbsp_writew(opaque, addr, value); + break; + default: + omap_badwidth_write16(opaque, addr, value); } } @@ -3586,7 +3608,8 @@ static void omap_lpg_write(void *opaque, hwaddr addr, int offset = addr & OMAP_MPUI_REG_MASK; if (size != 1) { - return omap_badwidth_write8(opaque, addr, value); + omap_badwidth_write8(opaque, addr, value); + return; } switch (offset) { diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index b083ebe..3239014 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -447,7 +447,8 @@ static void omap_eac_write(void *opaque, hwaddr addr, struct omap_eac_s *s = (struct omap_eac_s *) opaque; if (size != 2) { - return omap_badwidth_write16(opaque, addr, value); + omap_badwidth_write16(opaque, addr, value); + return; } switch (addr) { @@ -692,7 +693,8 @@ static void omap_sti_write(void *opaque, hwaddr addr, struct omap_sti_s *s = (struct omap_sti_s *) opaque; if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { @@ -757,7 +759,8 @@ static void omap_sti_fifo_write(void *opaque, hwaddr addr, uint8_t byte = value; if (size != 1) { - return omap_badwidth_write8(opaque, addr, size); + omap_badwidth_write8(opaque, addr, size); + return; } if (ch == STI_TRACE_CONTROL_CHANNEL) { @@ -1359,7 +1362,8 @@ static void omap_prcm_write(void *opaque, hwaddr addr, struct omap_prcm_s *s = (struct omap_prcm_s *) opaque; if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c index 0b91693..88f2094 100644 --- a/hw/char/omap_uart.c +++ b/hw/char/omap_uart.c @@ -112,7 +112,8 @@ static void omap_uart_write(void *opaque, hwaddr addr, struct omap_uart_s *s = (struct omap_uart_s *) opaque; if (size == 4) { - return omap_badwidth_write8(opaque, addr, value); + omap_badwidth_write8(opaque, addr, value); + return; } switch (addr) { diff --git a/hw/display/omap_dss.c b/hw/display/omap_dss.c index 24ccbcc..f1fef27 100644 --- a/hw/display/omap_dss.c +++ b/hw/display/omap_dss.c @@ -212,7 +212,8 @@ static void omap_diss_write(void *opaque, hwaddr addr, struct omap_dss_s *s = (struct omap_dss_s *) opaque; if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { @@ -377,7 +378,8 @@ static void omap_disc_write(void *opaque, hwaddr addr, struct omap_dss_s *s = (struct omap_dss_s *) opaque; if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { @@ -736,7 +738,8 @@ static void omap_rfbi_write(void *opaque, hwaddr addr, struct omap_dss_s *s = (struct omap_dss_s *) opaque; if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { @@ -928,7 +931,8 @@ static void omap_venc_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { if (size != 4) { - return omap_badwidth_write32(opaque, addr, size); + omap_badwidth_write32(opaque, addr, size); + return; } switch (addr) { @@ -1016,7 +1020,8 @@ static void omap_im3_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index 756a87a..97c57a0 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -136,7 +136,7 @@ struct omap_dma_s { static inline void omap_dma_interrupts_update(struct omap_dma_s *s) { - return s->intr_update(s); + s->intr_update(s); } static void omap_dma_channel_load(struct omap_dma_channel_s *ch) @@ -1502,7 +1502,8 @@ static void omap_dma_write(void *opaque, hwaddr addr, int reg, ch; if (size != 2) { - return omap_badwidth_write16(opaque, addr, value); + omap_badwidth_write16(opaque, addr, value); + return; } switch (addr) { @@ -1857,7 +1858,8 @@ static void omap_dma4_write(void *opaque, hwaddr addr, struct omap_dma_channel_s *ch; if (size == 1) { - return omap_badwidth_write16(opaque, addr, value); + omap_badwidth_write16(opaque, addr, value); + return; } switch (addr) { diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 938782a..9a43486 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -113,7 +113,8 @@ static void omap_gpio_write(void *opaque, hwaddr addr, int ln; if (size != 2) { - return omap_badwidth_write16(opaque, addr, value); + omap_badwidth_write16(opaque, addr, value); + return; } switch (offset) { diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c index a0de52f..74fc91c 100644 --- a/hw/misc/omap_gpmc.c +++ b/hw/misc/omap_gpmc.c @@ -624,7 +624,8 @@ static void omap_gpmc_write(void *opaque, hwaddr addr, struct omap_gpmc_cs_file_s *f; if (size != 4 && gpmc_wordaccess_only(addr)) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { diff --git a/hw/misc/omap_l4.c b/hw/misc/omap_l4.c index f237250..245ceac 100644 --- a/hw/misc/omap_l4.c +++ b/hw/misc/omap_l4.c @@ -82,7 +82,8 @@ static void omap_l4ta_write(void *opaque, hwaddr addr, struct omap_target_agent_s *s = (struct omap_target_agent_s *) opaque; if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c index ed62caf..3de0c0e 100644 --- a/hw/misc/omap_sdrc.c +++ b/hw/misc/omap_sdrc.c @@ -92,7 +92,8 @@ static void omap_sdrc_write(void *opaque, hwaddr addr, struct omap_sdrc_s *s = (struct omap_sdrc_s *) opaque; if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { diff --git a/hw/misc/omap_tap.c b/hw/misc/omap_tap.c index 9d2b710..6f02bb9 100644 --- a/hw/misc/omap_tap.c +++ b/hw/misc/omap_tap.c @@ -95,7 +95,8 @@ static void omap_tap_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } OMAP_BAD_REG(addr); diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c index 86c477d..d072dec 100644 --- a/hw/sd/omap_mmc.c +++ b/hw/sd/omap_mmc.c @@ -406,7 +406,8 @@ static void omap_mmc_write(void *opaque, hwaddr offset, struct omap_mmc_s *s = (struct omap_mmc_s *) opaque; if (size != 2) { - return omap_badwidth_write16(opaque, offset, value); + omap_badwidth_write16(opaque, offset, value); + return; } switch (offset) { diff --git a/hw/ssi/omap_spi.c b/hw/ssi/omap_spi.c index 0ed3b11..119e325 100644 --- a/hw/ssi/omap_spi.c +++ b/hw/ssi/omap_spi.c @@ -226,7 +226,8 @@ static void omap_mcspi_write(void *opaque, hwaddr addr, int ch = 0; if (size != 4) { - return omap_badwidth_write32(opaque, addr, value); + omap_badwidth_write32(opaque, addr, value); + return; } switch (addr) { diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c index b7f3d49..b8c8c01 100644 --- a/hw/timer/omap_gptimer.c +++ b/hw/timer/omap_gptimer.c @@ -444,7 +444,7 @@ static void omap_gp_timer_writeh(void *opaque, hwaddr addr, struct omap_gp_timer_s *s = (struct omap_gp_timer_s *) opaque; if (addr & 2) - return omap_gp_timer_write(opaque, addr, (value << 16) | s->writeh); + omap_gp_timer_write(opaque, addr, (value << 16) | s->writeh); else s->writeh = (uint16_t) value; } |