diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-12-11 15:23:16 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 15:23:16 -0500 |
| commit | 62eb734b490c3851deb5cdba99e477f102549b68 (patch) | |
| tree | 18acae2cc99087224d4156c7b026baaf5a61dd11 /drivers/staging/rt2860/rtmp_timer.h | |
| parent | 8a10a54656aff69de3530efa793cbec8d2b51d02 (diff) | |
Staging: rt28x0: remove typedefs (part three)
Remove misc typedefs.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860/rtmp_timer.h')
| -rw-r--r-- | drivers/staging/rt2860/rtmp_timer.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/staging/rt2860/rtmp_timer.h b/drivers/staging/rt2860/rtmp_timer.h index c81e507dbad..28b8ac6e835 100644 --- a/drivers/staging/rt2860/rtmp_timer.h +++ b/drivers/staging/rt2860/rtmp_timer.h | |||
| @@ -61,7 +61,7 @@ typedef void(*RTMP_TIMER_TASK_HANDLE) (void *SystemSpecific1, | |||
| 61 | void *SystemSpecific3); | 61 | void *SystemSpecific3); |
| 62 | #endif /* RTMP_TIMER_TASK_SUPPORT // */ | 62 | #endif /* RTMP_TIMER_TASK_SUPPORT // */ |
| 63 | 63 | ||
| 64 | typedef struct _RALINK_TIMER_STRUCT { | 64 | struct rt_ralink_timer { |
| 65 | struct timer_list TimerObj; /* Ndis Timer object */ | 65 | struct timer_list TimerObj; /* Ndis Timer object */ |
| 66 | BOOLEAN Valid; /* Set to True when call RTMPInitTimer */ | 66 | BOOLEAN Valid; /* Set to True when call RTMPInitTimer */ |
| 67 | BOOLEAN State; /* True if timer cancelled */ | 67 | BOOLEAN State; /* True if timer cancelled */ |
| @@ -73,32 +73,32 @@ typedef struct _RALINK_TIMER_STRUCT { | |||
| 73 | RTMP_TIMER_TASK_HANDLE handle; | 73 | RTMP_TIMER_TASK_HANDLE handle; |
| 74 | void *pAd; | 74 | void *pAd; |
| 75 | #endif /* RTMP_TIMER_TASK_SUPPORT // */ | 75 | #endif /* RTMP_TIMER_TASK_SUPPORT // */ |
| 76 | } RALINK_TIMER_STRUCT, *PRALINK_TIMER_STRUCT; | 76 | }; |
| 77 | 77 | ||
| 78 | #ifdef RTMP_TIMER_TASK_SUPPORT | 78 | #ifdef RTMP_TIMER_TASK_SUPPORT |
| 79 | typedef struct _RTMP_TIMER_TASK_ENTRY_ { | 79 | struct rt_rtmp_timer_task_entry { |
| 80 | RALINK_TIMER_STRUCT *pRaTimer; | 80 | struct rt_ralink_timer *pRaTimer; |
| 81 | struct _RTMP_TIMER_TASK_ENTRY_ *pNext; | 81 | struct rt_rtmp_timer_task_entry *pNext; |
| 82 | } RTMP_TIMER_TASK_ENTRY; | 82 | }; |
| 83 | 83 | ||
| 84 | #define TIMER_QUEUE_SIZE_MAX 128 | 84 | #define TIMER_QUEUE_SIZE_MAX 128 |
| 85 | typedef struct _RTMP_TIMER_TASK_QUEUE_ { | 85 | struct rt_rtmp_timer_task_queue { |
| 86 | unsigned int status; | 86 | unsigned int status; |
| 87 | unsigned char *pTimerQPoll; | 87 | unsigned char *pTimerQPoll; |
| 88 | RTMP_TIMER_TASK_ENTRY *pQPollFreeList; | 88 | struct rt_rtmp_timer_task_entry *pQPollFreeList; |
| 89 | RTMP_TIMER_TASK_ENTRY *pQHead; | 89 | struct rt_rtmp_timer_task_entry *pQHead; |
| 90 | RTMP_TIMER_TASK_ENTRY *pQTail; | 90 | struct rt_rtmp_timer_task_entry *pQTail; |
| 91 | } RTMP_TIMER_TASK_QUEUE; | 91 | }; |
| 92 | 92 | ||
| 93 | #define BUILD_TIMER_FUNCTION(_func) \ | 93 | #define BUILD_TIMER_FUNCTION(_func) \ |
| 94 | void rtmp_timer_##_func(unsigned long data) \ | 94 | void rtmp_timer_##_func(unsigned long data) \ |
| 95 | { \ | 95 | { \ |
| 96 | PRALINK_TIMER_STRUCT _pTimer = (PRALINK_TIMER_STRUCT)data; \ | 96 | struct rt_ralink_timer *_pTimer = (struct rt_ralink_timer *)data; \ |
| 97 | RTMP_TIMER_TASK_ENTRY *_pQNode; \ | 97 | struct rt_rtmp_timer_task_entry *_pQNode; \ |
| 98 | RTMP_ADAPTER *_pAd; \ | 98 | struct rt_rtmp_adapter *_pAd; \ |
| 99 | \ | 99 | \ |
| 100 | _pTimer->handle = _func; \ | 100 | _pTimer->handle = _func; \ |
| 101 | _pAd = (RTMP_ADAPTER *)_pTimer->pAd; \ | 101 | _pAd = (struct rt_rtmp_adapter *)_pTimer->pAd; \ |
| 102 | _pQNode = RtmpTimerQInsert(_pAd, _pTimer); \ | 102 | _pQNode = RtmpTimerQInsert(_pAd, _pTimer); \ |
| 103 | if ((_pQNode == NULL) && (_pAd->TimerQ.status & RTMP_TASK_CAN_DO_INSERT)) \ | 103 | if ((_pQNode == NULL) && (_pAd->TimerQ.status & RTMP_TASK_CAN_DO_INSERT)) \ |
| 104 | RTMP_OS_Add_Timer(&_pTimer->TimerObj, OS_HZ); \ | 104 | RTMP_OS_Add_Timer(&_pTimer->TimerObj, OS_HZ); \ |
| @@ -107,7 +107,7 @@ void rtmp_timer_##_func(unsigned long data) \ | |||
| 107 | #define BUILD_TIMER_FUNCTION(_func) \ | 107 | #define BUILD_TIMER_FUNCTION(_func) \ |
| 108 | void rtmp_timer_##_func(unsigned long data) \ | 108 | void rtmp_timer_##_func(unsigned long data) \ |
| 109 | { \ | 109 | { \ |
| 110 | PRALINK_TIMER_STRUCT pTimer = (PRALINK_TIMER_STRUCT) data; \ | 110 | struct rt_ralink_timer *pTimer = (struct rt_ralink_timer *)data; \ |
| 111 | \ | 111 | \ |
| 112 | _func(NULL, (void *)pTimer->cookie, NULL, pTimer); \ | 112 | _func(NULL, (void *)pTimer->cookie, NULL, pTimer); \ |
| 113 | if (pTimer->Repeat) \ | 113 | if (pTimer->Repeat) \ |