Commit 7e6f5794 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: csr: remove CsrUint8 typedef 



Use the in-kernel u8 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 ca6d2502

drivers/staging/csr/bh.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ uf_wait_for_thread_to_stop(unifi_priv_t *priv, struct uf_thread *thread) 
handle_bh_error(unifi_priv_t *priv)

{

    u8 conf_param = CONFIG_IND_ERROR;

    CsrUint8 interfaceTag = 0; /* used as a loop counter */

    u8 interfaceTag = 0; /* used as a loop counter */





    /* Block unifi_run_bh() until the error has been handled. */

drivers/staging/csr/csr_lib.h

+4 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ CsrEvent *CsrEvent_struct(CsrUint16 primtype, CsrUint16 msgtype); 
typedef struct

{

    CsrPrim  type;

    CsrUint8 value;

    u8 value;

} CsrEventCsrUint8;



/*----------------------------------------------------------------------------*
@@ -46,7 +46,7 @@ typedef struct 
 *      Allocates and fills in a message with the signature CsrEventCsrUint8

 *

 *----------------------------------------------------------------------------*/

CsrEventCsrUint8 *CsrEventCsrUint8_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrUint8 value);

CsrEventCsrUint8 *CsrEventCsrUint8_struct(CsrUint16 primtype, CsrUint16 msgtype, u8 value);



typedef struct

{
@@ -68,7 +68,7 @@ typedef struct 
{

    CsrPrim   type;

    CsrUint16 value1;

    CsrUint8  value2;

    u8  value2;

} CsrEventCsrUint16CsrUint8;



/*----------------------------------------------------------------------------*
@@ -79,7 +79,7 @@ typedef struct 
 *      Allocates and fills in a message with the signature CsrEventCsrUint16CsrUint8

 *

 *----------------------------------------------------------------------------*/

CsrEventCsrUint16CsrUint8 *CsrEventCsrUint16CsrUint8_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrUint16 value1, CsrUint8 value2);

CsrEventCsrUint16CsrUint8 *CsrEventCsrUint16CsrUint8_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrUint16 value1, u8 value2);



typedef struct

{

drivers/staging/csr/csr_log.h

+7 −7
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ typedef struct 
/*---------------------------------*/

/*  Tech logging */

/*---------------------------------*/

typedef CsrUint8 bitmask8_t;

typedef u8 bitmask8_t;

typedef CsrUint16 bitmask16_t;

typedef CsrUint32 bitmask32_t;
@@ -168,13 +168,13 @@ void CsrLogStateTransition(bitmask16_t mask, 
/*---------------------------------*/

/*  BSP logging */

/*---------------------------------*/

void CsrLogSchedInit(CsrUint8 thread_id);

void CsrLogSchedDeinit(CsrUint8 thread_id);

void CsrLogSchedInit(u8 thread_id);

void CsrLogSchedDeinit(u8 thread_id);



void CsrLogSchedStart(CsrUint8 thread_id);

void CsrLogSchedStop(CsrUint8 thread_id);

void CsrLogSchedStart(u8 thread_id);

void CsrLogSchedStop(u8 thread_id);



void CsrLogInitTask(CsrUint8 thread_id, CsrSchedQid tskid, const CsrCharString *tskName);

void CsrLogInitTask(u8 thread_id, CsrSchedQid tskid, const CsrCharString *tskName);

void CsrLogDeinitTask(CsrUint16 task_id);



void CsrLogActivate(CsrSchedQid tskid);
@@ -218,7 +218,7 @@ void CsrLogTimedEventCancel(CsrUint32 line, 
    CsrSchedTid tid,

    CsrBool cancel_res);



void CsrLogBgintRegister(CsrUint8 thread_id,

void CsrLogBgintRegister(u8 thread_id,

    CsrSchedBgint irq,

    const CsrCharString *callback,

    const void *ptr);

drivers/staging/csr/csr_log_configure.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ extern "C" { 
/*---------------------------------*/

/* Log init/deinit                 */

/*---------------------------------*/

void CsrLogInit(CsrUint8 size);

void CsrLogInit(u8 size);

void CsrLogDeinit(void);



/*---------------------------------*/

drivers/staging/csr/csr_macro.h

+32 −32
Original line number Diff line number Diff line
@@ -31,39 +31,39 @@ extern "C" { 
/*------------------------------------------------------------------*/

/* Endian conversion */

/*------------------------------------------------------------------*/

#define CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr)        (((CsrUint16) ((CsrUint8 *) (ptr))[0]) | ((CsrUint16) ((CsrUint8 *) (ptr))[1]) << 8)

#define CSR_GET_UINT32_FROM_LITTLE_ENDIAN(ptr)        (((CsrUint32) ((CsrUint8 *) (ptr))[0]) | ((CsrUint32) ((CsrUint8 *) (ptr))[1]) << 8 | \

                                                       ((CsrUint32) ((CsrUint8 *) (ptr))[2]) << 16 | ((CsrUint32) ((CsrUint8 *) (ptr))[3]) << 24)

#define CSR_COPY_UINT16_TO_LITTLE_ENDIAN(uint, ptr)    ((CsrUint8 *) (ptr))[0] = ((CsrUint8) ((uint) & 0x00FF)); \

    ((CsrUint8 *) (ptr))[1] = ((CsrUint8) ((uint) >> 8))

#define CSR_COPY_UINT32_TO_LITTLE_ENDIAN(uint, ptr)    ((CsrUint8 *) (ptr))[0] = ((CsrUint8) ((uint) & 0x000000FF)); \

    ((CsrUint8 *) (ptr))[1] = ((CsrUint8) (((uint) >> 8) & 0x000000FF)); \

    ((CsrUint8 *) (ptr))[2] = ((CsrUint8) (((uint) >> 16) & 0x000000FF)); \

    ((CsrUint8 *) (ptr))[3] = ((CsrUint8) (((uint) >> 24) & 0x000000FF))

#define CSR_GET_UINT16_FROM_BIG_ENDIAN(ptr) (((CsrUint16) ((CsrUint8 *) (ptr))[1]) | ((CsrUint16) ((CsrUint8 *) (ptr))[0]) << 8)

#define CSR_GET_UINT24_FROM_BIG_ENDIAN(ptr) (((CsrUint24) ((CsrUint8 *) (ptr))[2]) | \

                                             ((CsrUint24) ((CsrUint8 *) (ptr))[1]) << 8 | ((CsrUint24) ((CsrUint8 *) (ptr))[0]) << 16)

#define CSR_GET_UINT32_FROM_BIG_ENDIAN(ptr) (((CsrUint32) ((CsrUint8 *) (ptr))[3]) | ((CsrUint32) ((CsrUint8 *) (ptr))[2]) << 8 | \

                                             ((CsrUint32) ((CsrUint8 *) (ptr))[1]) << 16 | ((CsrUint32) ((CsrUint8 *) (ptr))[0]) << 24)

#define CSR_COPY_UINT16_TO_BIG_ENDIAN(uint, ptr)    ((CsrUint8 *) (ptr))[1] = ((CsrUint8) ((uint) & 0x00FF)); \

    ((CsrUint8 *) (ptr))[0] = ((CsrUint8) ((uint) >> 8))

#define CSR_COPY_UINT24_TO_BIG_ENDIAN(uint, ptr)    ((CsrUint8 *) (ptr))[2] = ((CsrUint8) ((uint) & 0x000000FF)); \

    ((CsrUint8 *) (ptr))[1] = ((CsrUint8) (((uint) >> 8) & 0x000000FF)); \

    ((CsrUint8 *) (ptr))[0] = ((CsrUint8) (((uint) >> 16) & 0x000000FF))

#define CSR_COPY_UINT32_TO_BIG_ENDIAN(uint, ptr)    ((CsrUint8 *) (ptr))[3] = ((CsrUint8) ((uint) & 0x000000FF)); \

    ((CsrUint8 *) (ptr))[2] = ((CsrUint8) (((uint) >> 8) & 0x000000FF)); \

    ((CsrUint8 *) (ptr))[1] = ((CsrUint8) (((uint) >> 16) & 0x000000FF)); \

    ((CsrUint8 *) (ptr))[0] = ((CsrUint8) (((uint) >> 24) & 0x000000FF))

#define CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr)        (((CsrUint16) ((u8 *) (ptr))[0]) | ((CsrUint16) ((u8 *) (ptr))[1]) << 8)

#define CSR_GET_UINT32_FROM_LITTLE_ENDIAN(ptr)        (((CsrUint32) ((u8 *) (ptr))[0]) | ((CsrUint32) ((u8 *) (ptr))[1]) << 8 | \

                                                       ((CsrUint32) ((u8 *) (ptr))[2]) << 16 | ((CsrUint32) ((u8 *) (ptr))[3]) << 24)

#define CSR_COPY_UINT16_TO_LITTLE_ENDIAN(uint, ptr)    ((u8 *) (ptr))[0] = ((u8) ((uint) & 0x00FF)); \

    ((u8 *) (ptr))[1] = ((u8) ((uint) >> 8))

#define CSR_COPY_UINT32_TO_LITTLE_ENDIAN(uint, ptr)    ((u8 *) (ptr))[0] = ((u8) ((uint) & 0x000000FF)); \

    ((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) (((CsrUint16) ((u8 *) (ptr))[1]) | ((CsrUint16) ((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_UINT32_FROM_BIG_ENDIAN(ptr) (((CsrUint32) ((u8 *) (ptr))[3]) | ((CsrUint32) ((u8 *) (ptr))[2]) << 8 | \

                                             ((CsrUint32) ((u8 *) (ptr))[1]) << 16 | ((CsrUint32) ((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) ((CsrUint8) ((a) & 0x00ff))

#define CSR_MSB16(b) ((CsrUint8) ((b) >> 8))

#define CSR_LSB16(a) ((u8) ((a) & 0x00ff))

#define CSR_MSB16(b) ((u8) ((b) >> 8))



#define CSR_CONVERT_8_FROM_XAP(output, input) \

    (output) = ((CsrUint8) (input));(input) += 2

    (output) = ((u8) (input));(input) += 2



#define CSR_CONVERT_16_FROM_XAP(output, input) \

    (output) = (CsrUint16) ((((CsrUint16) (input)[1]) << 8) | \
@@ -80,14 +80,14 @@ extern "C" { 
    (output)[1] = 0;(output) += 2



#define CSR_ADD_UINT16_TO_XAP(output, input) \

    (output)[0] = ((CsrUint8) ((input) & 0x00FF));  \

    (output)[1] = ((CsrUint8) ((input) >> 8));(output) += 2

    (output)[0] = ((u8) ((input) & 0x00FF));  \

    (output)[1] = ((u8) ((input) >> 8));(output) += 2



#define CSR_ADD_UINT32_TO_XAP(output, input) \

    (output)[0] = ((CsrUint8) (((input) >> 16) & 0x00FF)); \

    (output)[1] = ((CsrUint8) ((input) >> 24)); \

    (output)[2] = ((CsrUint8) ((input) & 0x00FF)); \

    (output)[3] = ((CsrUint8) (((input) >> 8) & 0x00FF));(output) += 4

    (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 */