mir/rtl8821cu
2
0
Fork 0
mirror of https://github.com/morrownr/8821cu-20210916 synced 2025-08-22 02:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: mir:132dcf025806a436b9a95fb4af24eacfd07222f5
Branches Tags
mir:main
mir:revert-168-main
...
compare: mir:d74134a1c68f59f2b80cdd6c6afb8c1a8a687cbf
Branches Tags
mir:main
mir:revert-168-main

2 Commits
132dcf0258 ... d74134a1c6

Author SHA1 Message Date
morrownr
d74134a1c6
Merge pull request #179 from domin144/fix_6.15 
fix build for kernel 6.15
 2025-05-08 14:26:21 -05:00
Dominik Wójt
d75ea87da4 fix build for kernel 6.15 2025-05-06 08:13:28 +02:00
6 changed files with 423 additions and 411 deletions
Show Stats Expand all files Collapse all files

812
Makefile
View File

File diff suppressed because it is too large Load Diff

4
docs/Concurrent_Mode.md
View File

@ -35,13 +35,13 @@ ${EDITOR} Makefile
Change the following line: Change the following line:
``` ```
#EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE #ccflags-y += -DCONFIG_CONCURRENT_MODE
``` ```
to to
``` ```
EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE ccflags-y += -DCONFIG_CONCURRENT_MODE
``` ```
and then install the driver per the installation steps. If and then install the driver per the installation steps. If

4
hal/phydm/phydm.mk
View File

@ -1,4 +1,4 @@
EXTRA_CFLAGS += -I$(src)/hal/phydm ccflags-y += -I$(src)/hal/phydm
_PHYDM_FILES := hal/phydm/phydm_debug.o \ _PHYDM_FILES := hal/phydm/phydm_debug.o \
hal/phydm/phydm_antdiv.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_dpk_8723f.o\
hal/phydm/halrf/$(RTL871X)/halrf_rfk_init_8723f.o\ hal/phydm/halrf/$(RTL871X)/halrf_rfk_init_8723f.o\
hal/phydm/halrf/$(RTL871X)/halhwimg8723f_rf.o hal/phydm/halrf/$(RTL871X)/halhwimg8723f_rf.o
endif endif

2
hal/phydm/sd4_phydm_2_kernel.mk
View File

@ -1,4 +1,4 @@
EXTRA_CFLAGS += -I$(src)/hal/phydm ccflags-y += -I$(src)/hal/phydm
_PHYDM_FILES := hal/phydm/phydm_debug.o \ _PHYDM_FILES := hal/phydm/phydm_debug.o \
hal/phydm/phydm_interface.o\ hal/phydm/phydm_interface.o\

8
include/osdep_service_linux.h
View File

@ -387,12 +387,20 @@ __inline static void _set_timer(_timer *ptimer, u32 delay_time)
__inline static void _cancel_timer(_timer *ptimer, u8 *bcancelled) __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; *bcancelled = del_timer_sync(&ptimer->timer) == 1 ? 1 : 0;
#endif
} }
__inline static void _cancel_timer_async(_timer *ptimer) __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); del_timer(&ptimer->timer);
#endif
} }
static inline void _init_workitem(_workitem *pwork, void *pfunc, void *cntx) static inline void _init_workitem(_workitem *pwork, void *pfunc, void *cntx)

4
rtl8821c.mk
View File

@ -1,4 +1,4 @@
EXTRA_CFLAGS += -DCONFIG_RTL8821C ccflags-y += -DCONFIG_RTL8821C
ifeq ($(CONFIG_USB_HCI), y) ifeq ($(CONFIG_USB_HCI), y)
FILE_NAME = 8821cu FILE_NAME = 8821cu
@ -42,4 +42,4 @@ _BTC_FILES += hal/btc/halbtc8821cwifionly.o
ifeq ($(CONFIG_BT_COEXIST), y) ifeq ($(CONFIG_BT_COEXIST), y)
_BTC_FILES += hal/btc/halbtc8821c1ant.o \ _BTC_FILES += hal/btc/halbtc8821c1ant.o \
hal/btc/halbtc8821c2ant.o hal/btc/halbtc8821c2ant.o
endif endif