mirrors/rtl8812au
1
0
Fork 0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2024-11-23 05:44:40 +00:00
Code Releases Activity

Merge pull request #2 from aircrack-ng/v5.1.5

Browse Source 
Merging changes
This commit is contained in:
Christian B 2018-01-08 14:31:22 +01:00 committed by GitHub
commit 6de9a7a1d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hal/phydm/phydm_types.h
View File

@ -153,7 +153,11 @@ typedef enum _RT_SPINLOCK_TYPE{
typedef struct rtl8192cd_priv *prtl8192cd_priv; typedef struct rtl8192cd_priv *prtl8192cd_priv;
typedef struct stat_info STA_INFO_T,*PSTA_INFO_T; typedef struct stat_info STA_INFO_T,*PSTA_INFO_T;
#if defined (LINUX_VERSION_CODE) && (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
typedef struct legacy_timer_emu RT_TIMER, *PRT_TIMER;
#else
typedef struct timer_list RT_TIMER, *PRT_TIMER; typedef struct timer_list RT_TIMER, *PRT_TIMER;
#endif
typedef void * RT_TIMER_CALL_BACK; typedef void * RT_TIMER_CALL_BACK;
#ifdef CONFIG_PCI_HCI #ifdef CONFIG_PCI_HCI
@ -223,7 +227,11 @@ typedef enum _RT_SPINLOCK_TYPE{
#define ODM_ENDIAN_TYPE ODM_ENDIAN_BIG #define ODM_ENDIAN_TYPE ODM_ENDIAN_BIG
#endif #endif
#if defined (LINUX_VERSION_CODE) && (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
typedef struct legacy_timer_emu RT_TIMER, *PRT_TIMER;
#else
typedef struct timer_list RT_TIMER, *PRT_TIMER; typedef struct timer_list RT_TIMER, *PRT_TIMER;
#endif
typedef void * RT_TIMER_CALL_BACK; typedef void * RT_TIMER_CALL_BACK;
#define STA_INFO_T struct sta_info #define STA_INFO_T struct sta_info
#define PSTA_INFO_T struct sta_info * #define PSTA_INFO_T struct sta_info *

4
include/osdep_service.h
View File

@ -321,8 +321,12 @@ extern void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc);
__inline static unsigned char _cancel_timer_ex(_timer *ptimer) __inline static unsigned char _cancel_timer_ex(_timer *ptimer)
{ {
#ifdef PLATFORM_LINUX #ifdef PLATFORM_LINUX
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
return del_timer_sync(&ptimer->t);
#else
return del_timer_sync(ptimer); return del_timer_sync(ptimer);
#endif #endif
#endif
#ifdef PLATFORM_FREEBSD #ifdef PLATFORM_FREEBSD
_cancel_timer(ptimer, 0); _cancel_timer(ptimer, 0);
return 0; return 0;

29
include/osdep_service_linux.h
View File

@ -137,7 +137,15 @@ typedef spinlock_t _lock;
#else #else
typedef struct semaphore _mutex; typedef struct semaphore _mutex;
#endif #endif
typedef struct timer_list _timer; #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
typedef struct legacy_timer_emu {
struct timer_list t;
void (*function)(unsigned long);
unsigned long data;
} _timer;
#else
typedef struct timer_list _timer;
#endif
struct __queue { struct __queue {
struct list_head queue; struct list_head queue;
@ -269,22 +277,41 @@ __inline static void rtw_list_delete(_list *plist)
} }
#define RTW_TIMER_HDL_ARGS void *FunctionContext #define RTW_TIMER_HDL_ARGS void *FunctionContext
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
static void legacy_timer_emu_func(struct timer_list *t)
{
struct legacy_timer_emu *lt = from_timer(lt, t, t);
lt->function(lt->data);
}
#endif
__inline static void _init_timer(_timer *ptimer, _nic_hdl nic_hdl, void *pfunc, void *cntx) __inline static void _init_timer(_timer *ptimer, _nic_hdl nic_hdl, void *pfunc, void *cntx)
{ {
/* setup_timer(ptimer, pfunc,(u32)cntx); */ /* setup_timer(ptimer, pfunc,(u32)cntx); */
ptimer->function = pfunc; ptimer->function = pfunc;
ptimer->data = (unsigned long)cntx; ptimer->data = (unsigned long)cntx;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
timer_setup(&ptimer->t, legacy_timer_emu_func, 0);
#else
init_timer(ptimer); init_timer(ptimer);
#endif
} }
__inline static void _set_timer(_timer *ptimer, u32 delay_time) __inline static void _set_timer(_timer *ptimer, u32 delay_time)
{ {
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
mod_timer(&ptimer->t, (jiffies+(delay_time*HZ/1000)));
#else
mod_timer(ptimer , (jiffies + (delay_time * HZ / 1000))); mod_timer(ptimer , (jiffies + (delay_time * HZ / 1000)));
#endif
} }
__inline static void _cancel_timer(_timer *ptimer, u8 *bcancelled) __inline static void _cancel_timer(_timer *ptimer, u8 *bcancelled)
{ {
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
del_timer_sync(&ptimer->t);
#else
del_timer_sync(ptimer); del_timer_sync(ptimer);
#endif
*bcancelled = 1; *bcancelled = 1;
} }