Commit 0160daf8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Staging: csr: csr_macro.h: remove unused macros

Remove a bunch of unused #defines.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 31370f7e
......@@ -15,18 +15,6 @@
#define FALSE (0)
#define TRUE (1)
/*------------------------------------------------------------------*/
/* Bits - intended to operate on u32 values */
/*------------------------------------------------------------------*/
#define CSR_MASK_IS_SET(val, mask) (((val) & (mask)) == (mask))
#define CSR_MASK_IS_UNSET(val, mask) ((((val) & (mask)) ^ mask) == (mask))
#define CSR_MASK_SET(val, mask) ((val) |= (mask))
#define CSR_MASK_UNSET(val, mask) ((val) = ((val) ^ (mask)) & (val)) /* Unsets the bits in val that are set in mask */
#define CSR_BIT_IS_SET(val, bit) ((u8) ((((val) & (1UL << (bit))) != 0)))
#define CSR_BIT_SET(val, bit) ((val) |= (1UL << (bit)))
#define CSR_BIT_UNSET(val, bit) ((val) &= ~(1UL << (bit)))
#define CSR_BIT_TOGGLE(val, bit) ((val) ^= (1UL << (bit)))
/*------------------------------------------------------------------*/
/* Endian conversion */
/*------------------------------------------------------------------*/
......@@ -39,59 +27,10 @@
((u8 *) (ptr))[1] = ((u8) (((uint) >> 8) & 0x000000FF)); \
((u8 *) (ptr))[2] = ((u8) (((uint) >> 16) & 0x000000FF)); \
((u8 *) (ptr))[3] = ((u8) (((uint) >> 24) & 0x000000FF))
#define CSR_GET_UINT16_FROM_BIG_ENDIAN(ptr) (((u16) ((u8 *) (ptr))[1]) | ((u16) ((u8 *) (ptr))[0]) << 8)
#define CSR_GET_UINT24_FROM_BIG_ENDIAN(ptr) (((u32) ((u8 *) (ptr))[2]) | \
((u32) ((u8 *) (ptr))[1]) << 8 | ((u32) ((u8 *) (ptr))[0]) << 16)
#define CSR_GET_UINT32_FROM_BIG_ENDIAN(ptr) (((u32) ((u8 *) (ptr))[3]) | ((u32) ((u8 *) (ptr))[2]) << 8 | \
((u32) ((u8 *) (ptr))[1]) << 16 | ((u32) ((u8 *) (ptr))[0]) << 24)
#define CSR_COPY_UINT16_TO_BIG_ENDIAN(uint, ptr) ((u8 *) (ptr))[1] = ((u8) ((uint) & 0x00FF)); \
((u8 *) (ptr))[0] = ((u8) ((uint) >> 8))
#define CSR_COPY_UINT24_TO_BIG_ENDIAN(uint, ptr) ((u8 *) (ptr))[2] = ((u8) ((uint) & 0x000000FF)); \
((u8 *) (ptr))[1] = ((u8) (((uint) >> 8) & 0x000000FF)); \
((u8 *) (ptr))[0] = ((u8) (((uint) >> 16) & 0x000000FF))
#define CSR_COPY_UINT32_TO_BIG_ENDIAN(uint, ptr) ((u8 *) (ptr))[3] = ((u8) ((uint) & 0x000000FF)); \
((u8 *) (ptr))[2] = ((u8) (((uint) >> 8) & 0x000000FF)); \
((u8 *) (ptr))[1] = ((u8) (((uint) >> 16) & 0x000000FF)); \
((u8 *) (ptr))[0] = ((u8) (((uint) >> 24) & 0x000000FF))
/*------------------------------------------------------------------*/
/* XAP conversion macros */
/*------------------------------------------------------------------*/
#define CSR_LSB16(a) ((u8) ((a) & 0x00ff))
#define CSR_MSB16(b) ((u8) ((b) >> 8))
#define CSR_CONVERT_8_FROM_XAP(output, input) \
(output) = ((u8) (input));(input) += 2
#define CSR_CONVERT_16_FROM_XAP(output, input) \
(output) = (u16) ((((u16) (input)[1]) << 8) | \
((u16) (input)[0]));(input) += 2
#define CSR_CONVERT_32_FROM_XAP(output, input) \
(output) = (((u32) (input)[1]) << 24) | \
(((u32) (input)[0]) << 16) | \
(((u32) (input)[3]) << 8) | \
((u32) (input)[2]);input += 4
#define CSR_ADD_UINT8_TO_XAP(output, input) \
(output)[0] = (input); \
(output)[1] = 0;(output) += 2
#define CSR_ADD_UINT16_TO_XAP(output, input) \
(output)[0] = ((u8) ((input) & 0x00FF)); \
(output)[1] = ((u8) ((input) >> 8));(output) += 2
#define CSR_ADD_UINT32_TO_XAP(output, input) \
(output)[0] = ((u8) (((input) >> 16) & 0x00FF)); \
(output)[1] = ((u8) ((input) >> 24)); \
(output)[2] = ((u8) ((input) & 0x00FF)); \
(output)[3] = ((u8) (((input) >> 8) & 0x00FF));(output) += 4
/*------------------------------------------------------------------*/
/* Misc */
/*------------------------------------------------------------------*/
#define CSRMAX(a, b) (((a) > (b)) ? (a) : (b))
#define CSRMIN(a, b) (((a) < (b)) ? (a) : (b))
/* Use this macro on unused local variables that cannot be removed (such as
......@@ -99,8 +38,4 @@
and static code analysis tools like Lint and Valgrind. */
#define CSR_UNUSED(x) ((void) (x))
#define CSR_TOUPPER(character) (((character) >= 'a') && ((character) <= 'z') ? ((character) - 0x20) : (character))
#define CSR_TOLOWER(character) (((character) >= 'A') && ((character) <= 'Z') ? ((character) + 0x20) : (character))
#define CSR_ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment