Ver Fonte

add user selectable ethernet modules to config

Alfonso Gamboa há 3 anos atrás
pai
commit
d20d1a23a3
4 ficheiros alterados com 12 adições e 4 exclusões
  1. 4 1
      README.md
  2. 5 1
      SD_ROOT/wz_mini/etc/init.d/wz_user.sh
  3. 1 0
      SD_ROOT/wz_mini/wz_mini.conf
  4. 2 2
      file.chk

+ 4 - 1
README.md

@@ -149,9 +149,12 @@ USB Ethernet Adapter support:
 
 ```
 ENABLE_USB_ETH="true"
+ENABLE_USB_ETH_MODULES="asix,r8152,cdc_ether"
 ```
 
-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.
+available modules: 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.  Specify the driver you need for your specific USB Ethernet adapter. asix is listed by default.
 
 ---
 

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

@@ -227,7 +227,11 @@ fi
 if [[ "$ENABLE_USB_ETH" == "true" ]]; then
 
 	insmod $KMOD_PATH/kernel/drivers/net/usb/usbnet.ko
-        insmod $KMOD_PATH/kernel/drivers/net/usb/asix.ko
+
+	for i in $(echo $ENABLE_USB_ETH_MODULES | tr "," "\n")
+	do
+	insmod $KMOD_PATH/kernel/drivers/net/usb/$i.ko
+	done
 
 	if [[ "$ENABLE_SWAP" == "true" ]]; then
 	echo "swap already enabled"

+ 1 - 0
SD_ROOT/wz_mini/wz_mini.conf

@@ -12,6 +12,7 @@ WEB_CAM_FPS_RATE="25"
 HOSTNAME="WCV3"
 
 ENABLE_USB_ETH="false"
+ENABLE_USB_ETH_MODULES="asix"
 
 ENABLE_USB_DIRECT="false"
 USB_DIRECT_MAC_ADDR="02:01:02:03:04:08"

+ 2 - 2
file.chk

@@ -3,7 +3,7 @@ d41d8cd98f00b204e9800998ecf8427e  SD_ROOT/wz_mini/mnt/.gitignore
 34c6a4c3a941ff2becd9f487826d7692  SD_ROOT/wz_mini/etc/uvc.config
 b4e404d9205a8e139571d4e5d2b55e92  SD_ROOT/wz_mini/etc/init.d/wz_cam.sh
 a9b1a18021476b492c2f4960a9cd1656  SD_ROOT/wz_mini/etc/init.d/v3_init.sh
-3fda84385377d0242f615be17ae8c3ad  SD_ROOT/wz_mini/etc/init.d/wz_user.sh
+0bd12f2862cfaea0fecd8e654bb21bd2  SD_ROOT/wz_mini/etc/init.d/wz_user.sh
 86082f8c1b7de18463731372bac630d1  SD_ROOT/wz_mini/etc/init.d/wz_post.sh
 e3034eac02d8eda9902ca9cf89f0a586  SD_ROOT/wz_mini/etc/inittab
 8b5e58acfcbb20034dc4873a08b45fd9  SD_ROOT/wz_mini/etc/profile
@@ -161,5 +161,5 @@ f1bf61ecda401f1a70f8942a27fa96e2  SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan
 14865a6e2e2df87a8362c6f20377a934  SD_ROOT/wz_mini/lib/libtinyalsa.so.2
 bd383994491e4bdca81788c168feb2eb  SD_ROOT/wz_mini/lib/libasound.so.2
 f6f0d5a9ebd916de6bdb9695067809ae  SD_ROOT/wz_mini/lib/libaudioProcess.so
-71359e5e4b7a478679db545210abeed6  SD_ROOT/wz_mini/wz_mini.conf
+48ec61d50001185a5261182ed26a1144  SD_ROOT/wz_mini/wz_mini.conf
 d41d8cd98f00b204e9800998ecf8427e  SD_ROOT/wz_mini/tmp/.gitignore