summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2016-12-05 12:54:11 -0600
committerJohn Klug <john.klug@multitech.com>2016-12-05 12:54:11 -0600
commit75f073fe2cab473309e09c2e3c5e18601e781806 (patch)
tree454ccdaea47c5447dfe55aaec7ca9204ee5a6f1f
parent4603f98dad9a7ccec741fec0fa7d81cf9587a811 (diff)
downloadmts-id-eeprom-75f073fe2cab473309e09c2e3c5e18601e781806.tar.gz
mts-id-eeprom-75f073fe2cab473309e09c2e3c5e18601e781806.tar.bz2
mts-id-eeprom-75f073fe2cab473309e09c2e3c5e18601e781806.zip
Remove wifi-bt and gnss capability flags0.2.10
-rw-r--r--configure.in2
-rw-r--r--src/eeprom_main.c18
2 files changed, 1 insertions, 19 deletions
diff --git a/configure.in b/configure.in
index f80ac3c..0703cc6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
AC_INIT([src/eeprom_main.c])
-AM_INIT_AUTOMAKE([mts-id-eeprom], [0.2.9])
+AM_INIT_AUTOMAKE([mts-id-eeprom], [0.2.10])
AM_CONFIG_HEADER([config.h])
AC_PROG_CC
diff --git a/src/eeprom_main.c b/src/eeprom_main.c
index bea72e7..bdbace9 100644
--- a/src/eeprom_main.c
+++ b/src/eeprom_main.c
@@ -160,8 +160,6 @@ static int id_yaml_out(const char *name, struct mts_id_eeprom_layout *id_eeprom)
fprintf(file, "capa-adc: %s\n", DEVICE_CAPA(id_eeprom->capa, CAPA_ADC) ? "true" : "false");
fprintf(file, "capa-wifi: %s\n", DEVICE_CAPA(id_eeprom->capa, CAPA_WIFI) ? "true" : "false");
fprintf(file, "capa-bluetooth: %s\n", DEVICE_CAPA(id_eeprom->capa, CAPA_BLUETOOTH) ? "true" : "false");
- fprintf(file, "capa-wifi-bluetooth: %s\n", DEVICE_CAPA(id_eeprom->capa, CAPA_WIFI_BT) ? "true" : "false");
- fprintf(file, "capa-gnss: %s\n", DEVICE_CAPA(id_eeprom->capa, CAPA_GNSS) ? "true" : "false");
fprintf(file, "capa-lora: %s\n", DEVICE_CAPA(id_eeprom->capa, CAPA_LORA) ? "true" : "false");
fprintf(file, "capa: \"");
@@ -309,8 +307,6 @@ static void mts_id_eeprom_inspect(struct mts_id_eeprom_layout *id_eeprom)
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");
log_info("mac-bluetooth: %02X:%02X:%02X:%02X:%02X:%02X",
@@ -405,8 +401,6 @@ static void usage(FILE *out) {
fprintf(out, " --capa-adc |\n");
fprintf(out, " --capa-wifi |\n");
fprintf(out, " --capa-bluetooth |\n");
- fprintf(out, " --capa-wifi-bluetooth |\n");
- fprintf(out, " --capa-gnss |\n");
fprintf(out, " --capa-lora |\n");
fprintf(out, " --capa-clear (clears all flags) |\n");
fprintf(out, " --out-format { bin | yaml (default) } |\n");
@@ -437,8 +431,6 @@ enum {
CMD_OPT_CAPA_ADC,
CMD_OPT_CAPA_WIFI,
CMD_OPT_CAPA_BLUETOOTH,
- CMD_OPT_CAPA_WIFI_BT,
- CMD_OPT_CAPA_GNSS,
CMD_OPT_CAPA_LORA,
CMD_OPT_CAPA_CLEAR,
CMD_OPT_OUT_FORMAT,
@@ -471,8 +463,6 @@ static struct option long_options[] = {
{"capa-adc", 0, NULL, CMD_OPT_CAPA_ADC},
{"capa-wifi", 0, NULL, CMD_OPT_CAPA_WIFI},
{"capa-bluetooth", 0, NULL, CMD_OPT_CAPA_BLUETOOTH},
- {"capa-wifi-bluetooth", 0, NULL, CMD_OPT_CAPA_WIFI_BT},
- {"capa-gnss", 0, NULL, CMD_OPT_CAPA_GNSS},
{"capa-lora", 0, NULL, CMD_OPT_CAPA_LORA},
{"capa-clear", 0, NULL, CMD_OPT_CAPA_CLEAR},
{"out-format", 1, NULL, CMD_OPT_OUT_FORMAT},
@@ -706,14 +696,6 @@ int main(int argc, char *argv[]) {
DEVICE_CAPA_SET(id_eeprom.capa, CAPA_BLUETOOTH);
break;
- case CMD_OPT_CAPA_WIFI_BT:
- DEVICE_CAPA_SET(id_eeprom.capa, CAPA_WIFI_BT);
- break;
-
- case CMD_OPT_CAPA_GNSS:
- DEVICE_CAPA_SET(id_eeprom.capa, CAPA_GNSS);
- break;
-
case CMD_OPT_CAPA_LORA:
DEVICE_CAPA_SET(id_eeprom.capa, CAPA_LORA);
break;