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

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

staging: csr: remove CsrUint32 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 ab2b8c73

drivers/staging/csr/bh.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ bh_thread_function(void *arg) 
    unifi_priv_t *priv = (unifi_priv_t*)arg;

    CsrResult csrResult;

    long ret;

    CsrUint32 timeout, t;

    u32 timeout, t;

    struct uf_thread *this_thread;



    unifi_trace(priv, UDBG2, "bh_thread_function starting\n");

drivers/staging/csr/csr_framework_ext.h

+6 −6
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ CsrResult CsrEventCreate(CsrEventHandle *eventHandle); 
 *          CSR_FE_RESULT_INVALID_POINTER      in case the eventBits pointer is invalid

 *

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

CsrResult CsrEventWait(CsrEventHandle *eventHandle, u16 timeoutInMs, CsrUint32 *eventBits);

CsrResult CsrEventWait(CsrEventHandle *eventHandle, u16 timeoutInMs, u32 *eventBits);



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

 *  NAME
@@ -81,7 +81,7 @@ CsrResult CsrEventWait(CsrEventHandle *eventHandle, u16 timeoutInMs, CsrUint32 * 
 *          CSR_FE_RESULT_INVALID_HANDLE       in case the eventHandle is invalid

 *

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

CsrResult CsrEventSet(CsrEventHandle *eventHandle, CsrUint32 eventBits);

CsrResult CsrEventSet(CsrEventHandle *eventHandle, u32 eventBits);



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

 *  NAME
@@ -195,7 +195,7 @@ void CsrGlobalMutexUnlock(void); 
 *

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

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

    CsrUint32 stackSize, u16 priority,

    u32 stackSize, u16 priority,

    const CsrCharString *threadName, CsrThreadHandle *threadHandle);



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

#ifdef CSR_MEM_DEBUG

void *CsrMemAllocDebug(CsrSize size,

    const CsrCharString *file, CsrUint32 line);

    const CsrCharString *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, CsrUint32 line);

    const CsrCharString *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, CsrUint32 line);

    const CsrCharString *file, u32 line);

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

#else

void *CsrMemAllocDma(CsrSize size);

drivers/staging/csr/csr_framework_ext_types.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct CsrEvent 
{

    pthread_cond_t  event;

    pthread_mutex_t mutex;

    CsrUint32       eventBits;

    u32       eventBits;

};



typedef struct CsrEvent CsrEventHandle;

drivers/staging/csr/csr_lib.h

+8 −8
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ typedef struct 
{

    CsrPrim   type;

    u16 value1;

    CsrUint32 value2;

    u32 value2;

} CsrEventCsrUint16CsrUint32;



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

 *

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

CsrEventCsrUint16CsrUint32 *CsrEventCsrUint16CsrUint32_struct(u16 primtype, u16 msgtype, u16 value1, CsrUint32 value2);

CsrEventCsrUint16CsrUint32 *CsrEventCsrUint16CsrUint32_struct(u16 primtype, u16 msgtype, u16 value1, u32 value2);



typedef struct

{
@@ -135,7 +135,7 @@ CsrEventCsrUint16CsrCharString *CsrEventCsrUint16CsrCharString_struct(u16 primty 
typedef struct

{

    CsrPrim   type;

    CsrUint32 value;

    u32 value;

} CsrEventCsrUint32;



/*----------------------------------------------------------------------------*
@@ -146,12 +146,12 @@ typedef struct 
 *      Allocates and fills in a message with the signature CsrEventCsrUint32

 *

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

CsrEventCsrUint32 *CsrEventCsrUint32_struct(u16 primtype, u16 msgtype, CsrUint32 value);

CsrEventCsrUint32 *CsrEventCsrUint32_struct(u16 primtype, u16 msgtype, u32 value);



typedef struct

{

    CsrPrim   type;

    CsrUint32 value1;

    u32 value1;

    u16 value2;

} CsrEventCsrUint32CsrUint16;
@@ -163,12 +163,12 @@ typedef struct 
 *      Allocates and fills in a message with the signature CsrEventCsrUint32CsrUint16

 *

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

CsrEventCsrUint32CsrUint16 *CsrEventCsrUint32CsrUint16_struct(u16 primtype, u16 msgtype, CsrUint32 value1, CsrUint32 value2);

CsrEventCsrUint32CsrUint16 *CsrEventCsrUint32CsrUint16_struct(u16 primtype, u16 msgtype, u32 value1, u32 value2);



typedef struct

{

    CsrPrim        type;

    CsrUint32      value1;

    u32      value1;

    CsrCharString *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, CsrUint32 value1, CsrCharString *value2);

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



#ifdef __cplusplus

}

drivers/staging/csr/csr_log.h

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

/*  Filtering on environment specific log levels      */

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

typedef CsrUint32 CsrLogLevelEnvironment;

typedef u32 CsrLogLevelEnvironment;

#define CSR_LOG_LEVEL_ENVIRONMENT_OFF          ((CsrLogLevelEnvironment) 0x00000000) /* No environment data/events are logged */

#define CSR_LOG_LEVEL_ENVIRONMENT_BCI_ACL      ((CsrLogLevelEnvironment) 0x00000001) /* BlueCore Channel Interface HCI Acl data are logged */

#define CSR_LOG_LEVEL_ENVIRONMENT_BCI_HCI      ((CsrLogLevelEnvironment) 0x00000002) /* BlueCore Channel Interface HCI Cmd/Evt data are logged */
@@ -47,7 +47,7 @@ typedef CsrUint32 CsrLogLevelEnvironment; 
/*----------------------------------------------------*/

/*  Filtering on task specific log levels             */

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

typedef CsrUint32 CsrLogLevelTask;

typedef u32 CsrLogLevelTask;

#define CSR_LOG_LEVEL_TASK_OFF                 ((CsrLogLevelTask) 0x00000000) /* No events are logged for this task */

#define CSR_LOG_LEVEL_TASK_TEXT                ((CsrLogLevelTask) 0x00000001) /* Text strings printed by a task are logged NB: This bit does not affect the CSR_LOG_TEXT_LEVEL interface. This has to be configured separately */

#define CSR_LOG_LEVEL_TASK_TEXT_LOC            ((CsrLogLevelTask) 0x00000002) /* The locaction where the text string call occured are logged. NB: This is a supplement to CSR_LOG_LEVEL_TASK_TEXT, it has no effect without it */
@@ -104,7 +104,7 @@ typedef struct 
typedef struct

{

    const CsrCharString        *techVer;

    CsrUint32                   primitiveInfoCount;

    u32                   primitiveInfoCount;

    CsrLogPrimitiveInformation *primitiveInfo;

} CsrLogTechInformation;
@@ -113,7 +113,7 @@ typedef struct 
/*---------------------------------*/

typedef u8 bitmask8_t;

typedef u16 bitmask16_t;

typedef CsrUint32 bitmask32_t;

typedef u32 bitmask32_t;



#ifdef CSR_LOG_ENABLE

#ifdef CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER
@@ -141,7 +141,7 @@ typedef CsrUint32 bitmask32_t; 


/* DEPRECATED - replaced by csr_log_text.h */

void CsrLogTaskText(const CsrCharString *text,

    CsrUint32 line,

    u32 line,

    const CsrCharString *file);



#define CSR_LOG_STATE_TRANSITION_MASK_FSM_NAME          (0x001)
@@ -154,15 +154,15 @@ void CsrLogTaskText(const CsrCharString *text, 


/* DEPRECATED - replaced by csr_log_text.h */

void CsrLogStateTransition(bitmask16_t mask,

    CsrUint32 identifier,

    u32 identifier,

    const CsrCharString *fsm_name,

    CsrUint32 prev_state,

    u32 prev_state,

    const CsrCharString *prev_state_str,

    CsrUint32 in_event,

    u32 in_event,

    const CsrCharString *in_event_str,

    CsrUint32 next_state,

    u32 next_state,

    const CsrCharString *next_state_str,

    CsrUint32 line,

    u32 line,

    const CsrCharString *file);



/*---------------------------------*/
@@ -183,7 +183,7 @@ void CsrLogDeactivate(CsrSchedQid tskid); 
#define SYNERGY_SERIALIZER_TYPE_DUMP    (0x000)

#define SYNERGY_SERIALIZER_TYPE_SER     (0x001)



void CsrLogMessagePut(CsrUint32 line,

void CsrLogMessagePut(u32 line,

    const CsrCharString *file,

    CsrSchedQid src_task_id,

    CsrSchedQid dst_taskid,
@@ -198,7 +198,7 @@ void CsrLogMessageGet(CsrSchedQid src_task_id, 
    u16 prim_type,

    const void *msg);



void CsrLogTimedEventIn(CsrUint32 line,

void CsrLogTimedEventIn(u32 line,

    const CsrCharString *file,

    CsrSchedQid task_id,

    CsrSchedTid tid,
@@ -212,7 +212,7 @@ void CsrLogTimedEventFire(CsrSchedQid task_id, 
void CsrLogTimedEventDone(CsrSchedQid task_id,

    CsrSchedTid tid);



void CsrLogTimedEventCancel(CsrUint32 line,

void CsrLogTimedEventCancel(u32 line,

    const CsrCharString *file,

    CsrSchedQid task_id,

    CsrSchedTid tid,
@@ -230,17 +230,17 @@ void CsrLogBgintServiceDone(CsrSchedBgint irq); 
void CsrLogExceptionStateEvent(u16 prim_type,

    CsrPrim msg_type,

    u16 state,

    CsrUint32 line,

    u32 line,

    const CsrCharString *file);

void CsrLogExceptionGeneral(u16 prim_type,

    u16 state,

    const CsrCharString *text,

    CsrUint32 line,

    u32 line,

    const CsrCharString *file);

void CsrLogExceptionWarning(u16 prim_type,

    u16 state,

    const CsrCharString *text,

    CsrUint32 line,

    u32 line,

    const CsrCharString *file);



#ifdef __cplusplus