From 9562c7a91b582b13b0f4ec25979dcb22e21e9d39 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 30 Apr 2018 11:32:06 -0500
Subject: Fix immunity test scripts for new rs9113 1.6.0 driver

---
 recipes-kernel/rs9113/files/rf/bt     | 4 ++--
 recipes-kernel/rs9113/files/rf/btr    | 4 ++--
 recipes-kernel/rs9113/files/rf/ubt    | 4 ++--
 recipes-kernel/rs9113/files/rf/uwf    | 4 ++--
 recipes-kernel/rs9113/files/rf/wf     | 4 ++--
 recipes-kernel/rs9113/files/rf/wfr    | 4 ++--
 recipes-kernel/rs9113/rs9113rf_1.0.bb | 1 -
 recipes-kernel/rs9113/rs9113rf_1.1.bb | 1 +
 8 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 recipes-kernel/rs9113/rs9113rf_1.0.bb
 create mode 100644 recipes-kernel/rs9113/rs9113rf_1.1.bb

diff --git a/recipes-kernel/rs9113/files/rf/bt b/recipes-kernel/rs9113/files/rf/bt
index 20bbd70..b9eff16 100755
--- a/recipes-kernel/rs9113/files/rf/bt
+++ b/recipes-kernel/rs9113/files/rf/bt
@@ -23,8 +23,8 @@ fi
 if ((ht != 0)) ; then
    ((burst=0))
 fi
-sed -i 's/DRIVER_MODE=1/DRIVER_MODE=2/' /opt/rs9113/common_insert.sh
-sed -i 's/COEX_MODE=[0-9]*/COEX_MODE=4/' /opt/rs9113/common_insert.sh
+export DRIVER_MODE=2
+export COEX_MODE=4
 /etc/init.d/rs9113 stop >/dev/null 2>&1
 echo 1 >/sys/devices/platform/mts-io/wifi-bt-reset
 echo 0 >/sys/devices/platform/mts-io/wifi-bt-reset
diff --git a/recipes-kernel/rs9113/files/rf/btr b/recipes-kernel/rs9113/files/rf/btr
index c856e00..0854377 100755
--- a/recipes-kernel/rs9113/files/rf/btr
+++ b/recipes-kernel/rs9113/files/rf/btr
@@ -1,7 +1,7 @@
 #!/bin/bash
 echo 'Bluetooth receive, single channel parameter'
-sed -i 's/DRIVER_MODE=1/DRIVER_MODE=2/' /opt/rs9113/common_insert.sh
-sed -i 's/COEX_MODE=[0-9]*/COEX_MODE=4/' /opt/rs9113/common_insert.sh
+export DRIVER_MODE=2
+export COEX_MODE=4
 /etc/init.d/rs9113 stop >/dev/null 2>&1
 cd /opt/rs9113
 bash wlan_bt_insert.sh
diff --git a/recipes-kernel/rs9113/files/rf/ubt b/recipes-kernel/rs9113/files/rf/ubt
index 4ca163e..c8dd5d2 100755
--- a/recipes-kernel/rs9113/files/rf/ubt
+++ b/recipes-kernel/rs9113/files/rf/ubt
@@ -11,8 +11,8 @@ rcvchan=9
 if ((ht != 0)) ; then
    ((burst=0))
 fi
-sed -i 's/DRIVER_MODE=1/DRIVER_MODE=2/' /opt/rs9113/common_insert.sh
-sed -i 's/COEX_MODE=[0-9]*/COEX_MODE=4/' /opt/rs9113/common_insert.sh
+export DRIVER_MODE=2
+export COEX_MODE=4
 /etc/init.d/rs9113 stop >/dev/null 2>&1
 echo 1 >/sys/devices/platform/mts-io/wifi-bt-reset
 echo 0 >/sys/devices/platform/mts-io/wifi-bt-reset
diff --git a/recipes-kernel/rs9113/files/rf/uwf b/recipes-kernel/rs9113/files/rf/uwf
index f90a461..b93649e 100755
--- a/recipes-kernel/rs9113/files/rf/uwf
+++ b/recipes-kernel/rs9113/files/rf/uwf
@@ -14,8 +14,8 @@ flag=0
 if [[ -n $3 ]] ; then
     flag=$3
 fi
-sed -i 's/DRIVER_MODE=1/DRIVER_MODE=2/' /opt/rs9113/common_insert.sh
-sed -i 's/COEX_MODE=[0-9]*/COEX_MODE=1/' /opt/rs9113/common_insert.sh
+export DRIVER_MODE=2
+export COEX_MODE=1
 /etc/init.d/rs9113 stop >/dev/null 2>&1
 cd /opt/rs9113
 bash wlan_bt_insert.sh
diff --git a/recipes-kernel/rs9113/files/rf/wf b/recipes-kernel/rs9113/files/rf/wf
index 5a5d295..c7fdb00 100755
--- a/recipes-kernel/rs9113/files/rf/wf
+++ b/recipes-kernel/rs9113/files/rf/wf
@@ -14,8 +14,8 @@ flag=0
 if [[ -n $3 ]] ; then
     flag=$3
 fi
-sed -i 's/DRIVER_MODE=1/DRIVER_MODE=2/' /opt/rs9113/common_insert.sh
-sed -i 's/COEX_MODE=[0-9]*/COEX_MODE=1/' /opt/rs9113/common_insert.sh
+export DRIVER_MODE=2
+export COEX_MODE=1
 /etc/init.d/rs9113 stop >/dev/null 2>&1
 cd /opt/rs9113
 bash wlan_bt_insert.sh
diff --git a/recipes-kernel/rs9113/files/rf/wfr b/recipes-kernel/rs9113/files/rf/wfr
index ace244d..9fe21bb 100755
--- a/recipes-kernel/rs9113/files/rf/wfr
+++ b/recipes-kernel/rs9113/files/rf/wfr
@@ -3,8 +3,8 @@ echo 'WiFi recieve'
 echo 'Parameter 1 is channel'
 echo 'Paramter 2 is width'
 echo '0 is 20MHz, 6 is 40MHz'
-sed -i 's/DRIVER_MODE=1/DRIVER_MODE=2/' /opt/rs9113/common_insert.sh
-sed -i 's/COEX_MODE=[0-9]*/COEX_MODE=1/' /opt/rs9113/common_insert.sh
+export DRIVER_MODE=2
+export COEX_MODE=1
 /etc/init.d/rs9113 stop >/dev/null 2>&1
 cd /opt/rs9113
 bash wlan_bt_insert.sh
diff --git a/recipes-kernel/rs9113/rs9113rf_1.0.bb b/recipes-kernel/rs9113/rs9113rf_1.0.bb
deleted file mode 100644
index 43ec216..0000000
--- a/recipes-kernel/rs9113/rs9113rf_1.0.bb
+++ /dev/null
@@ -1 +0,0 @@
-require rs9113rf.inc
diff --git a/recipes-kernel/rs9113/rs9113rf_1.1.bb b/recipes-kernel/rs9113/rs9113rf_1.1.bb
new file mode 100644
index 0000000..43ec216
--- /dev/null
+++ b/recipes-kernel/rs9113/rs9113rf_1.1.bb
@@ -0,0 +1 @@
+require rs9113rf.inc
-- 
cgit v1.2.3