X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fstaging%2Fcsr%2Fcsr_framework_ext_types.h;h=575598cf69b2b04e4d341fdab434497e513cb2c2;hb=941906647a12749ae769b3414f652f1f03e22f69;hp=57194ee911ead3cfc2070c90cfdad725e44c9067;hpb=41494cbaeaed07a43e111b323d6da5e1d8dd7936;p=~andy%2Flinux diff --git a/drivers/staging/csr/csr_framework_ext_types.h b/drivers/staging/csr/csr_framework_ext_types.h index 57194ee911e..575598cf69b 100644 --- a/drivers/staging/csr/csr_framework_ext_types.h +++ b/drivers/staging/csr/csr_framework_ext_types.h @@ -2,11 +2,11 @@ #define CSR_FRAMEWORK_EXT_TYPES_H__ /***************************************************************************** - (c) Cambridge Silicon Radio Limited 2010 - All rights reserved and confidential information of CSR + (c) Cambridge Silicon Radio Limited 2010 + All rights reserved and confidential information of CSR - Refer to LICENSE.txt included with this source for details - on the license terms. + Refer to LICENSE.txt included with this source for details + on the license terms. *****************************************************************************/ @@ -17,47 +17,14 @@ #include #endif -#ifdef __cplusplus -extern "C" { -#endif - - #ifdef __KERNEL__ -struct CsrThread -{ - struct task_struct *thread_task; - char name[16]; -}; - -struct CsrEvent -{ - /* wait_queue for waking the kernel thread */ - wait_queue_head_t wakeup_q; - unsigned int wakeup_flag; -}; - -typedef struct CsrEvent CsrEventHandle; typedef struct semaphore CsrMutexHandle; -typedef struct CsrThread CsrThreadHandle; #else /* __KERNEL __ */ -struct CsrEvent -{ - pthread_cond_t event; - pthread_mutex_t mutex; - u32 eventBits; -}; - -typedef struct CsrEvent CsrEventHandle; typedef pthread_mutex_t CsrMutexHandle; -typedef pthread_t CsrThreadHandle; #endif /* __KERNEL__ */ -#ifdef __cplusplus -} -#endif - #endif