Переглянути джерело

Create new AUTODETECT variable, so as to be very specific what will happen

Scott Kilau 3 роки тому
батько
коміт
c69c19621d
3 змінених файлів з 17 додано та 10 видалено
  1. 4 3
      README.md
  2. 10 5
      SD_ROOT/wz_mini/etc/init.d/wz_user.sh
  3. 3 2
      SD_ROOT/wz_mini/wz_mini.conf

+ 4 - 3
README.md

@@ -152,12 +152,13 @@ USB Ethernet Adapter support:
 
 ```
 ENABLE_USB_ETH="true"
-ENABLE_USB_ETH_MODULE=""
+ENABLE_USB_ETH_MODULE_AUTODETECT="true"
+ENABLE_USB_ETH_MODULE_MANUAL=""
 ```
 
-To have the Ethernet NIC be auto-detected, set the ENABLE_USB_ETH_MODULE value to an empty string, eq: ""
+To have the Ethernet NIC be auto-detected and loaded automatically, set the ENABLE_USB_ETH_MODULE_AUTODETECT value to true.
 
-To load a specific USB Ethernet NIC driver, set ENABLE_USB_ETH_MODULE to one of the following:
+To load a specific USB Ethernet NIC driver, set ENABLE_USB_ETH_MODULE_MANUAL to one of the following:
 asix, ax88179_178a, cdc_ether, r8152
 
 The next time you boot your camera, make sure your USB Ethernet Adapter is connected to the camera and ethernet. The camera has to be setup initially with Wi-Fi for this to work.  After setup, Wi-Fi is no longer needed, as long as you are using the USB Ethernet Adapter.  Note that using USB Ethernet disables the onboard Wi-Fi.

+ 10 - 5
SD_ROOT/wz_mini/etc/init.d/wz_user.sh

@@ -277,11 +277,8 @@ if [[ "$ENABLE_USB_ETH" == "true" ]]; then
 
 	insmod $KMOD_PATH/kernel/drivers/net/usb/usbnet.ko
 
-	# Should we load a specific Ethernet driver, or try to auto-detect one
-	if [[ "$ENABLE_USB_ETH_MODULE" != "" ]]; then
-		insmod $KMOD_PATH/kernel/drivers/net/usb/$ENABLE_USB_ETH_MODULE.ko
-	else
-		# Auto-Detect an Ethernet Driver and load it
+	# Auto-Detect an Ethernet Driver and load it
+	if [[ "ENABLE_USB_ETH_MODULE_AUTODETECT" == "true" ]]; then
 		for DEVICE in `lsusb | awk '{print $6}'| tr '[:upper:]' '[:lower:]'`; do
 			case $DEVICE in
 			'077b:2226' | '0846:1040' | '2001:1a00' | '0b95:1720' | '07b8:420a' |\
@@ -311,6 +308,14 @@ if [[ "$ENABLE_USB_ETH" == "true" ]]; then
 		done
 	fi
 
+	# Manually load any other Ethernet Drivers if asked for
+	if [[ "ENABLE_USB_ETH_MODULE_MANUAL" != "" ]]; then
+		for i in $(echo "$ENABLE_USB_ETH_MODULES" | tr "," "\n")
+		do
+			insmod $KMOD_PATH/kernel/drivers/net/usb/$i.ko
+		done
+	fi
+
     if [[ "$BONDING_ENABLED" == "true" ]]; then
         if [[ "$BONDING_LINK_MONITORING_FREQ_MS" == "" ]]; then
             "$BONDING_LINK_MONITORING_FREQ_MS" = "100"

+ 3 - 2
SD_ROOT/wz_mini/wz_mini.conf

@@ -11,8 +11,9 @@ WEB_CAM_FPS_RATE="25"
 #####NETWORKING#####
 CUSTOM_HOSTNAME="WCV3"
 
-ENABLE_USB_ETH="false"
-ENABLE_USB_ETH_MODULE=""
+ENABLE_USB_ETH="true"
+ENABLE_USB_ETH_MODULE_AUTODETECT="true"
+ENABLE_USB_ETH_MODULE_MANUAL=""
 
 ENABLE_USB_DIRECT="false"
 USB_DIRECT_MAC_ADDR="02:01:02:03:04:08"