Compare commits

...

2 Commits

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

812
Makefile

File diff suppressed because it is too large Load Diff

View File

@ -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

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 \
hal/phydm/phydm_antdiv.o\

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 \
hal/phydm/phydm_interface.o\

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)
{
#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)

View File

@ -1,4 +1,4 @@
EXTRA_CFLAGS += -DCONFIG_RTL8821C
ccflags-y += -DCONFIG_RTL8821C
ifeq ($(CONFIG_USB_HCI), y)
FILE_NAME = 8821cu