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

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

staging: csr: remove CsrCharString typedef 



Use char 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 7f5393ea

drivers/staging/csr/csr_formatted_io.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "csr_formatted_io.h"

#include "csr_util.h"



s32 CsrSnprintf(CsrCharString *dest, CsrSize n, const CsrCharString *fmt, ...)

s32 CsrSnprintf(char *dest, CsrSize n, const char *fmt, ...)

{

    s32 r;

    va_list args;

drivers/staging/csr/csr_formatted_io.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ extern "C" { 


#include "csr_types.h"



s32 CsrSnprintf(CsrCharString *dest, CsrSize n, const CsrCharString *fmt, ...);

s32 CsrSnprintf(char *dest, CsrSize n, const char *fmt, ...);



#ifdef __cplusplus

}

drivers/staging/csr/csr_framework_ext.h

+4 −4
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ void CsrGlobalMutexUnlock(void); 
 *----------------------------------------------------------------------------*/

CsrResult CsrThreadCreate(void (*threadFunction)(void *pointer), void *pointer,

    u32 stackSize, u16 priority,

    const CsrCharString *threadName, CsrThreadHandle *threadHandle);

    const char *threadName, CsrThreadHandle *threadHandle);



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

 *  NAME
@@ -257,7 +257,7 @@ void CsrThreadSleep(u16 sleepTimeInMs); 
 *----------------------------------------------------------------------------*/

#ifdef CSR_MEM_DEBUG

void *CsrMemAllocDebug(CsrSize size,

    const CsrCharString *file, u32 line);

    const char *file, u32 line);

#define CsrMemAlloc(sz) CsrMemAllocDebug((sz), __FILE__, __LINE__)

#else

void *CsrMemAlloc(CsrSize size);
@@ -278,7 +278,7 @@ void *CsrMemAlloc(CsrSize size); 
 *----------------------------------------------------------------------------*/

#ifdef CSR_MEM_DEBUG

void *CsrMemCallocDebug(CsrSize numberOfElements, CsrSize elementSize,

    const CsrCharString *file, u32 line);

    const char *file, u32 line);

#define CsrMemCalloc(cnt, sz) CsrMemAllocDebug((cnt), (sz), __FILE__, __LINE__)

#else

void *CsrMemCalloc(CsrSize numberOfElements, CsrSize elementSize);
@@ -311,7 +311,7 @@ void CsrMemFree(void *pointer); 
 *----------------------------------------------------------------------------*/

#ifdef CSR_MEM_DEBUG

void *CsrMemAllocDmaDebug(CsrSize size,

    const CsrCharString *file, u32 line);

    const char *file, u32 line);

#define CsrMemAllocDma(sz) CsrMemAllocDmaDebug((sz), __FILE__, __LINE__)

#else

void *CsrMemAllocDma(CsrSize size);

drivers/staging/csr/csr_lib.h

+4 −4
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ typedef struct 
{

    CsrPrim        type;

    u16      value1;

    CsrCharString *value2;

    char *value2;

} CsrEventCsrUint16CsrCharString;



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

 *

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

CsrEventCsrUint16CsrCharString *CsrEventCsrUint16CsrCharString_struct(u16 primtype, u16 msgtype, u16 value1, CsrCharString *value2);

CsrEventCsrUint16CsrCharString *CsrEventCsrUint16CsrCharString_struct(u16 primtype, u16 msgtype, u16 value1, char *value2);



typedef struct

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

    CsrPrim        type;

    u32      value1;

    CsrCharString *value2;

    char *value2;

} CsrEventCsrUint32CsrCharString;



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

 *

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

CsrEventCsrUint32CsrCharString *CsrEventCsrUint32CsrCharString_struct(u16 primtype, u16 msgtype, u32 value1, CsrCharString *value2);

CsrEventCsrUint32CsrCharString *CsrEventCsrUint32CsrCharString_struct(u16 primtype, u16 msgtype, u32 value1, char *value2);



#ifdef __cplusplus

}

drivers/staging/csr/csr_log.h

+20 −20
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ CsrBool CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level); 
    do {                                                \

        if (!(cond))                                    \

        {                                               \

            CsrCharString *panic_arg = "[" __FILE__ ":" CSR_LOG_STRINGIFY(__LINE__) "] - " CSR_LOG_STRINGIFY(cond); \

            char *panic_arg = "[" __FILE__ ":" CSR_LOG_STRINGIFY(__LINE__) "] - " CSR_LOG_STRINGIFY(cond); \

            CsrPanic(CSR_TECH_FW, CSR_PANIC_FW_ASSERTION_FAIL, panic_arg); \

        }                                               \

    } while (0)
@@ -97,13 +97,13 @@ CsrBool CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level); 
typedef struct

{

    u16            primitiveType;

    const CsrCharString *primitiveName;

    const char *primitiveName;

    CsrMsgConvMsgEntry  *messageConv; /* Private - do not use */

} CsrLogPrimitiveInformation;



typedef struct

{

    const CsrCharString        *techVer;

    const char        *techVer;

    u32                   primitiveInfoCount;

    CsrLogPrimitiveInformation *primitiveInfo;

} CsrLogTechInformation;
@@ -140,9 +140,9 @@ typedef u32 bitmask32_t; 
#endif



/* DEPRECATED - replaced by csr_log_text.h */

void CsrLogTaskText(const CsrCharString *text,

void CsrLogTaskText(const char *text,

    u32 line,

    const CsrCharString *file);

    const char *file);



#define CSR_LOG_STATE_TRANSITION_MASK_FSM_NAME          (0x001)

#define CSR_LOG_STATE_TRANSITION_MASK_NEXT_STATE        (0x002)
@@ -155,15 +155,15 @@ void CsrLogTaskText(const CsrCharString *text, 
/* DEPRECATED - replaced by csr_log_text.h */

void CsrLogStateTransition(bitmask16_t mask,

    u32 identifier,

    const CsrCharString *fsm_name,

    const char *fsm_name,

    u32 prev_state,

    const CsrCharString *prev_state_str,

    const char *prev_state_str,

    u32 in_event,

    const CsrCharString *in_event_str,

    const char *in_event_str,

    u32 next_state,

    const CsrCharString *next_state_str,

    const char *next_state_str,

    u32 line,

    const CsrCharString *file);

    const char *file);



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

/*  BSP logging */
@@ -174,7 +174,7 @@ void CsrLogSchedDeinit(u8 thread_id); 
void CsrLogSchedStart(u8 thread_id);

void CsrLogSchedStop(u8 thread_id);



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

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

void CsrLogDeinitTask(u16 task_id);



void CsrLogActivate(CsrSchedQid tskid);
@@ -184,7 +184,7 @@ void CsrLogDeactivate(CsrSchedQid tskid); 
#define SYNERGY_SERIALIZER_TYPE_SER     (0x001)



void CsrLogMessagePut(u32 line,

    const CsrCharString *file,

    const char *file,

    CsrSchedQid src_task_id,

    CsrSchedQid dst_taskid,

    CsrSchedMsgId msg_id,
@@ -199,7 +199,7 @@ void CsrLogMessageGet(CsrSchedQid src_task_id, 
    const void *msg);



void CsrLogTimedEventIn(u32 line,

    const CsrCharString *file,

    const char *file,

    CsrSchedQid task_id,

    CsrSchedTid tid,

    CsrTime requested_delay,
@@ -213,14 +213,14 @@ void CsrLogTimedEventDone(CsrSchedQid task_id, 
    CsrSchedTid tid);



void CsrLogTimedEventCancel(u32 line,

    const CsrCharString *file,

    const char *file,

    CsrSchedQid task_id,

    CsrSchedTid tid,

    CsrBool cancel_res);



void CsrLogBgintRegister(u8 thread_id,

    CsrSchedBgint irq,

    const CsrCharString *callback,

    const char *callback,

    const void *ptr);

void CsrLogBgintUnregister(CsrSchedBgint irq);

void CsrLogBgintSet(CsrSchedBgint irq);
@@ -231,17 +231,17 @@ void CsrLogExceptionStateEvent(u16 prim_type, 
    CsrPrim msg_type,

    u16 state,

    u32 line,

    const CsrCharString *file);

    const char *file);

void CsrLogExceptionGeneral(u16 prim_type,

    u16 state,

    const CsrCharString *text,

    const char *text,

    u32 line,

    const CsrCharString *file);

    const char *file);

void CsrLogExceptionWarning(u16 prim_type,

    u16 state,

    const CsrCharString *text,

    const char *text,

    u32 line,

    const CsrCharString *file);

    const char *file);



#ifdef __cplusplus

}