Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337135
b: refs/heads/master
c: cf174b0
h: refs/heads/master
i:
  337133: e8f03e6
  337131: 5befc74
  337127: 89ae6db
  337119: 069ba23
v: v3
  • Loading branch information
SeongJae Park authored and Greg Kroah-Hartman committed Oct 22, 2012
1 parent 6f50d4d commit 81ab8d8
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3f38ea7de4eb36dcb7eb05827d9ffb8a817b6563
refs/heads/master: cf174b0ef52ad8184779e1da4132e2d9d17247e5
33 changes: 15 additions & 18 deletions trunk/drivers/staging/csr/csr_framework_ext_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*****************************************************************************/

Expand All @@ -24,17 +24,15 @@ extern "C" {

#ifdef __KERNEL__

struct CsrThread
{
struct task_struct *thread_task;
char name[16];
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;
struct CsrEvent {
/* wait_queue for waking the kernel thread */
wait_queue_head_t wakeup_q;
unsigned int wakeup_flag;
};

typedef struct CsrEvent CsrEventHandle;
Expand All @@ -43,11 +41,10 @@ typedef struct CsrThread CsrThreadHandle;

#else /* __KERNEL __ */

struct CsrEvent
{
pthread_cond_t event;
pthread_mutex_t mutex;
u32 eventBits;
struct CsrEvent {
pthread_cond_t event;
pthread_mutex_t mutex;
u32 eventBits;
};

typedef struct CsrEvent CsrEventHandle;
Expand Down

0 comments on commit 81ab8d8

Please sign in to comment.