major upgrade to scripts

88x2bu.conf

@@ -2,8 +2,14 @@
 #
 # Purpose: Allow easy access to specific driver options.
 #
+# Note:	pull-request: wireless-next-2022-12-12
+# 		wireless-next patches for v6.2
+#		wifi: rtw88: Add rtw8822bu chipset support
+# The following line blacklists the above in-kernel driver.
+blacklist rtw88_8822bu
+#
 # Edit the following line to change, add or delete options:
-options 88x2bu rtw_drv_log_level=0 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_power_mgnt=1 rtw_switch_usb_mode=0
+options 88x2bu rtw_drv_log_level=0 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_switch_usb_mode=0
 #
 # After editing is complete, save this file (if using nano: Ctrl + x, y, Enter)
 # and reboot to activate the changes.
@@ -73,16 +79,18 @@ options 88x2bu rtw_drv_log_level=0 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_power_mgn
 #
 # -----
 #
-# Country Code options ( rtw_country_code )
+# ISO 3166-1 alpha-2 Country Code options ( rtw_country_code )
 #
 # Note: Allows the Country Code to be set in cases where it is unable to
-# be obtained from the operating system.
+# be obtained otherwise.
 #
 # 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
+#
+# ISO 3166-1 alpha-2 codes: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
 # 
 # -----
 #

ARM64_RPI.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-# Purpose: Change settings in the Makefile to support compiling 64 bit
-# operating systems for Raspberry Pi Hardware.
-#
-# To make this file executable:
-#
-# $ chmod +x ARM64_RPI.sh
-#
-# To execute this file:
-#
-# $ ./ARM64_RPI.sh
-
-sed -i 's/CONFIG_PLATFORM_I386_PC = y/CONFIG_PLATFORM_I386_PC = n/g' Makefile
-
-sed -i 's/CONFIG_PLATFORM_ARM_RPI = y/CONFIG_PLATFORM_ARM_RPI = n/g' Makefile
-
-sed -i 's/CONFIG_PLATFORM_ARM64_RPI = n/CONFIG_PLATFORM_ARM64_RPI = y/g' Makefile
-RESULT=$?
-
-if [[ "$RESULT" != "0" ]]; then
-	echo "An error occurred and Raspberry Pi OS (64 bit) support was not turned on in Makefile."
-	exit 1
-else
-	echo "Raspberry Pi OS (64 bit) support was turned on in Makefile as planned."
-	exit 0
-fi

ARM_RPI.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# Purpose: Change settings in the Makefile to support compiling 32 bit
-# operating systems for Raspberry Pi Hardware.
-#
-# To make this file executable (if necessary):
-#
-# $ chmod +x ARM_RPI.sh
-#
-# To execute this file:
-#
-# $ ./ARM_RPI.sh
-
-# getconf LONG_BIT (need to work on this)
-
-sed -i 's/CONFIG_PLATFORM_I386_PC = y/CONFIG_PLATFORM_I386_PC = n/g' Makefile
-
-sed -i 's/CONFIG_PLATFORM_ARM_RPI = n/CONFIG_PLATFORM_ARM_RPI = y/g' Makefile
-RESULT=$?
-
-if [[ "$RESULT" != "0" ]]; then
-	echo "An error occurred and Raspberry Pi OS (32 bit) support was not turned on in Makefile."
-	exit 1
-else
-	echo "Raspberry Pi OS (32 bit) support was turned on in Makefile as planned."
-	exit 0
-fi
-
-sed -i 's/CONFIG_PLATFORM_ARM64_RPI = y/CONFIG_PLATFORM_ARM64_RPI = n/g' Makefile

Kconfig

@@ -1,7 +1,6 @@
 config RTL8822BU
 	tristate "Realtek 8822B USB WiFi"
 	depends on USB
-	select WIRELESS_EXT
 	help
 	  Help message of RTL8822BU
 

LICENSE

@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2021 Realtek Corporation.
+ * Copyright(c) 2007 - 2022 Realtek Corporation.
  *
  * 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

cmode-off.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# 2021-12-18
-#
-# Purpose: Turn Concurrent Mode off.
-#
-# To make this file executable:
-#
-# $ chmod +x edit-options.sh
-#
-# To execute this file:
-#
-# $ ./cmode-off.sh
-
-sed -i 's/CONFIG_CONCURRENT_MODE = y/CONFIG_CONCURRENT_MODE = n/g' Makefile
-RESULT=$?
-
-if [[ "$RESULT" != "0" ]]; then
-	echo "An error occurred and Concurrent Mode was not turned off in Makefile."
-	exit 1
-else
-	echo "Concurrent Mode was turned off in Makefile as planned."
-fi

cmode-on.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# 2021-12-03
-#
-# Purpose: Turn Concurrent Mode on.
-#
-# To make this file executable:
-#
-# $ chmod +x edit-options.sh
-#
-# To execute this file:
-#
-# $ ./cmode-on.sh
-
-sed -i 's/CONFIG_CONCURRENT_MODE = n/CONFIG_CONCURRENT_MODE = y/g' Makefile
-RESULT=$?
-
-if [[ "$RESULT" != "0" ]]; then
-	echo "An error occurred and Concurrent Mode was not turned on in Makefile."
-	exit 1
-else
-	echo "Concurrent Mode was turned on in Makefile as planned."
-fi

remove-driver.sh

@@ -4,11 +4,21 @@
 #
 # Supports dkms and non-dkms removals.
 
+# Copyright(c) 2022 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
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
 SCRIPT_NAME="remove-driver.sh"
-SCRIPT_VERSION="20221204"
+SCRIPT_VERSION="20221218"
 MODULE_NAME="88x2bu"
 DRV_VERSION="5.13.1"
-OPTIONS_FILE="${MODULE_NAME}.conf"
 
 KVER="$(uname -r)"
 KARCH="$(uname -m)"
@@ -17,10 +27,7 @@ MODDESTDIR="/lib/modules/${KVER}/kernel/drivers/net/wireless/"
 
 DRV_NAME="rtl${MODULE_NAME}"
 DRV_DIR="$(pwd)"
-
-# Some distros have a non-mainlined, patched-in kernel driver
-# that has to be deactivated.
-BLACKLIST_FILE="rtw88_8822bu.conf"
+OPTIONS_FILE="${MODULE_NAME}.conf"
 
 # check to ensure sudo was used
 if [[ $EUID -ne 0 ]]
@@ -62,10 +69,10 @@ fi
 
 # information that helps with bug reports
 
-# kernel
+# display kernel version
 echo "Linux Kernel=${KVER}"
 
-# architecture - for ARM: aarch64 = 64 bit, armv7l = 32 bit
+# display architecture
 echo "CPU Architecture=${KARCH}"
 
 # determine if dkms is installed and run the appropriate routines
@@ -93,8 +100,6 @@ then
 	fi
 fi
 
-echo "Removing ${BLACKLIST_FILE} from /etc/modprobe.d"
-rm -f /etc/modprobe.d/${BLACKLIST_FILE}
 echo "Removing ${OPTIONS_FILE} from /etc/modprobe.d"
 rm -f /etc/modprobe.d/${OPTIONS_FILE}
 echo "Removing source files from /usr/src/${DRV_NAME}-${DRV_VERSION}"

rtw88_8822bu.conf

@@ -1 +0,0 @@
-blacklist rtw88_8822bu