mirror of
https://github.com/morrownr/8821cu-20210916
synced 2025-08-22 02:02:25 +00:00
Merge pull request #179 from domin144/fix_6.15
fix build for kernel 6.15
This commit is contained in:
commit
d74134a1c6
@ -35,13 +35,13 @@ ${EDITOR} Makefile
|
||||
Change the following line:
|
||||
|
||||
```
|
||||
#EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
|
||||
#ccflags-y += -DCONFIG_CONCURRENT_MODE
|
||||
```
|
||||
|
||||
to
|
||||
|
||||
```
|
||||
EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
|
||||
ccflags-y += -DCONFIG_CONCURRENT_MODE
|
||||
```
|
||||
|
||||
and then install the driver per the installation steps. If
|
||||
|
@ -1,4 +1,4 @@
|
||||
EXTRA_CFLAGS += -I$(src)/hal/phydm
|
||||
ccflags-y += -I$(src)/hal/phydm
|
||||
|
||||
_PHYDM_FILES := hal/phydm/phydm_debug.o \
|
||||
hal/phydm/phydm_antdiv.o\
|
||||
@ -245,4 +245,4 @@ _PHYDM_FILES += hal/phydm/$(RTL871X)/halhwimg8723f_bb.o\
|
||||
hal/phydm/halrf/$(RTL871X)/halrf_dpk_8723f.o\
|
||||
hal/phydm/halrf/$(RTL871X)/halrf_rfk_init_8723f.o\
|
||||
hal/phydm/halrf/$(RTL871X)/halhwimg8723f_rf.o
|
||||
endif
|
||||
endif
|
||||
|
@ -1,4 +1,4 @@
|
||||
EXTRA_CFLAGS += -I$(src)/hal/phydm
|
||||
ccflags-y += -I$(src)/hal/phydm
|
||||
|
||||
_PHYDM_FILES := hal/phydm/phydm_debug.o \
|
||||
hal/phydm/phydm_interface.o\
|
||||
|
@ -387,12 +387,20 @@ __inline static void _set_timer(_timer *ptimer, u32 delay_time)
|
||||
|
||||
__inline static void _cancel_timer(_timer *ptimer, u8 *bcancelled)
|
||||
{
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0))
|
||||
*bcancelled = timer_delete_sync(&ptimer->timer) == 1 ? 1 : 0;
|
||||
#else
|
||||
*bcancelled = del_timer_sync(&ptimer->timer) == 1 ? 1 : 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
__inline static void _cancel_timer_async(_timer *ptimer)
|
||||
{
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0))
|
||||
timer_delete(&ptimer->timer);
|
||||
#else
|
||||
del_timer(&ptimer->timer);
|
||||
#endif
|
||||
}
|
||||
|
||||
static inline void _init_workitem(_workitem *pwork, void *pfunc, void *cntx)
|
||||
|
@ -1,4 +1,4 @@
|
||||
EXTRA_CFLAGS += -DCONFIG_RTL8821C
|
||||
ccflags-y += -DCONFIG_RTL8821C
|
||||
|
||||
ifeq ($(CONFIG_USB_HCI), y)
|
||||
FILE_NAME = 8821cu
|
||||
@ -42,4 +42,4 @@ _BTC_FILES += hal/btc/halbtc8821cwifionly.o
|
||||
ifeq ($(CONFIG_BT_COEXIST), y)
|
||||
_BTC_FILES += hal/btc/halbtc8821c1ant.o \
|
||||
hal/btc/halbtc8821c2ant.o
|
||||
endif
|
||||
endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user