Skip to content

Commit

Permalink
Fpv fixes (#1217)
Browse files Browse the repository at this point in the history
  • Loading branch information
cronyx authored Dec 28, 2023
1 parent 78043c6 commit 7a5f259
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 14 deletions.
10 changes: 5 additions & 5 deletions br-ext-chip-ingenic/board/t31/kernel/t31.generic-fpv.config
Original file line number Diff line number Diff line change
Expand Up @@ -850,17 +850,17 @@ CONFIG_ATH9K_HTC=m
# CONFIG_LIBERTAS is not set
# CONFIG_P54_COMMON is not set
# CONFIG_RT2X00 is not set
CONFIG_RTLWIFI=m
CONFIG_RTLWIFI_DEBUG=y
CONFIG_RTL8192CU=m
CONFIG_RTL8192C_COMMON=m
# CONFIG_RTLWIFI is not set
# CONFIG_RTLWIFI_DEBUG is not set
# CONFIG_RTL8192CU is not set
# CONFIG_RTL8192C_COMMON is not set
# CONFIG_WL_TI is not set
# CONFIG_ZD1211RW is not set
# CONFIG_MWIFIEX is not set
# CONFIG_BCM43341 is not set
# CONFIG_BCMDHD_1_141_66 is not set
# CONFIG_BCMDHD_AP6181 is not set
CONFIG_MT7601_STA=y
# CONFIG_MT7601_STA is not set

#
# Enable WiMAX (Networking options) to see the WiMAX drivers
Expand Down
8 changes: 4 additions & 4 deletions br-ext-chip-ingenic/configs/t31_fpv_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
# BR2_PACKAGE_WPA_SUPPLICANT_CLI is not set
# BR2_PACKAGE_WPA_SUPPLICANT_NL80211 is not set
# BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE is not set
BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y
# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC is not set
# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U is not set
# BR2_PACKAGE_RTL8188EU is not set
BR2_PACKAGE_RTL8812AU_OPENIPC=y

# WIREGUARD
BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
BR2_PACKAGE_WIREGUARD_TOOLS=y
# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set
# BR2_PACKAGE_WIREGUARD_TOOLS is not set

# FPV
BR2_PACKAGE_DATALINK=y
Expand Down
12 changes: 7 additions & 5 deletions general/package/rtl8812au-openipc/0001-disable_8814_8821.patch
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
--- a/Makefile 2023-11-08 03:23:56.619884059 +0300
+++ b/Makefile 2023-11-08 03:51:10.864807292 +0300
@@ -39,7 +39,7 @@
--- a/Makefile 2023-12-28 12:04:57.820353449 +0300
+++ b/Makefile 2023-12-28 12:31:56.636201729 +0300
@@ -39,8 +39,8 @@

########################## WIFI IC ############################
CONFIG_RTL8812A = y
-CONFIG_RTL8821A = y
-CONFIG_RTL8814A = y
+CONFIG_RTL8821A = n
CONFIG_RTL8814A = n
+CONFIG_RTL8814A = n
######################### Interface ###########################
CONFIG_USB_HCI = y
########################## Features ###########################
@@ -206,9 +206,9 @@
EXTRA_CFLAGS += -DDBG=0
endif

-ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), y_y)
-ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y)
+ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_n_n)

-EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau_wfb\"
Expand Down
36 changes: 36 additions & 0 deletions general/package/rtl8812au-openipc/0002-old_kernel_fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
diff -Naur a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
--- a/os_dep/linux/ioctl_cfg80211.c 2023-12-28 04:55:44.047232205 +0300
+++ b/os_dep/linux/ioctl_cfg80211.c 2023-12-28 04:58:01.223544721 +0300
@@ -4921,6 +4921,7 @@
//RTW_INFO("%s dvobj null\n", __func__);
}
switch(pHalData->current_channel_bw){
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
case CHANNEL_WIDTH_5:
//RTW_INFO("%s width 5\n", __func__);
width = NL80211_CHAN_WIDTH_5;
@@ -4931,6 +4932,7 @@
width = NL80211_CHAN_WIDTH_10;
center_freq = control_freq;
break;
+#endif
case CHANNEL_WIDTH_20:
//RTW_INFO("%s width 20\n", __func__);
width = NL80211_CHAN_WIDTH_20;
diff -Naur a/os_dep/linux/wifi_regd.c b/os_dep/linux/wifi_regd.c
--- a/os_dep/linux/wifi_regd.c 2023-11-08 03:19:52.064089100 +0300
+++ b/os_dep/linux/wifi_regd.c 2023-12-28 04:57:52.047523712 +0300
@@ -334,11 +334,11 @@
if (ch)
ch->flags &= ~(IEEE80211_CHAN_DISABLED|IEEE80211_CHAN_NO_HT40PLUS|
IEEE80211_CHAN_NO_HT40MINUS|IEEE80211_CHAN_NO_80MHZ|
- IEEE80211_CHAN_NO_160MHZ);
+ IEEE80211_CHAN_NO_160MHZ |
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0))
IEEE80211_CHAN_NO_IBSS|IEEE80211_CHAN_PASSIVE_SCAN);
#else
- IEEE80211_CHAN_NO_IR;
+ IEEE80211_CHAN_NO_IR);
#endif
//ch->flags = IEEE80211_CHAN_DISABLED;
}
15 changes: 15 additions & 0 deletions general/scripts/excludes/t31_fpv.list
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
etc/sensor/gc2083.yaml
etc/sensor/gc2083-t31.bin
etc/sensor/gc4023.yaml
etc/sensor/gc4023-t31.bin
etc/sensor/jxq03.yaml
etc/sensor/jxq03-t31.bin
etc/sensor/jxq03p.yaml
etc/sensor/jxq03p-t31.bin
etc/sensor/sc2232h.yaml
etc/sensor/sc2232h-t31.bin
lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_gc2083_t31.ko
lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_gc4023_t31.ko
lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxq03_t31.ko
lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxq03p_t31.ko
lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc2232h_t31.ko

0 comments on commit 7a5f259

Please sign in to comment.