diff --git a/doc/泰芯Linux_WiFi_FMAC驱动开发指南.pdf b/doc/泰芯Linux_WiFi_FMAC驱动开发指南.pdf index 0693959..0ceccd3 100644 Binary files a/doc/泰芯Linux_WiFi_FMAC驱动开发指南.pdf and b/doc/泰芯Linux_WiFi_FMAC驱动开发指南.pdf differ diff --git a/hgic_def.h b/hgic_def.h index 8e30231..fb688cf 100644 --- a/hgic_def.h +++ b/hgic_def.h @@ -218,7 +218,7 @@ struct hgic_bus { #define _KERNEL_READ(fp, buff, size) kernel_read(fp, 0, buff, size) #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) #define setup_timer(a, b, c) timer_setup(a, b, 0) #define init_timer(...) #endif diff --git a/hgic_fmac/core.c b/hgic_fmac/core.c index 08589b7..41c0b3c 100644 --- a/hgic_fmac/core.c +++ b/hgic_fmac/core.c @@ -852,7 +852,7 @@ static void hgicf_detect_work(struct work_struct *work) } } -#if !defined(__RTOS__) && LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) +#if !defined(__RTOS__) && LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) static void hgicf_detect_timer(struct timer_list *t) { struct hgicf_wdev *hg = from_timer(hg, t, detect_tmr); diff --git a/tools/test_app/iwpriv.c b/tools/test_app/iwpriv.c index 29cf005..3daa6b5 100644 --- a/tools/test_app/iwpriv.c +++ b/tools/test_app/iwpriv.c @@ -608,9 +608,9 @@ int hgic_iwpriv_set_reassoc_wkhost(char *ifname, int enable) { return hgic_iwpriv_set_int(ifname, "reassoc_wkhost", enable); } -int hgic_iwpriv_set_wakeup_io(char *ifname, int wakeup_io) +int hgic_iwpriv_set_wakeup_io(char *ifname, int wakeup_io, int edge) { - return hgic_iwpriv_set_int(ifname, "wakeup_io", wakeup_io); + return hgic_iwpriv_set_ints(ifname, "wakeup_io", 2, wakeup_io, edge); } int hgic_iwpriv_set_dbginfo(char *ifname, int enable) { diff --git a/version.h b/version.h index 8c3e3ca..8a00d1a 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define SVN_VERSION "24338" +#define SVN_VERSION "25328"