[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/9] hw/arm/omap1.c: Avoid shifting left into sign bi
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 6/9] hw/arm/omap1.c: Avoid shifting left into sign bit |
Date: |
Mon, 10 Mar 2014 15:09:17 +0000 |
Add missing 'U' suffix to avoid shifting left into sign bit.
Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
---
hw/arm/omap1.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 47511d2..b433748 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -809,22 +809,26 @@ static inline void omap_pin_funcmux1_update(struct
omap_mpu_state_s *s,
uint32_t diff, uint32_t value)
{
if (s->compat1509) {
- if (diff & (1 << 31)) /* MCBSP3_CLK_HIZ_DI */
- omap_clk_onoff(omap_findclk(s, "mcbsp3.clkx"),
- (value >> 31) & 1);
- if (diff & (1 << 1)) /* CLK32K */
- omap_clk_onoff(omap_findclk(s, "clk32k_out"),
- (~value >> 1) & 1);
+ if (diff & (1U << 31)) {
+ /* MCBSP3_CLK_HIZ_DI */
+ omap_clk_onoff(omap_findclk(s, "mcbsp3.clkx"), (value >> 31) & 1);
+ }
+ if (diff & (1 << 1)) {
+ /* CLK32K */
+ omap_clk_onoff(omap_findclk(s, "clk32k_out"), (~value >> 1) & 1);
+ }
}
}
static inline void omap_pin_modconf1_update(struct omap_mpu_state_s *s,
uint32_t diff, uint32_t value)
{
- if (diff & (1 << 31)) /* CONF_MOD_UART3_CLK_MODE_R */
- omap_clk_reparent(omap_findclk(s, "uart3_ck"),
- omap_findclk(s, ((value >> 31) & 1) ?
- "ck_48m" : "armper_ck"));
+ if (diff & (1U << 31)) {
+ /* CONF_MOD_UART3_CLK_MODE_R */
+ omap_clk_reparent(omap_findclk(s, "uart3_ck"),
+ omap_findclk(s, ((value >> 31) & 1) ?
+ "ck_48m" : "armper_ck"));
+ }
if (diff & (1 << 30)) /* CONF_MOD_UART2_CLK_MODE_R */
omap_clk_reparent(omap_findclk(s, "uart2_ck"),
omap_findclk(s, ((value >> 30) & 1) ?
--
1.9.0
- [Qemu-devel] [PULL 0/9] target-arm queue, Peter Maydell, 2014/03/10
- [Qemu-devel] [PULL 3/9] target-arm: Fix intptr_t vs tcg_target_long, Peter Maydell, 2014/03/10
- [Qemu-devel] [PULL 9/9] target-arm: Implement WFE as a yield operation, Peter Maydell, 2014/03/10
- [Qemu-devel] [PULL 4/9] libvixl: Fix format strings for several int64_t values, Peter Maydell, 2014/03/10
- [Qemu-devel] [PULL 7/9] hw/ssi/xilinx_spips.c: Avoid shifting left into sign bit, Peter Maydell, 2014/03/10
- [Qemu-devel] [PULL 6/9] hw/arm/omap1.c: Avoid shifting left into sign bit,
Peter Maydell <=
- [Qemu-devel] [PULL 5/9] pxa2xx: Don't shift into sign bit, Peter Maydell, 2014/03/10
- [Qemu-devel] [PULL 2/9] target-arm: Implements the ARM PMCCNTR register, Peter Maydell, 2014/03/10
- [Qemu-devel] [PULL 8/9] hw/arm/musicpal: Avoid shifting left into sign bit, Peter Maydell, 2014/03/10
- [Qemu-devel] [PULL 1/9] target-arm: Fix incorrect setting of E bit in CPSR, Peter Maydell, 2014/03/10
- Re: [Qemu-devel] [PULL 0/9] target-arm queue, Peter Maydell, 2014/03/11