兼容 dev_info v1
Change-Id: I5659a6275f96f68867d4fd753c05915576dee568
diff --git a/mbtk/mbtk_utils_linux/device_info_generate.c b/mbtk/mbtk_utils_linux/device_info_generate.c
index 9744aab..58afe45 100755
--- a/mbtk/mbtk_utils_linux/device_info_generate.c
+++ b/mbtk/mbtk_utils_linux/device_info_generate.c
@@ -57,17 +57,21 @@
.name = MBTK_DEVICE_INFO_ITEM_STR_MODEM,
.version = MBTK_DEVICE_INFO_CURR_VERSION,
.band_area = MBTK_MODEM_BAND_AREA_ALL, // Default for all bands.
+#ifdef MBTK_DEV_INFO_VERSION_2
.net_pref = 15, // Default *band is 15
.net_support = MBTK_NET_SUPPORT_2G | MBTK_NET_SUPPORT_3G | MBTK_NET_SUPPORT_4G, // Default support 2G/3G/4G
+#endif
.band_gsm = MBTK_BAND_ALL_GSM_DEFAULT,
.band_wcdma = MBTK_BAND_ALL_WCDMA_DEFAULT,
.band_tdlte = MBTK_BAND_ALL_TDLTE_DEFAULT,
.band_fddlte = MBTK_BAND_ALL_FDDLTE_DEFAULT,
.band_lte_ext = MBTK_BAND_ALL_EXT_LTE_DEFAULT,
+#ifdef MBTK_DEV_INFO_VERSION_2
.band_nr_3 = MBTK_BAND_ALL_NR_3_DEFAULT,
.band_nr_2 = MBTK_BAND_ALL_NR_2_DEFAULT,
.band_nr_1 = MBTK_BAND_ALL_NR_1_DEFAULT,
.band_nr_0 = MBTK_BAND_ALL_NR_0_DEFAULT
+#endif
};
static mbtk_device_info_log_t item_log = {
@@ -164,6 +168,7 @@
return 0;
}
+#ifdef MBTK_DEV_INFO_VERSION_2
static char* net_support_str_get(uint32 net_support)
{
static char net_str[100] = {0};
@@ -201,7 +206,7 @@
}
return net_str;
}
-
+#endif
/*
*
* device_info_generate -a [a/ab] -b [revision_out] -c [revision_in] -d [project] -e [project_cust] -f [cn/eu/sa/all] -o [out_bin]
@@ -252,10 +257,12 @@
item_modem.band_tdlte = MBTK_BAND_CN_TDLTE_DEFAULT;
item_modem.band_fddlte = MBTK_BAND_CN_FDDLTE_DEFAULT;
item_modem.band_lte_ext = MBTK_BAND_CN_EXT_LTE_DEFAULT;
+#ifdef MBTK_DEV_INFO_VERSION_2
item_modem.band_nr_3 = MBTK_BAND_CN_NR_3_DEFAULT;
item_modem.band_nr_2 = MBTK_BAND_CN_NR_2_DEFAULT;
item_modem.band_nr_1 = MBTK_BAND_CN_NR_1_DEFAULT;
item_modem.band_nr_0 = MBTK_BAND_CN_NR_0_DEFAULT;
+#endif
} else if(strcmp(optarg, "eu") == 0) {
item_modem.band_area = MBTK_MODEM_BAND_AREA_EU;
item_modem.band_gsm = MBTK_BAND_EU_GSM_DEFAULT;
@@ -263,10 +270,12 @@
item_modem.band_tdlte = MBTK_BAND_EU_TDLTE_DEFAULT;
item_modem.band_fddlte = MBTK_BAND_EU_FDDLTE_DEFAULT;
item_modem.band_lte_ext = MBTK_BAND_EU_EXT_LTE_DEFAULT;
+#ifdef MBTK_DEV_INFO_VERSION_2
item_modem.band_nr_3 = MBTK_BAND_EU_NR_3_DEFAULT;
item_modem.band_nr_2 = MBTK_BAND_EU_NR_2_DEFAULT;
item_modem.band_nr_1 = MBTK_BAND_EU_NR_1_DEFAULT;
item_modem.band_nr_0 = MBTK_BAND_EU_NR_0_DEFAULT;
+#endif
} else if(strcmp(optarg, "sa") == 0) {
item_modem.band_area = MBTK_MODEM_BAND_AREA_SA;
item_modem.band_gsm = MBTK_BAND_SA_GSM_DEFAULT;
@@ -274,10 +283,12 @@
item_modem.band_tdlte = MBTK_BAND_SA_TDLTE_DEFAULT;
item_modem.band_fddlte = MBTK_BAND_SA_FDDLTE_DEFAULT;
item_modem.band_lte_ext = MBTK_BAND_SA_EXT_LTE_DEFAULT;
+#ifdef MBTK_DEV_INFO_VERSION_2
item_modem.band_nr_3 = MBTK_BAND_SA_NR_3_DEFAULT;
item_modem.band_nr_2 = MBTK_BAND_SA_NR_2_DEFAULT;
item_modem.band_nr_1 = MBTK_BAND_SA_NR_1_DEFAULT;
item_modem.band_nr_0 = MBTK_BAND_SA_NR_0_DEFAULT;
+#endif
} else {
item_modem.band_area = MBTK_MODEM_BAND_AREA_ALL;
item_modem.band_gsm = MBTK_BAND_ALL_GSM_DEFAULT;
@@ -285,10 +296,12 @@
item_modem.band_tdlte = MBTK_BAND_ALL_TDLTE_DEFAULT;
item_modem.band_fddlte = MBTK_BAND_ALL_FDDLTE_DEFAULT;
item_modem.band_lte_ext = MBTK_BAND_ALL_EXT_LTE_DEFAULT;
+#ifdef MBTK_DEV_INFO_VERSION_2
item_modem.band_nr_3 = MBTK_BAND_ALL_NR_3_DEFAULT;
item_modem.band_nr_2 = MBTK_BAND_ALL_NR_2_DEFAULT;
item_modem.band_nr_1 = MBTK_BAND_ALL_NR_1_DEFAULT;
item_modem.band_nr_0 = MBTK_BAND_ALL_NR_0_DEFAULT;
+#endif
printf("Set to default band.\n");
}
break;