diff options
| author | eadler <eadler@FreeBSD.org> | 2014-02-04 03:36:42 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2014-02-04 03:36:42 +0000 |
| commit | ec294fd7f5fc5de11ed889d6c2d701f918d1ecfb (patch) | |
| tree | 7e76e370b9406b0383b17bd343084addb4ad6a25 /sys/arm/lpc | |
| parent | d374d7f398b846dc59d8a5ec3c7bfb318cf880af (diff) | |
| download | FreeBSD-src-ec294fd7f5fc5de11ed889d6c2d701f918d1ecfb.zip FreeBSD-src-ec294fd7f5fc5de11ed889d6c2d701f918d1ecfb.tar.gz | |
MFC r258779,r258780,r258787,r258822:
Fix undefined behavior: (1 << 31) is not defined as 1 is an int and this
shifts into the sign bit. Instead use (1U << 31) which gets the
expected result.
Similar to the (1 << 31) case it is not defined to do (2 << 30).
This fix is not ideal as it assumes a 32 bit int, but does fix the issue
for most cases.
A similar change was made in OpenBSD.
Diffstat (limited to 'sys/arm/lpc')
| -rw-r--r-- | sys/arm/lpc/if_lpereg.h | 6 | ||||
| -rw-r--r-- | sys/arm/lpc/lpcreg.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arm/lpc/if_lpereg.h b/sys/arm/lpc/if_lpereg.h index 8d166ea..8e1512b 100644 --- a/sys/arm/lpc/if_lpereg.h +++ b/sys/arm/lpc/if_lpereg.h @@ -169,7 +169,7 @@ struct lpe_hwstatus { /* These are valid for both Rx and Tx descriptors */ #define LPE_HWDESC_SIZE_MASK (1 << 10) -#define LPE_HWDESC_INTERRUPT (1 << 31) +#define LPE_HWDESC_INTERRUPT (1U << 31) /* These are valid for Tx descriptors */ #define LPE_HWDESC_LAST (1 << 30) @@ -186,7 +186,7 @@ struct lpe_hwstatus { #define LPE_HWDESC_LATECOLL (1 << 28) #define LPE_HWDESC_UNDERRUN (1 << 29) #define LPE_HWDESC_TXNODESCR (1 << 30) -#define LPE_HWDESC_ERROR (1 << 31) +#define LPE_HWDESC_ERROR (1U << 31) /* These are valid for Rx status descriptors */ #define LPE_HWDESC_CONTROL (1 << 18) @@ -202,7 +202,7 @@ struct lpe_hwstatus { #define LPE_HWDESC_OVERRUN (1 << 28) #define LPE_HWDESC_RXNODESCR (1 << 29) #define LPE_HWDESC_LASTFLAG (1 << 30) -#define LPE_HWDESC_ERROR (1 << 31) +#define LPE_HWDESC_ERROR (1U << 31) #endif /* _ARM_LPC_IF_LPEREG_H */ diff --git a/sys/arm/lpc/lpcreg.h b/sys/arm/lpc/lpcreg.h index 1803c6f..557d9b7 100644 --- a/sys/arm/lpc/lpcreg.h +++ b/sys/arm/lpc/lpcreg.h @@ -604,7 +604,7 @@ #define LPC_DMAC_CH_LLI 0x08 #define LPC_DMAC_CH_LLI_AHB1 (1 << 0) #define LPC_DMAC_CH_CONTROL 0x0c -#define LPC_DMAC_CH_CONTROL_I (1 << 31) +#define LPC_DMAC_CH_CONTROL_I (1U << 31) #define LPC_DMAC_CH_CONTROL_DI (1 << 27) #define LPC_DMAC_CH_CONTROL_SI (1 << 26) #define LPC_DMAC_CH_CONTROL_D (1 << 25) |
