Merge branch 'mtr2d2' into 'master'

Conflicts:
	io-module/mtdc_gpiob.c - remove, replaced by mtac_gpiob.c
	io-module/mtr2.c - remove, dropping support for this HW
	io-module/mts_io.c - keep changes from mtr2d2 branch
	io-module/spi.c - remove, no longer needed

1 files changed, 11 insertions, 13 deletions

diff --git a/io-tool/mts-io-sysfs b/io-tool/mts-io-sysfs
index 3961c03..3ecb100 100755
--- a/io-tool/mts-io-sysfs
+++ b/io-tool/mts-io-sysfs
@@ -76,15 +76,15 @@ usage() {
 
   #items for SHOW
   printf "       SHOW-NAME := {\n" >&${out}
-  for f in $MTS_IO_DIR/*;
+  for f in `find $MTS_IO_DIR/* -follow -maxdepth 1 -type f`;
   do
-    FILENAME=${f##*/}
+    FILENAME=${f##*/mts-io/}
     case $FILENAME in
       modalias )
         ;;
       power )
         ;;
-      subsystem )
+      subsystem* )
         ;;
       uevent )
         ;;
@@ -97,9 +97,9 @@ usage() {
 
   #items for STORE
   printf "       STORE-NAME := {\n" >&${out}
-  for f in $MTS_IO_DIR/*;
+  for f in `find $MTS_IO_DIR/* -follow -maxdepth 1 -type f`;
   do
-    FILENAME=${f##*/}
+    FILENAME=${f##*/mts-io/}
     case $FILENAME in
       #mac addresses are read-only
       mac-* )
@@ -108,7 +108,7 @@ usage() {
       *-id )
         ;;
       #hw-version is read-only
-      hw-version )
+      *hw-version )
         ;;
       #imei is read-only
       imei )
@@ -117,17 +117,15 @@ usage() {
         ;;
       power )
         ;;
-      subsystem )
+      subsystem* )
         ;;
       uevent )
         ;;
       board-temperature )
         ;;
-      extserial-dtr )
+      *adc[0-9] )
         ;;
-      adc[0-9] )
-        ;;
-      din[0-9] )
+      *din[0-9] )
         ;;
       gpi[0-9] )
         ;;
@@ -145,8 +143,8 @@ usage() {
         printf "         $FILENAME { 0 }\n" >&${out} ;;
       reset-monitor )
         printf "         $FILENAME { pid short-signal long-signal [extra-long-signal] }\n" >&${out} ;;
-      serial-mode )
-        printf "         $FILENAME { loopback | rs232 | rs422 | rs485 }\n" >&${out} ;;
+      *serial-mode )
+        printf "         $FILENAME { loopback | rs232 | rs485-half | rs422-485-full }\n" >&${out} ;;
       * )
         printf "         $FILENAME BOOLEAN\n" >&${out} ;;
     esac