From 18d756dd599f93abcd5dc89f323a5df77384ceac Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Mon, 26 Jan 2015 08:59:19 +0100
Subject: USB startup: Ensure that we are not talking to the peripheral too
 soon. Startup does not take longer due to smart rearrangement of launch calls

---
 ROMFS/px4fmu_common/init.d/rcS | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

(limited to 'ROMFS')

diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index 2c9387ff0..4d337171a 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -5,6 +5,11 @@
 #  NOTE: COMMENT LINES ARE REMOVED BEFORE STORED IN ROMFS.
 #
 
+#
+# Start CDC/ACM serial driver
+#
+sercon
+
 #
 # Default to auto-start mode.
 #
@@ -43,29 +48,8 @@ else
 fi
 unset FRC
 
-# if this is an APM build then there will be a rc.APM script
-# from an EXTERNAL_SCRIPTS build option
-if [ -f /etc/init.d/rc.APM ]
-then
-	if sercon
-	then
-		echo "[i] USB interface connected"
-	fi
-
-	echo "[i] Running rc.APM"
-	# if APM startup is successful then nsh will exit
-	sh /etc/init.d/rc.APM
-fi
-
 if [ $MODE == autostart ]
 then
-	echo "[i] AUTOSTART mode"
-
-	#
-	# Start CDC/ACM serial driver
-	#
-	sercon
-
 	# Try to get an USB console
 	nshterm /dev/ttyACM0 &
 
-- 
cgit v1.2.3