Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d25edfc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 95e326c2

drivers/staging/csr/csr_macro.h

+2 −2
Original line number Diff line number Diff line
@@ -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)); \

drivers/staging/csr/csr_types.h

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/csr/csr_wifi_hip_sigs.h

+1 −1
Original line number Diff line number Diff line
@@ -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;