diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2016-08-26 14:56:19 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2016-08-29 06:29:39 +0000 |
| commit | 0dd19a27b4cc398c9e4128223b393333ed99de12 (patch) | |
| tree | 564406ef34496d5127dccd42a0405f07d25769e7 | |
| parent | fb5c3c7e2cc7f8be83facbacc41509f034be5ba0 (diff) | |
Fix restart functionality in dev script
It didn't work because the gadget was not reseted properly.
Change-Id: I24c342fdd584aebc060dfd3d818639855bce0595
Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
| -rwxr-xr-x | tools/qdbd-dev.sh | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/tools/qdbd-dev.sh b/tools/qdbd-dev.sh index ddaeed9..29e2c5d 100755 --- a/tools/qdbd-dev.sh +++ b/tools/qdbd-dev.sh @@ -53,6 +53,19 @@ if [ -e /var/run/dbus/session_bus_address ]; then . /var/run/dbus/session_bus_address fi +function initialize_gadget() { + # Initialize gadget with first UDC driver + for driverpath in /sys/class/udc/*; do + drivername=`basename $driverpath` + echo "$drivername" > $CONFIGFS_PATH/usb_gadget/g1/UDC + break + done +} + +function disable_gadget() { + echo "" > $CONFIGFS_PATH/usb_gadget/g1/UDC +} + case "$1" in start) if [ "$USE_ETHERNET" = "no" ]; then @@ -87,15 +100,10 @@ start) start-stop-daemon --start --quiet --exec $DAEMON -- $@ & start-stop-daemon --start --quiet --exec $ADBD & sleep 1 - # Initialize gadget with first UDC driver - for driverpath in /sys/class/udc/*; do - drivername=`basename $driverpath` - echo "$drivername" > $CONFIGFS_PATH/usb_gadget/g1/UDC - break - done + initialize_gadget ;; stop) - echo "" > $CONFIGFS_PATH/usb_gadget/g1/UDC + disable_gadget start-stop-daemon --stop --quiet --exec $DAEMON start-stop-daemon --stop --quiet --exec $ADBD if [ "$USE_ETHERNET" = "no" ]; then @@ -105,12 +113,15 @@ stop) fi ;; restart) + disable_gadget start-stop-daemon --stop --quiet --exec $DAEMON start-stop-daemon --stop --quiet --exec $ADBD sleep 1 shift start-stop-daemon --start --quiet --exec $DAEMON -- $@ & start-stop-daemon --start --quiet --exec $ADBD & + sleep 1 + initialize_gadget ;; *) echo "Usage: $0 {start|stop|restart}" |