From 7c357edfaad7cd9820d9cb664f33a126a7e25855 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 29 Oct 2020 17:07:43 -0500
Subject: Fix radio-related issues in mts-io

---
 io-module/machine/mtcpm.c | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'io-module/machine')

diff --git a/io-module/machine/mtcpm.c b/io-module/machine/mtcpm.c
index df771cd..dfffef6 100644
--- a/io-module/machine/mtcpm.c
+++ b/io-module/machine/mtcpm.c
@@ -202,40 +202,40 @@ static struct attribute *mtcpm_platform_attributes[] = {
 
 	&dev_attr_usbhub_reset.attr,
 	&dev_attr_eth_reset.attr,
-        
-  // radio feature is last to be able to 
-  // easily remove radio.
-  // is_radio_power_attr_mtcdt() searches
-  // for this for truncation.
-    &dev_attr_radio_power.attr,  /* Must be first radio attribute */
+        &dev_attr_has_radio.attr,
+
+	// radio-reset must be first for mtcdt3
 	&dev_attr_radio_reset.attr,
 
 	&dev_attr_radio_reset_backoffs.attr,
 	&dev_attr_radio_reset_backoff_index.attr,
 	&dev_attr_radio_reset_backoff_seconds.attr,
 		
+	NULL,
+};
+
+static struct attribute *mtcpm_wifi_bt_attributes[] = {
     &dev_attr_wifi_reset_mtcpm.attr,
 	&dev_attr_bt_reset_mtcpm.attr,
 	&dev_attr_wifi_bt_int_mtcpm.attr,
-		
-    &dev_attr_gnss_reset_mtcpm.attr,
-	&dev_attr_gnss_int_mtcpm.attr,
 	&dev_attr_wifi_mac_mtcpm.attr,
-        &dev_attr_bluetooth_mac_mtcpm.attr,
-	NULL,
+	&dev_attr_bluetooth_mac_mtcpm.attr,
 };
 
-
+static struct attribute *mtcpm_gnss_attributes[] = {
+	&dev_attr_gnss_reset_mtcpm.attr,
+	&dev_attr_gnss_int_mtcpm.attr,
+};
 
 static struct attribute_group mtcpm_platform_attribute_group = {
 	.attrs = mtcpm_platform_attributes
 };
 
 static int 
-is_radio_power_attr_mtcpm(struct attribute *attr)
+is_radio_reset_attr_mtcpm(struct attribute *attr)
 {
     return (attr ==  &dev_attr_radio_power.attr);
-}
+};
 
 static struct attribute *mtcpm_lora_attributes[] = {
 		&dev_attr_lora_eui_mtcpm.attr,
@@ -295,3 +295,8 @@ static void mts_cpu_dir_delete(void)
 	}
 }
 
+static int
+is_radio_reset_attr_mtcdt(struct attribute *attr)
+{
+    return (attr ==  &dev_attr_radio_reset.attr);
+}
-- 
cgit v1.2.3