diff options
author | John Klug <john.klug@multitech.com> | 2016-10-03 10:30:40 -0500 |
---|---|---|
committer | John Klug <john.klug@multitech.com> | 2016-10-03 10:30:40 -0500 |
commit | 710ad2a51ad82596e3c2acca18837279b816cf9e (patch) | |
tree | 04ee2b73716c9d47a75086db3b9ef126bd0dfe54 | |
parent | ed643df8eb143ebc8aced94325e5686219b0d87c (diff) | |
download | meta-multitech-710ad2a51ad82596e3c2acca18837279b816cf9e.tar.gz meta-multitech-710ad2a51ad82596e3c2acca18837279b816cf9e.tar.bz2 meta-multitech-710ad2a51ad82596e3c2acca18837279b816cf9e.zip |
Eliminate incorrect errors, and reduce missing pin messages to info level
-rwxr-xr-x | recipes-bsp/multitech/mts-io/mts-io.init | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/recipes-bsp/multitech/mts-io/mts-io.init b/recipes-bsp/multitech/mts-io/mts-io.init index 03bb5b0..1574231 100755 --- a/recipes-bsp/multitech/mts-io/mts-io.init +++ b/recipes-bsp/multitech/mts-io/mts-io.init @@ -17,11 +17,15 @@ gpiodir=/sys/class/gpio USBRST=${sysdir}/usbhub-reset RST[0]="${sysdir}/mtq-reset" -RST[1]="${sysdir}/ap1-reset" -RST[2]="${sysdir}/ap2-reset" -RST[3]="${sysdir}/gnss-reset" -RST[4]="${sysdir}/secure-reset" -RST[5]="${sysdir}/eth-reset" +RST[1]="${sysdir}/ap1/reset" +RST[2]="${sysdir}/ap1/creset" +RST[3]="${sysdir}/ap2/reset" +RST[4]="${sysdir}/ap2/creset" +RST[5]="${sysdir}/gnss-reset" +RST[6]="${sysdir}/secure-reset" +RST[7]="${sysdir}/eth-reset" +RST[8]="${sysdir}/sm1-reset" + RS9113RST="${sysdir}/wifi-bt-reset" USLPTIME=30000 # 30 milliseconds from Redpine Signals Reset Spec @@ -29,27 +33,29 @@ WAIT="/bin/busybox usleep ${USLPTIME}" reset_path() { pin=$1 - /usr/bin/logger -t "mts-io" -p info Reset $pin + /usr/bin/logger -t "mts-io" -p daemon.info Reset $pin if [[ -f ${pin} ]] ; then if ! ( (echo 1 >${pin}) && (echo 0 >${pin}) && ${WAIT} && (echo 1 >${pin}) ) ; then - /usr/bin/logger -t "mts-io" -p error -s "Failed write to ${pin}" + /usr/bin/logger -t "mts-io" -p daemon.error -s "Failed write to ${pin}" + return 1 fi else - /usr/bin/logger -t "mts-io" -p error -s "${pin} does not exist" - return 1 + /usr/bin/logger -t "mts-io" -p daemon.info "${pin} does not exist" fi return 0 } reset_array() { + fail=0 ((i=${#RST[@]}-1)) while ((i>=0)) ; do if [[ -f ${RST[$i]} ]] ; then if ! ( (echo 1 >${RST[i]}) ) ; then - /usr/bin/logger -t "mts-io" -p error -s "Failed write to ${RST[$i]}" + /usr/bin/logger -t "mts-io" -p daemon.error -s "Failed write to ${RST[$i]}" + fail=1 fi else - /usr/bin/logger -t "mts-io" -p info -s "${RST[$i]} does not exist" + /usr/bin/logger -t "mts-io" -p daemon.info "${RST[$i]} does not exist" RST[$i]="" fi ((i--)) @@ -57,27 +63,29 @@ reset_array() { while ((i>0)) ; do if ((${#RST[$i] > 0)) && [[ -f ${RST[$i]} ]] ; then if ! ( (echo 0 >${RST[i]}) ) ; then - /usr/bin/logger -t "mts-io" -p error -s "Failed write to ${RST[$i]}" + /usr/bin/logger -t "mts-io" -p daemon.error -s "Failed write to ${RST[$i]}" + fail=1 fi else - /usr/bin/logger -t "mts-io" -p info -s "${RST[$i]} does not exist" + /usr/bin/logger -t "mts-io" -p daemon.info "${RST[$i]} does not exist" fi done ${WAIT} while ((i>0)) ; do if ((${#RST[$i] > 0)) && [[ -f ${RST[$i]} ]] ; then if ! ( (echo 1 >${RST[i]}) ) ; then - /usr/bin/logger -t "mts-io" -p error -s "Failed write to ${RST[$i]}" + /usr/bin/logger -t "mts-io" -p daemon.error -s "Failed write to ${RST[$i]}" + fail=1 fi else - /usr/bin/logger -t "mts-io" -p info -s "${RST[$i]} does not exist" + /usr/bin/logger -t "mts-io" -p daemon.info "${RST[$i]} does not exist" fi done + return $fail } read_card_info() { ap1_product_id="" ap2_product_id="" - mts_hw_version="" if [[ -d $sysdir/ap1 ]]; then ap1_product_id=$(cat $sysdir/ap1/product-id) @@ -91,17 +99,17 @@ mfser_init() { found_ap1=0 if [[ $ap1_product_id =~ ^MTAC-MFSER- ]]; then - /usr/bin/logger -t "mts-io" -p info -s "Linking /dev/mfser to /dev/ttyAP1" + /usr/bin/logger -t "mts-io" -p daemon.info -s "Linking /dev/mfser to /dev/ttyAP1" ln -sf /dev/ttyAP1 /dev/mfser found_ap1=1 fi if [[ $ap2_product_id =~ ^MTAC-MFSER- ]]; then if [[ $found_ap1 = 1 ]]; then - /usr/bin/logger -t "mts-io" -p info -s "Linking /dev/mfser-2 to /dev/ttyAP2" + /usr/bin/logger -t "mts-io" -p daemon.info -s "Linking /dev/mfser-2 to /dev/ttyAP2" ln -sf /dev/ttyAP2 /dev/mfser-2 else - /usr/bin/logger -t "mts-io" -p info -s "Linking /dev/mfser to /dev/ttyAP2" + /usr/bin/logger -t "mts-io" -p daemon.info -s "Linking /dev/mfser to /dev/ttyAP2" ln -sf /dev/ttyAP2 /dev/mfser fi fi @@ -110,7 +118,7 @@ mfser_init() { case $1 in start) - /usr/bin/logger -t "mts-io" -p info -s "Loading mts-io module" + /usr/bin/logger -t "mts-io" -p daemon.info -s "Loading mts-io module" if ! modprobe mts_io ; then ((fail++)) fi @@ -135,7 +143,7 @@ case $1 in ;; stop) - /usr/bin/logger -t "mts-io" -p info -s "Unloading mts-io module" + /usr/bin/logger -t "mts-io" -p daemon.info -s "Unloading mts-io module" modprobe -r mts_io RETVAL=$? if ((RETVAL == 0)) ; then |