1
0
mirror of https://github.com/morrownr/8821cu-20210916.git synced 2024-12-22 14:26:30 +00:00

cleaning up a few things

This commit is contained in:
morrownr 2022-12-11 23:28:17 -06:00
parent 24e1955db0
commit e061a4fd95
4 changed files with 38 additions and 35 deletions

View File

@ -2,6 +2,9 @@
# #
# Purpose: Allow easy access to specific driver options. # Purpose: Allow easy access to specific driver options.
# #
# Edit the following line to blacklist conflicting in-kernel drivers, should they exist.
blacklist rtw88_8821cu
#
# Warning: Some adapters based on the rtl8821cu chipset may require the # Warning: Some adapters based on the rtl8821cu chipset may require the
# `rtw_RFE_type` option to be set. If wifi or bluetooth does not work # `rtw_RFE_type` option to be set. If wifi or bluetooth does not work
# after driver installation, see the appropriate section in the below # after driver installation, see the appropriate section in the below
@ -68,7 +71,7 @@ options 8821cu rtw_drv_log_level=0 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_power_mgn
# ISO 3166-1 alpha-2 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 # 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 the US: rtw_country_code=US
# Example for Panama: rtw_country_code=PA # Example for Panama: rtw_country_code=PA

View File

@ -22,47 +22,47 @@ iw reg get
ISO 3166-1 alpha-2 Country Codes ISO 3166-1 alpha-2 Country Codes
Name Code Name Code
Afghanistan AF Afghanistan AF
Åland Islands AX Åland Islands AX
Albania AL Albania AL
Algeria DZ Algeria DZ
American American
Samoa AS Samoa AS
Andorra AD Andorra AD
Angola AO Angola AO
Anguilla AI Anguilla AI
Antarctica AQ Antarctica AQ
Antigua and Antigua and
Barbuda AG Barbuda AG
Argentina AR Argentina AR
Armenia AM Armenia AM
Aruba AW Aruba AW
Australia AU Australia AU
Austria AT Austria AT
Azerbaijan AZ Azerbaijan AZ
Bahamas BS Bahamas BS
Bahrain BH Bahrain BH
Bangladesh BD Bangladesh BD
Barbados BB Barbados BB
@ -165,7 +165,7 @@ Djibouti DJ
Dominica DM Dominica DM
Dominican Dominican
Republic DO Republic DO
>< ><

View File

@ -22,7 +22,7 @@ DRV_VERSION="5.12.0.4"
# Some distros have a not yet mainlined, patched-in kernel driver that # Some distros have a not yet mainlined, patched-in kernel driver that
# must be deactivated so as not to conflict with this driver. The # 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. # filename may need to change when the new in-kernel driver is mainlined.
BLACKLIST_FILE="rtw88_8821cu.conf" #BLACKLIST_FILE="rtw88_8821cu.conf"
KVER="$(uname -r)" KVER="$(uname -r)"
KARCH="$(uname -m)" KARCH="$(uname -m)"
@ -59,13 +59,13 @@ then
exit 1 exit 1
fi fi
# check to see if header files are installed # check to see if header files are installed (not sure if this can be done.)
if [ ! -d "/lib/modules/$(uname -r)/build" ]; then #if [ ! -d "/usr/src/linux-headers-/$(uname -r)/" ]; then
echo "Your kernel headers aren't properly installed." # echo "Your kernel headers aren't properly installed."
echo "Please consult your distro documentation." # echo "Please consult your distro documentation."
echo "Once the header files are installed, please run \"sudo ./${SCRIPT_NAME}\"" # echo "Once the header files are installed, please run \"sudo ./${SCRIPT_NAME}\""
exit 1 # exit 1
fi #fi
# check to ensure iw is installed # check to ensure iw is installed
if ! command -v iw >/dev/null 2>&1 if ! command -v iw >/dev/null 2>&1
@ -154,10 +154,10 @@ then
fi fi
# blacklist the in-kernel module (driver) so that there is no conflict # blacklist the in-kernel module (driver) so that there is no conflict
echo "Installing ${BLACKLIST_FILE} to: /etc/modprobe.d" #echo "Installing ${BLACKLIST_FILE} to: /etc/modprobe.d"
cp -f ${BLACKLIST_FILE} /etc/modprobe.d #cp -f ${BLACKLIST_FILE} /etc/modprobe.d
# sets module parameters (driver options) # 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

View File

@ -22,7 +22,7 @@ DRV_VERSION="5.12.0.4"
# Some distros have a not yet mainlined, patched-in kernel driver that # Some distros have a not yet mainlined, patched-in kernel driver that
# must be deactivated so as not to conflict with this driver. The # 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. # filename may need to change when the new in-kernel driver is mainlined.
BLACKLIST_FILE="rtw88_8821cu.conf" #BLACKLIST_FILE="rtw88_8821cu.conf"
KVER="$(uname -r)" KVER="$(uname -r)"
KARCH="$(uname -m)" KARCH="$(uname -m)"
@ -104,8 +104,8 @@ then
fi fi
fi fi
echo "Removing ${BLACKLIST_FILE} from /etc/modprobe.d" #echo "Removing ${BLACKLIST_FILE} from /etc/modprobe.d"
rm -f /etc/modprobe.d/${BLACKLIST_FILE} #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}"