1
0
mirror of https://github.com/morrownr/8821cu-20210916.git synced 2024-11-26 15:26:24 +00:00

continued tweaks

This commit is contained in:
morrownr 2022-12-13 18:28:08 -06:00
parent 90ac86a039
commit ef15e0b822
5 changed files with 8 additions and 27 deletions

5
clean
View File

@ -1,5 +0,0 @@
#!/bin/bash
rmmod 8192cu
rmmod 8192ce
rmmod 8192du
rmmod 8192de

View File

@ -176,7 +176,7 @@
#define CONFIG_GLOBAL_UI_PID #define CONFIG_GLOBAL_UI_PID
/*#define CONFIG_RTW_80211K*/ #define CONFIG_RTW_80211K
/*#define CONFIG_ADAPTOR_INFO_CACHING_FILE */ /* now just applied on 8192cu only, should make it general... */ /*#define CONFIG_ADAPTOR_INFO_CACHING_FILE */ /* now just applied on 8192cu only, should make it general... */
/*#define CONFIG_RESUME_IN_WORKQUEUE */ /*#define CONFIG_RESUME_IN_WORKQUEUE */

View File

@ -19,10 +19,6 @@ SCRIPT_NAME="install-driver.sh"
SCRIPT_VERSION="20221208" SCRIPT_VERSION="20221208"
MODULE_NAME="8821cu" MODULE_NAME="8821cu"
DRV_VERSION="5.12.0.4" DRV_VERSION="5.12.0.4"
# Some distros have a not yet mainlined, patched-in kernel driver that
# must be deactivated so as not to conflict with this driver. The
# filename may need to change when the new in-kernel driver is mainlined.
#BLACKLIST_FILE="rtw88_8821cu.conf"
KVER="$(uname -r)" KVER="$(uname -r)"
KARCH="$(uname -m)" KARCH="$(uname -m)"
@ -139,12 +135,12 @@ echo "gcc --version="${gcc_ver}
# display ISO 3166-1 alpha-2 Country Code # display ISO 3166-1 alpha-2 Country Code
a2_country_code=$(iw reg get | grep -i country) a2_country_code=$(iw reg get | grep -i country)
echo "Country Code="${a2_country_code} echo "Country Code="${a2_country_code}
#if [[ $a2_country_code == *"00"* ]]; if [[ $a2_country_code == *"00"* ]];
#then then
# echo "The Country Code is not properly set." echo "The Country Code may not be properly set."
# echo "File alpha-2_Country_Codes is located in the driver directory." echo "File alpha-2_Country_Codes is located in the driver directory."
# echo "Please read and follow the directions in the file." echo "Please read and follow the directions in the file."
#fi fi
# display secure mode status # display secure mode status
# run if mokutil is installed # run if mokutil is installed
@ -153,10 +149,6 @@ then
mokutil --sb-state mokutil --sb-state
fi fi
# blacklist the in-kernel module (driver) so that there is no conflict
#echo "Installing ${BLACKLIST_FILE} to: /etc/modprobe.d"
#cp -f ${BLACKLIST_FILE} /etc/modprobe.d
# sets module parameters (driver options) and blacklisted modules # sets module parameters (driver options) and blacklisted modules
echo "Installing ${OPTIONS_FILE} to: /etc/modprobe.d" echo "Installing ${OPTIONS_FILE} to: /etc/modprobe.d"
cp -f ${OPTIONS_FILE} /etc/modprobe.d cp -f ${OPTIONS_FILE} /etc/modprobe.d
@ -216,6 +208,7 @@ else
then then
if [[ "$RESULT" = "3" ]] if [[ "$RESULT" = "3" ]]
then then
echo "This driver may already be installed."
echo "Run the following and then reattempt installation." echo "Run the following and then reattempt installation."
echo "$ sudo ./remove-driver.sh" echo "$ sudo ./remove-driver.sh"
exit $RESULT exit $RESULT

View File

@ -19,10 +19,6 @@ SCRIPT_NAME="remove-driver.sh"
SCRIPT_VERSION="20221207" SCRIPT_VERSION="20221207"
MODULE_NAME="8821cu" MODULE_NAME="8821cu"
DRV_VERSION="5.12.0.4" DRV_VERSION="5.12.0.4"
# Some distros have a not yet mainlined, patched-in kernel driver that
# must be deactivated so as not to conflict with this driver. The
# filename may need to change when the new in-kernel driver is mainlined.
#BLACKLIST_FILE="rtw88_8821cu.conf"
KVER="$(uname -r)" KVER="$(uname -r)"
KARCH="$(uname -m)" KARCH="$(uname -m)"
@ -104,8 +100,6 @@ then
fi fi
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" echo "Removing ${OPTIONS_FILE} from /etc/modprobe.d"
rm -f /etc/modprobe.d/${OPTIONS_FILE} rm -f /etc/modprobe.d/${OPTIONS_FILE}
echo "Removing source files from /usr/src/${DRV_NAME}-${DRV_VERSION}" echo "Removing source files from /usr/src/${DRV_NAME}-${DRV_VERSION}"

View File

@ -1 +0,0 @@
blacklist rtw88_8821cu