14 files changed, 53 insertions, 72 deletions
diff --git a/multitech/recipes/multitech/config/ppp/options b/multitech/recipes/multitech/config/ppp/options
index aad08ac..34654c1 100644
--- a/multitech/recipes/multitech/config/ppp/options
+++ b/multitech/recipes/multitech/config/ppp/options
@@ -14,5 +14,9 @@
 # Uncomment for unlimited connection attempts
 #maxfail 0
 
+# disable logging to /etc/ppp/connect-errors
+# and only log to syslog
+logfile /dev/null
+
 lock
 
diff --git a/multitech/recipes/multitech/config_1.0.bb b/multitech/recipes/multitech/config_1.0.bb
index 250a3da..c0d3984 100644
--- a/multitech/recipes/multitech/config_1.0.bb
+++ b/multitech/recipes/multitech/config_1.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Provides default system config files and /var/config fs"
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r21"
+PR = "r22"
 
 inherit update-rc.d
 
diff --git a/multitech/recipes/multitech/mts-id-eeprom_0.2.1.bb b/multitech/recipes/multitech/mts-id-eeprom_0.2.1.bb
new file mode 100644
index 0000000..ccf3521
--- /dev/null
+++ b/multitech/recipes/multitech/mts-id-eeprom_0.2.1.bb
@@ -0,0 +1,3 @@
+require mts-id-eeprom.inc
+
+PR = "${INC_PR}.0"
diff --git a/multitech/recipes/multitech/mts-io.inc b/multitech/recipes/multitech/mts-io.inc
index 701ebdd..4609fe2 100644
--- a/multitech/recipes/multitech/mts-io.inc
+++ b/multitech/recipes/multitech/mts-io.inc
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
-INC_PR = "r3"
+INC_PR = "r4"
 
 SRC_URI = " \
     file://mts-io.init \
@@ -26,8 +26,15 @@ do_configure () {
    echo "Nothing to configure for mts-io"
 }
 
+CFLAGS = ""
+CPPFLAGS = ""
+CXXFLAGS = ""
+LDFLAGS = ""
+
+DAUGHTER_CARD_mtocgd2 = "-DMTOCGD2"
+export DAUGHTER_CARD
+
 do_compile () {
-    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
     oe_runmake
 }
 
diff --git a/multitech/recipes/multitech/mts-io/mtocgd/mts-io.init b/multitech/recipes/multitech/mts-io/mtocgd/mts-io.init
new file mode 100644
index 0000000..fe6c517
--- /dev/null
+++ b/multitech/recipes/multitech/mts-io/mtocgd/mts-io.init
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+case $1 in
+  start)
+    echo "Loading mts-io module"
+    modprobe mts_io
+    radio_power=`mts-io-sysfs show radio-power`
+    # power on cellular radio if needed
+    if [ "$radio_power" = "0" ]; then
+      echo "Powering on radio"
+      mts-io-sysfs store radio-power 1 &
+    fi
+    ;;
+
+  stop)
+    echo "Unloading mts-io module"
+    modprobe -r mts_io
+    ;;
+
+  *)
+    echo "Usage: $0 {start|stop}"
+    exit 2
+    ;;
+esac
+
+
diff --git a/multitech/recipes/multitech/mts-io/radio-reset-h5 b/multitech/recipes/multitech/mts-io/radio-reset-h5
index 7a059eb..22616fe 100755
--- a/multitech/recipes/multitech/mts-io/radio-reset-h5
+++ b/multitech/recipes/multitech/mts-io/radio-reset-h5
@@ -1,10 +1,13 @@
 #!/bin/sh
 
-# This script works around an H5 radio quirk by disabling USB and 
+# This script works around a USB full-speed H5 radio quirk by disabling USB and 
 # waiting for the radio to power up before re-enabling it.  Note that
 # this will disable all USB devices connected to the USB host controller
 # until the reset is finished.  USB device port is not affected.
 
+# This script is *only* needed for devices with an H5 operating at USB full speed (MTCDP, MT100EOCG).
+# Devices with high speed USB are not affected (MTOCGD2, MTOCGD).
+
 rmmod ohci_hcd
 mts-io-sysfs store radio-reset 0
 sleep 8
diff --git a/multitech/recipes/multitech/mts-io_0.3.0.bb b/multitech/recipes/multitech/mts-io_0.3.0.bb
deleted file mode 100644
index f903020..0000000
--- a/multitech/recipes/multitech/mts-io_0.3.0.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require mts-io.inc
-
-PR = "${INC_PR}.0"
diff --git a/multitech/recipes/multitech/mts-io_0.4.1.bb b/multitech/recipes/multitech/mts-io_0.4.1.bb
deleted file mode 100644
index f903020..0000000
--- a/multitech/recipes/multitech/mts-io_0.4.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require mts-io.inc
-
-PR = "${INC_PR}.0"
diff --git a/multitech/recipes/multitech/mts-io_0.5.1.bb b/multitech/recipes/multitech/mts-io_0.5.1.bb
deleted file mode 100644
index 2ddf14c..0000000
--- a/multitech/recipes/multitech/mts-io_0.5.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require mts-io.inc
-
-PR = "${INC_PR}.1"
-
-SRC_URI_append_mt100eocg-pcie-dk = " file://mts-io-pcieh5.patch"
diff --git a/multitech/recipes/multitech/mts-io_0.6.0.bb b/multitech/recipes/multitech/mts-io_0.6.0.bb
deleted file mode 100644
index 090a0e8..0000000
--- a/multitech/recipes/multitech/mts-io_0.6.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require mts-io.inc
-
-SRCREV="v0.6.0"
-
-SRC_URI = " \
-    file://mts-io.init \
-    file://radio-reset-h5 \
-    git://git.multitech.net/cdp-io-controller.git;protocol=git;branch=master;tag=${SRCREV} \
-"
-
-SRC_URI_append_mt100eocg-pcie-dk = " file://mts-io-0.6.0-pcieh5.patch"
-
-LOCAL_PR = "${INC_PR}.15"
-MACHINE_KERNEL_PR_append = "${LOCAL_PR}"
diff --git a/multitech/recipes/multitech/mts-io_0.6.1.bb b/multitech/recipes/multitech/mts-io_0.6.1.bb
deleted file mode 100644
index ec1a04d..0000000
--- a/multitech/recipes/multitech/mts-io_0.6.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require mts-io.inc
-
-SRCREV="v0.6.1"
-
-SRC_URI = " \
-    file://mts-io.init \
-    file://radio-reset-h5 \
-    git://git.multitech.net/cdp-io-controller.git;protocol=git;branch=master;tag=${SRCREV} \
-"
-
-SRC_URI_append_mt100eocg-pcie-dk = " file://mts-io-0.6.1-pcieh5.patch"
-
-LOCAL_PR = "${INC_PR}.17"
-MACHINE_KERNEL_PR_append = "${LOCAL_PR}"
diff --git a/multitech/recipes/multitech/mts-io_0.6.2.bb b/multitech/recipes/multitech/mts-io_0.6.2.bb
deleted file mode 100644
index 1ebe062..0000000
--- a/multitech/recipes/multitech/mts-io_0.6.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require mts-io.inc
-
-TAG="d5beeadc07864a4bdc970ed76bd4693529039fcd"
-
-SRC_URI = " \
-    file://mts-io.init \
-    file://radio-reset-h5 \
-#    git://git.multitech.net/cdp-io-controller.git;protocol=git;branch=master;tag=${TAG} \
-    git://sw.multitech.prv/usr/local/git/jjg/cdp-io-controller.git;protocol=ssh;branch=mtocgd;tag=${TAG} \
-"
-
-SRC_URI_append_mt100eocg-pcie-dk = "file://mts-io-0.6.2-pcieh5.patch"
-
-LOCAL_PR = "${INC_PR}.3"
-MACHINE_KERNEL_PR_append = "${LOCAL_PR}"
diff --git a/multitech/recipes/multitech/mts-io_0.7.1.bb b/multitech/recipes/multitech/mts-io_0.7.1.bb
deleted file mode 100644
index 5cb53f6..0000000
--- a/multitech/recipes/multitech/mts-io_0.7.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require mts-io.inc
-
-TAG="v${PV}"
-
-SRC_URI = " \
-    file://mts-io.init \
-    file://radio-reset-h5 \
-    git://git.multitech.net/cdp-io-controller.git;protocol=git;branch=master;tag=${TAG} \
-"
-
-SRC_URI_append_mt100eocg-pcie-dk = "file://mts-io-0.6.2-pcieh5.patch"
-
-LOCAL_PR = "${INC_PR}.1"
-MACHINE_KERNEL_PR_append = "${LOCAL_PR}"
diff --git a/multitech/recipes/multitech/mts-io_0.8.1.bb b/multitech/recipes/multitech/mts-io_0.8.1.bb
new file mode 100644
index 0000000..4ec3ead
--- /dev/null
+++ b/multitech/recipes/multitech/mts-io_0.8.1.bb
@@ -0,0 +1,6 @@
+require mts-io.inc
+
+SRC_URI_append_mt100eocg-pcie-dk = "file://mts-io-0.6.2-pcieh5.patch"
+
+LOCAL_PR = "${INC_PR}.1"
+MACHINE_KERNEL_PR_append = "${LOCAL_PR}"