various updates

88x2bu.conf

@@ -13,6 +13,10 @@ options 88x2bu rtw_drv_log_level=1 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_switch_us
 #
 # Note: To activate USB3 mode, change rtw_switch_usb_mode above to rtw_switch_usb_mode=1
 #
+# Note: The above `options` line is a good default for managed mode. Below is
+# an example for AP mode. Modify as required after reading the documentation:
+#options 88x2bu rtw_drv_log_level=1 rtw_led_ctrl=1 rtw_vht_enable=2 rtw_power_mgnt=1 rtw_dfs_region_domain=1
+#
 # After editing is complete, save this file (if using nano: Ctrl + x, y, Enter)
 # and reboot to activate the changes.
 #
@@ -22,8 +26,8 @@ options 88x2bu rtw_drv_log_level=1 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_switch_us
 #
 # Log options ( rtw_drv_log_level )
 #
-# 0 = NONE (default)
+# 0 = NONE
-# 1 = ALWAYS
+# 1 = ALWAYS (default)
 # 2 = ERROR
 # 3 = WARNING
 # 4 = INFO
@@ -68,6 +72,14 @@ options 88x2bu rtw_drv_log_level=1 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_switch_us
 #
 # -----
 #
+# USB options: ( rtw_switch_usb_mode )
+#
+# 0 = No switch (default)
+# 1 = Switch from usb 2.0 to usb 3.0
+# 2 = Switch from usb 3.0 to usb 2.0
+#
+# -----
+#
 # DFS Options ( rtw_dfs_region_domain )
 #
 # 0 = NONE (default)
@@ -86,13 +98,6 @@ options 88x2bu rtw_drv_log_level=1 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_switch_us
 #
 # -----
 #
-# Select P2P interface in concurrent mode ( rtw_sel_p2p_iface )
-#
-# 0 = Sets interface 0 to be p2p interface
-# 1 = Sets interface 1 to be p2p interface (default)
-#
-# -----
-#
 # Wireless Mode options ( rtw_wireless_mode )
 #
 # 1  = 2.4GHz 802.11b
@@ -109,18 +114,18 @@ options 88x2bu rtw_drv_log_level=1 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_switch_us
 #
 # -----
 #
-# USB options ( rtw_switch_usb_mode )
+# Country Code options ( rtw_country_code )
 #
-# 0 = No switch (default)
+# Note: Allows the Country Code to be set in cases where it is unable to
-# 1 = Switch from usb 2.0 to usb 3.0
+# be obtained otherwise.
-# 2 = Switch from usb 3.0 to usb 2.0
 #
-# Note: This driver may need to stay in USB2 mode for AP mode operations
+# URL: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
-# on some platforms in order to avoid dropping offline. This issue has been
-# observed on the Raspberry Pi 4B with both the 32 and 64 bit versions of the
-# Raspberry Pi OS. This problem appears to be specific to the Raspberry Pi 4B
-# and adapters based on the rtl8812bu chipset.
 #
+# Example for the US: rtw_country_code=US
+# Example for Panama: rtw_country_code=PA
+# Example for Norway: rtw_country_code=NO
+# Example for Kuwait: rtw_country_code=KW
+# Example for Taiwan: rtw_country_code=TW
 #
 # -----
 #

Makefile

@@ -124,7 +124,7 @@ endif
 CONFIG_RTW_DEBUG = y
 # default log level is _DRV_INFO_ = 4,
 # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level.
-CONFIG_RTW_LOG_LEVEL = 0
+CONFIG_RTW_LOG_LEVEL = 1
 
 # enable /proc/net/rtlxxxx/ debug interfaces
 CONFIG_PROC_DEBUG = y

hal/led/hal_usb_led.c

@@ -1745,6 +1745,22 @@ void BlinkHandler(PLED_USB pLed)
 		return;
 	}
 
+	#ifdef CONFIG_SW_LED
+	// 1 is normal blinking
+	if (padapter->registrypriv.led_ctrl != 1) {
+		if (padapter->registrypriv.led_ctrl == 0)
+		{
+			// Set LED to off
+			pLed->BlinkingLedState = RTW_LED_OFF;
+		} else {
+			// Set LED to solid for 2 or greater
+			pLed->BlinkingLedState = RTW_LED_ON;
+		}
+		// Skip various switch cases where SwLedBlink*() is called below
+		pLed->CurrLedState = LED_UNKNOWN;
+	}
+	#endif
+
 	switch (ledpriv->LedStrategy) {
 	#if CONFIG_RTW_SW_LED_TRX_DA_CLASSIFY
 	case SW_LED_MODE_UC_TRX_ONLY:

hal/rtl8822b/usb/rtl8822bu_led.c

@@ -57,20 +57,12 @@ static void swledon(PADAPTER padapter, PLED_USB led)
 	case LED_PIN_LED1:
 	case LED_PIN_LED2:
 	default:
-		if (padapter->registrypriv.led_ctrl == 0) {
-			rtw_halmac_led_switch(adapter_to_dvobj(padapter), 0);
-		} else {
 		rtw_halmac_led_switch(adapter_to_dvobj(padapter), 1);
-		}
 		break;
 	}
 
-	if (padapter->registrypriv.led_ctrl == 0) {
-		led->bLedOn = _FALSE;
-	} else {
 	led->bLedOn = _TRUE;
 }
-}
 
 
 /*
@@ -91,19 +83,11 @@ static void swledoff(PADAPTER padapter, PLED_USB led)
 	case LED_PIN_LED1:
 	case LED_PIN_LED2:
 	default:
-		if (padapter->registrypriv.led_ctrl <= 1) {
 		rtw_halmac_led_switch(adapter_to_dvobj(padapter), 0);
-		} else {
-			rtw_halmac_led_switch(adapter_to_dvobj(padapter), 1);
-		}
 		break;
 	}
 
-	if (padapter->registrypriv.led_ctrl <= 1) {
 	led->bLedOn = _FALSE;
-	} else {
-		led->bLedOn = _TRUE;
-	}
 }
 
 /*

include/autoconf.h

@@ -178,7 +178,7 @@
 
 #define CONFIG_RTW_LED
 #ifdef CONFIG_RTW_LED
-	#define CONFIG_RTW_SW_LED
+//	#define CONFIG_RTW_SW_LED
 	#ifdef CONFIG_RTW_SW_LED
 		/* #define CONFIG_RTW_LED_HANDLED_BY_CMD_THREAD */
 	#endif

include/drv_types.h

@@ -242,7 +242,7 @@ struct registry_priv {
 #ifdef CONFIG_TX_EARLY_MODE
 	u8   early_mode;
 #endif
-#ifdef CONFIG_RTW_SW_LED
+#ifdef CONFIG_SW_LED
 	u8   led_ctrl;
 #endif
 #ifdef CONFIG_NARROWBAND_SUPPORTING

os_dep/linux/os_intfs.c

@@ -142,8 +142,8 @@ int rtw_check_fw_ps = 1;
 int rtw_early_mode = 1;
 #endif
 
-#ifdef CONFIG_RTW_SW_LED
+#ifdef CONFIG_SW_LED
-int rtw_led_ctrl = 1; /* default led blink */
+int rtw_led_ctrl = 1; // default to normal blinking
 #endif
 
 int rtw_usb_rxagg_mode = 2;/* RX_AGG_DMA=1, RX_AGG_USB=2 */
@@ -617,9 +617,9 @@ module_param(rtw_pci_aspm_enable, int, 0644);
 module_param(rtw_early_mode, int, 0644);
 #endif
 
-#ifdef CONFIG_RTW_SW_LED
+#ifdef CONFIG_SW_LED
 module_param(rtw_led_ctrl, int, 0644);
-MODULE_PARM_DESC(rtw_led_ctrl,"led control, 0:led off, 1:led blink, 2:led on");
+MODULE_PARM_DESC(rtw_led_ctrl,"Led Control: 0=Always off, 1=Normal blink, 2=Always on");
 #endif
 
 #ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE
@@ -1318,7 +1318,7 @@ uint loadparam(_adapter *padapter)
 #ifdef CONFIG_TX_EARLY_MODE
 	registry_par->early_mode = (u8)rtw_early_mode;
 #endif
-#ifdef CONFIG_RTW_SW_LED
+#ifdef CONFIG_SW_LED
 	registry_par->led_ctrl = (u8)rtw_led_ctrl;
 #endif
 	registry_par->trx_path_bmp = (u8)rtw_trx_path_bmp;

remove-driver.sh

@@ -4,7 +4,7 @@
 #
 # Supports dkms and non-dkms removals.
 
-# Copyright(c) 2022 Nick Morrow
+# Copyright(c) 2023 Nick Morrow
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 SCRIPT_NAME="remove-driver.sh"
-SCRIPT_VERSION="20221228"
+SCRIPT_VERSION="20230109"
 MODULE_NAME="88x2bu"
 DRV_VERSION="5.13.1"
 
@@ -57,7 +57,7 @@ do
 done
 
 # displays script name and version
-echo "Script:  ${SCRIPT_NAME} version ${SCRIPT_VERSION}"
+echo "Script:  ${SCRIPT_NAME} v${SCRIPT_VERSION}"
 
 # check for and remove non-dkms installations
 # standard naming