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

Commit 5379b13d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: csr: remove CsrBool typedef 



Use u8 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 c781b96b

drivers/staging/csr/csr_log.h

+4 −4
Original line number Diff line number Diff line
@@ -71,9 +71,9 @@ typedef u32 CsrLogLevelTask; 
/* The bit masks between here are reserved for future usage */

#define CSR_LOG_LEVEL_TASK_ALL                 ((CsrLogLevelTask) 0xFFFFFFFF & ~(CSR_LOG_LEVEL_TASK_PRIM_ONLY_TYPE | CSR_LOG_LEVEL_TASK_PRIM_APPLY_LIMIT)) /* All info possible to log for a task are logged. WARNING: By using this define the application also accepts future possible task data/events in the logs */



CsrBool CsrLogEnvironmentIsFiltered(CsrLogLevelEnvironment level);

u8 CsrLogEnvironmentIsFiltered(CsrLogLevelEnvironment level);

CsrLogLevelTask CsrLogTaskFilterGet(CsrSchedQid taskId);

CsrBool CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level);

u8 CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level);



/*

 * Logging stuff
@@ -193,7 +193,7 @@ void CsrLogMessagePut(u32 line, 


void CsrLogMessageGet(CsrSchedQid src_task_id,

    CsrSchedQid dst_taskid,

    CsrBool get_res,

    u8 get_res,

    CsrSchedMsgId msg_id,

    u16 prim_type,

    const void *msg);
@@ -216,7 +216,7 @@ void CsrLogTimedEventCancel(u32 line, 
    const char *file,

    CsrSchedQid task_id,

    CsrSchedTid tid,

    CsrBool cancel_res);

    u8 cancel_res);



void CsrLogBgintRegister(u8 thread_id,

    CsrSchedBgint irq,

drivers/staging/csr/csr_macro.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ extern "C" { 
#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)   ((CsrBool) ((((val) & (1UL << (bit))) != 0)))

#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)))

drivers/staging/csr/csr_msgconv.c

+2 −2
Original line number Diff line number Diff line
@@ -133,10 +133,10 @@ static CsrSize sizeof_message(u16 primType, void *msg) 
    return ret;

}



static CsrBool free_message(u16 primType, u8 *data)

static u8 free_message(u16 primType, u8 *data)

{

    CsrMsgConvPrimEntry *ptr;

    CsrBool ret;

    u8 ret;



    ptr = CsrMsgConvFind(primType);

drivers/staging/csr/csr_msgconv.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ typedef struct 
{

    CsrMsgConvPrimEntry *profile_converters;

    void *(*deserialize_data)(u16 primType, CsrSize length, u8 * data);

    CsrBool (*free_message)(u16 primType, u8 *data);

    u8 (*free_message)(u16 primType, u8 *data);

    CsrSize (*sizeof_message)(u16 primType, void *msg);

    u8 *(*serialize_message)(u16 primType, void *msg,

                                   CsrSize * length,

drivers/staging/csr/csr_sched.h

+5 −5
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ void CsrSchedMessageBroadcast(u16 mi, 
 *      The message consists of one or both of a u16 and a void *.

 *

 *  RETURNS

 *      CsrBool - TRUE if a message has been obtained from the queue, else FALSE.

 *      u8 - TRUE if a message has been obtained from the queue, else FALSE.

 *      If a message is taken from the queue, then "*pmi" and "*pmv" are set to

 *      the "mi" and "mv" passed to CsrSchedMessagePut() respectively.

 *
@@ -193,7 +193,7 @@ void CsrSchedMessageBroadcast(u16 mi, 
 *      them message is discarded.

 *

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

CsrBool CsrSchedMessageGet(u16 *pmi, void **pmv);

u8 CsrSchedMessageGet(u16 *pmi, void **pmv);



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

 *  NAME
@@ -241,18 +241,18 @@ CsrSchedTid CsrSchedTimerSet(CsrTime delay, 
 *      occurring.

 *

 *  RETURNS

 *      CsrBool - TRUE if cancelled, FALSE if the event has already occurred.

 *      u8 - TRUE if cancelled, FALSE if the event has already occurred.

 *

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

#if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER)

CsrBool CsrSchedTimerCancelStringLog(CsrSchedTid eventid,

u8 CsrSchedTimerCancelStringLog(CsrSchedTid eventid,

    u16 *pmi,

    void **pmv,

    u32 line,

    const char *file);

#define CsrSchedTimerCancel(e, pmi, pmv) CsrSchedTimerCancelStringLog((e), (pmi), (pmv), __LINE__, __FILE__)

#else

CsrBool CsrSchedTimerCancel(CsrSchedTid eventid,

u8 CsrSchedTimerCancel(CsrSchedTid eventid,

    u16 *pmi,

    void **pmv);

#endif