mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 10:19:47 +00:00
staging: csr: remove CsrUint24 typedef
Use the in-kernel u32 type instead. Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com> Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com> Cc: Riku Mettälä <riku.mettala@bluegiga.com> Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
95e326c28a
commit
9d25edfca7
3 changed files with 3 additions and 4 deletions
|
@ -41,8 +41,8 @@ extern "C" {
|
|||
((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) (((CsrUint24) ((u8 *) (ptr))[2]) | \
|
||||
((CsrUint24) ((u8 *) (ptr))[1]) << 8 | ((CsrUint24) ((u8 *) (ptr))[0]) << 16)
|
||||
#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)); \
|
||||
|
|
|
@ -39,7 +39,6 @@ typedef u8 CsrBool;
|
|||
typedef char CsrCharString;
|
||||
typedef u8 CsrUtf8String;
|
||||
typedef u16 CsrUtf16String; /* 16-bit UTF16 strings */
|
||||
typedef u32 CsrUint24;
|
||||
|
||||
/*
|
||||
* 64-bit integers
|
||||
|
|
|
@ -429,7 +429,7 @@ typedef u16 CSR_DIALOG_TOKEN;
|
|||
|
||||
typedef struct CSR_GENERIC_POINTER
|
||||
{
|
||||
CsrUint24 MemoryOffset;
|
||||
u32 MemoryOffset;
|
||||
CSR_MEMORY_SPACE MemorySpace;
|
||||
} CSR_GENERIC_POINTER;
|
||||
|
||||
|
|
Loading…
Reference in a new issue