summaryrefslogtreecommitdiff
path: root/io-module
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2016-12-05 17:00:07 -0600
committerJohn Klug <john.klug@multitech.com>2016-12-05 17:00:07 -0600
commit2682d2ab10ddb523999a71014a2c0f7c246e4100 (patch)
tree73bcf2c8059bbb1131ed65a8f038070314ebacec /io-module
parent765d88576c6dbc9247ce216ca542e52814f09126 (diff)
downloadmts-io-2682d2ab10ddb523999a71014a2c0f7c246e4100.tar.gz
mts-io-2682d2ab10ddb523999a71014a2c0f7c246e4100.tar.bz2
mts-io-2682d2ab10ddb523999a71014a2c0f7c246e4100.zip
Remove wifi-bt and gnss capability flags
Diffstat (limited to 'io-module')
-rw-r--r--io-module/mtcdt.c10
-rw-r--r--io-module/mts_capab.c2
-rw-r--r--io-module/mts_eeprom.h5
-rw-r--r--io-module/mts_io.c8
4 files changed, 10 insertions, 15 deletions
diff --git a/io-module/mtcdt.c b/io-module/mtcdt.c
index fcef791..4877c5a 100644
--- a/io-module/mtcdt.c
+++ b/io-module/mtcdt.c
@@ -523,7 +523,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_1[] = {
.flags = GPIOF_IN,
.label = "wifi-bt-ulpwkup",
},
- .capability = CAPA_WIFI_BT,
+ .capability = CAPA_WIFI,
},
{
.name = "WIFI_BT_LPWKUP",
@@ -532,7 +532,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_1[] = {
.flags = GPIOF_IN,
.label = "wifi-bt-lpwkup",
},
- .capability = CAPA_WIFI_BT,
+ .capability = CAPA_WIFI,
},
{
.name = "WIFI_BT_INT",
@@ -541,7 +541,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_1[] = {
.flags = GPIOF_IN,
.label = "wifi-bt-int",
},
- .capability = CAPA_WIFI_BT,
+ .capability = CAPA_WIFI,
},
{
.name = "WIFI_BT_RESET",
@@ -550,7 +550,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_1[] = {
.flags = GPIOF_OUT_INIT_HIGH,
.label = "wifi-bt-reset",
},
- .capability = CAPA_WIFI_BT,
+ .capability = CAPA_WIFI,
},
{
.name = "GNSS_RESET",
@@ -601,7 +601,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_1[] = {
.flags = GPIOF_IN,
.label = "wifi-bt-lpmode",
},
- .capability = CAPA_WIFI_BT,
+ .capability = CAPA_WIFI,
},
{ },
};
diff --git a/io-module/mts_capab.c b/io-module/mts_capab.c
index 646f707..e8e4a27 100644
--- a/io-module/mts_capab.c
+++ b/io-module/mts_capab.c
@@ -24,8 +24,6 @@ static struct capab_map_s capabilities_map[] = {
{ CAPA_ADC, "adc"},
{ CAPA_BLUETOOTH, "bluetooth"},
{ CAPA_WIFI, "wifi"},
- { CAPA_WIFI_BT, "wifi_bt"},
- { CAPA_GNSS, "gnss"},
{ CAPA_LORA, "lora"},
};
static const unsigned capabilities_count = sizeof(capabilities_map)/sizeof(capabilities_map[0]);
diff --git a/io-module/mts_eeprom.h b/io-module/mts_eeprom.h
index f616e83..ec82e0d 100644
--- a/io-module/mts_eeprom.h
+++ b/io-module/mts_eeprom.h
@@ -55,15 +55,14 @@ do { \
#define DEVICE_CAPA_VALUE(index, bit) ((((index) & 0x1F) << 3) | ((bit) & 0x07))
-#define CAPA_COUNT 9 // See also attribute_names in capab.c
+#define CAPA_COUNT 7 // See also attribute_names in capab.c
#define CAPA_GPS DEVICE_CAPA_VALUE(0, 7)
#define CAPA_DIN DEVICE_CAPA_VALUE(0, 6)
#define CAPA_DOUT DEVICE_CAPA_VALUE(0, 5)
#define CAPA_ADC DEVICE_CAPA_VALUE(0, 4)
#define CAPA_BLUETOOTH DEVICE_CAPA_VALUE(1, 7)
+/* Used for rs9113 detection in Conduit 0.1 and others */
#define CAPA_WIFI DEVICE_CAPA_VALUE(1, 6)
-#define CAPA_WIFI_BT DEVICE_CAPA_VALUE(1, 5) // Redpine rs9113
-#define CAPA_GNSS DEVICE_CAPA_VALUE(1, 4) // ublox EVA 7M
#define CAPA_LORA DEVICE_CAPA_VALUE(1, 3) // on-board lora
#endif
diff --git a/io-module/mts_io.c b/io-module/mts_io.c
index 85f9474..f2204d0 100644
--- a/io-module/mts_io.c
+++ b/io-module/mts_io.c
@@ -47,7 +47,7 @@
#include "mts_io.h"
-#define DRIVER_VERSION "v1.5.5"
+#define DRIVER_VERSION "v1.5.6"
#define DRIVER_AUTHOR "James Maki <jmaki@multitech.com>"
#define DRIVER_DESC "MTS-IO Controller"
#define DRIVER_NAME "mts-io"
@@ -824,7 +824,7 @@ static int mts_id_eeprom_load()
}
else if (strncmp(id_eeprom.hw_version, HW_VERSION_MTCDT_0_1, strlen(HW_VERSION_MTCDT_0_1)) == 0) {
attr_blength = sizeof mtcdt_0_1_platform_attributes;
- if(DEVICE_CAPA(id_eeprom.capa, CAPA_WIFI_BT)) {
+ if(DEVICE_CAPA(id_eeprom.capa, CAPA_WIFI)) {
attr_blength += sizeof mtcdt_0_1_wifi_bt_attributes;
}
if(DEVICE_CAPA(id_eeprom.capa, CAPA_GNSS)) {
@@ -835,7 +835,7 @@ static int mts_id_eeprom_load()
current_blength = sizeof mtcdt_0_1_platform_attributes - sizeof (struct attribute *);
current_count = current_blength/(sizeof (struct attribute *));
memcpy(all_attrs,mtcdt_0_1_platform_attributes,current_blength);
- if(DEVICE_CAPA(id_eeprom.capa, CAPA_WIFI_BT)) {
+ if(DEVICE_CAPA(id_eeprom.capa, CAPA_WIFI)) {
memcpy(all_attrs + current_count,mtcdt_0_1_wifi_bt_attributes,sizeof mtcdt_0_1_wifi_bt_attributes);
current_count += sizeof mtcdt_0_1_wifi_bt_attributes / (sizeof (struct attribute *));
}
@@ -879,8 +879,6 @@ static int mts_id_eeprom_load()
log_info("capa-adc: %s", DEVICE_CAPA(id_eeprom.capa, CAPA_ADC) ? "yes" : "no");
log_info("capa-wifi: %s", DEVICE_CAPA(id_eeprom.capa, CAPA_WIFI) ? "yes" : "no");
log_info("capa-bluetooth: %s", DEVICE_CAPA(id_eeprom.capa, CAPA_BLUETOOTH) ? "yes" : "no");
- log_info("capa-wifi-bluetooth: %s", DEVICE_CAPA(id_eeprom.capa, CAPA_WIFI_BT) ? "yes" : "no");
- log_info("capa-gnss: %s", DEVICE_CAPA(id_eeprom.capa, CAPA_GNSS) ? "yes" : "no");
log_info("capa-lora: %s", DEVICE_CAPA(id_eeprom.capa, CAPA_LORA) ? "yes" : "no");
if (DEVICE_CAPA(id_eeprom.capa, CAPA_BLUETOOTH)) {