瀏覽代碼

fix module loading order for usb-direct mode

Alfonso Gamboa 3 年之前
父節點
當前提交
f37d3a6880
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 2 1
      SD_ROOT/wz_mini/etc/init.d/wz_user.sh
  2. 1 1
      file.chk

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

@@ -263,12 +263,13 @@ if [[ "$ENABLE_USB_DIRECT" == "true" ]]; then
 		devmem 0x10000040 32 0x0b000FFF
 	fi
 
+	insmod $KMOD_PATH/kernel/drivers/usb/gadget/libcomposite.ko
+
 	if [[ "$V2" == "false" ]]; then
 	insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/drivers/usb/gadget/u_ether.ko
 	insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/drivers/usb/gadget/usb_f_ncm.ko
 	fi
 
-	insmod $KMOD_PATH/kernel/drivers/usb/gadget/libcomposite.ko
 	insmod $KMOD_PATH/kernel/drivers/usb/gadget/g_ncm.ko iManufacturer=wz_mini_ncm host_addr=$host_macaddr dev_addr=$USB_DIRECT_MAC_ADDR
 
 	sleep 1

+ 1 - 1
file.chk

@@ -3,7 +3,7 @@ d41d8cd98f00b204e9800998ecf8427e  SD_ROOT/wz_mini/mnt/.gitignore
 34c6a4c3a941ff2becd9f487826d7692  SD_ROOT/wz_mini/etc/uvc.config
 58d3a10a80422e3aa1b49b046e17db5c  SD_ROOT/wz_mini/etc/init.d/wz_cam.sh
 0f0cb8cbbf7007cda59dc684c37d185f  SD_ROOT/wz_mini/etc/init.d/v3_init.sh
-d9738d561929cbfd15a2bc7da5dd9227  SD_ROOT/wz_mini/etc/init.d/wz_user.sh
+af879f1b6fb23c569f1fef490bbf8566  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
 840aa9c26726201f7cffbf001bee193a  SD_ROOT/wz_mini/etc/uvc_jxf22.config