Fix device_info for v1/v2.
Change-Id: I77c1da11f042bf2523d5768b18c18b9a0e1e0c6e
diff --git a/mbtk/mbtk_utils/device_info.c b/mbtk/mbtk_utils/device_info.c
index a5cc759..976f289 100755
--- a/mbtk/mbtk_utils/device_info.c
+++ b/mbtk/mbtk_utils/device_info.c
@@ -125,35 +125,36 @@
memset(info_modem, 0, sizeof(mbtk_device_info_modem_t));
if(mbtk_dev_info_read(MBTK_DEVICE_INFO_ITEM_MODEM, info_modem, sizeof(mbtk_device_info_modem_t))) {
printf("mbtk_dev_info_read(MODEM) fail, use default band.\n");
- info_modem->band_area = MBTK_MODEM_BAND_AREA_ALL;
+ info_modem->version = DEV_INFO_VERSION_V2;
+ info_modem->modem.v2.band_area = MBTK_MODEM_BAND_AREA_ALL;
#ifdef MBTK_5G_SUPPORT
- info_modem->net_pref = 19; // MBTK_NET_PREF_LTE_NR_NR_PREF
- info_modem->net_support = MBTK_NET_SUPPORT_4G | MBTK_NET_SUPPORT_5G;
+ info_modem->modem.v2.net_pref = 19; // MBTK_NET_PREF_LTE_NR_NR_PREF
+ info_modem->modem.v2.net_support = MBTK_NET_SUPPORT_4G | MBTK_NET_SUPPORT_5G;
- info_modem->band_gsm = 0;
- info_modem->band_wcdma = 0;
- info_modem->band_tdlte = MBTK_BAND_ALL_TDLTE_DEFAULT;
- info_modem->band_fddlte = MBTK_BAND_ALL_FDDLTE_DEFAULT;
- info_modem->band_lte_ext = MBTK_BAND_ALL_EXT_LTE_DEFAULT;
+ info_modem->modem.v2.band_gsm = 0;
+ info_modem->modem.v2.band_wcdma = 0;
+ info_modem->modem.v2.band_tdlte = MBTK_BAND_ALL_TDLTE_DEFAULT;
+ info_modem->modem.v2.band_fddlte = MBTK_BAND_ALL_FDDLTE_DEFAULT;
+ info_modem->modem.v2.band_lte_ext = MBTK_BAND_ALL_EXT_LTE_DEFAULT;
- info_modem->band_nr_3 = MBTK_BAND_ALL_NR_3_DEFAULT;
- info_modem->band_nr_2 = MBTK_BAND_ALL_NR_2_DEFAULT;
- info_modem->band_nr_1 = MBTK_BAND_ALL_NR_1_DEFAULT;
- info_modem->band_nr_0 = MBTK_BAND_ALL_NR_0_DEFAULT;
+ info_modem->modem.v2.band_nr_3 = MBTK_BAND_ALL_NR_3_DEFAULT;
+ info_modem->modem.v2.band_nr_2 = MBTK_BAND_ALL_NR_2_DEFAULT;
+ info_modem->modem.v2.band_nr_1 = MBTK_BAND_ALL_NR_1_DEFAULT;
+ info_modem->modem.v2.band_nr_0 = MBTK_BAND_ALL_NR_0_DEFAULT;
#else
- info_modem->net_pref = 15; // MBTK_NET_PREF_GSM_UMTS_LTE_LTE_PREF
- info_modem->net_support = MBTK_NET_SUPPORT_2G | MBTK_NET_SUPPORT_3G | MBTK_NET_SUPPORT_4G;
+ info_modem->modem.v2.net_pref = 15; // MBTK_NET_PREF_GSM_UMTS_LTE_LTE_PREF
+ info_modem->modem.v2.net_support = MBTK_NET_SUPPORT_2G | MBTK_NET_SUPPORT_3G | MBTK_NET_SUPPORT_4G;
- info_modem->band_gsm = MBTK_BAND_ALL_GSM_DEFAULT;
- info_modem->band_wcdma = MBTK_BAND_ALL_WCDMA_DEFAULT;
- info_modem->band_tdlte = MBTK_BAND_ALL_TDLTE_DEFAULT;
- info_modem->band_fddlte = MBTK_BAND_ALL_FDDLTE_DEFAULT;
- info_modem->band_lte_ext = MBTK_BAND_ALL_EXT_LTE_DEFAULT;
+ info_modem->modem.v2.band_gsm = MBTK_BAND_ALL_GSM_DEFAULT;
+ info_modem->modem.v2.band_wcdma = MBTK_BAND_ALL_WCDMA_DEFAULT;
+ info_modem->modem.v2.band_tdlte = MBTK_BAND_ALL_TDLTE_DEFAULT;
+ info_modem->modem.v2.band_fddlte = MBTK_BAND_ALL_FDDLTE_DEFAULT;
+ info_modem->modem.v2.band_lte_ext = MBTK_BAND_ALL_EXT_LTE_DEFAULT;
- info_modem->band_nr_3 = 0;
- info_modem->band_nr_2 = 0;
- info_modem->band_nr_1 = 0;
- info_modem->band_nr_0 = 0;
+ info_modem->modem.v2.band_nr_3 = 0;
+ info_modem->modem.v2.band_nr_2 = 0;
+ info_modem->modem.v2.band_nr_1 = 0;
+ info_modem->modem.v2.band_nr_0 = 0;
#endif
}
}
@@ -164,20 +165,24 @@
char rsp[100] = {0};
// Only support 4G/5G
- if(band->net_support & MBTK_NET_SUPPORT_5G) {
+ if(band->modem.v2.net_support & MBTK_NET_SUPPORT_5G) {
// AT*band=19,0,0,482,134742231,0,24576,256,134217877,0
- if(band->band_lte_ext > 0) {
- sprintf(cmd, "serial_atcmd AT*BAND=%d,%d,%d,%d,%d,%d,%d,%d,%d,0,,,,%d", band->net_pref, band->band_gsm, band->band_wcdma, band->band_tdlte, band->band_fddlte,
- band->band_nr_3, band->band_nr_2, band->band_nr_1, band->band_nr_0, band->band_lte_ext);
+ if(band->modem.v2.band_lte_ext > 0) {
+ sprintf(cmd, "serial_atcmd AT*BAND=%d,%d,%d,%d,%d,%d,%d,%d,%d,0,,,,%d", band->modem.v2.net_pref, band->modem.v2.band_gsm,
+ band->modem.v2.band_wcdma, band->modem.v2.band_tdlte, band->modem.v2.band_fddlte,
+ band->modem.v2.band_nr_3, band->modem.v2.band_nr_2, band->modem.v2.band_nr_1,
+ band->modem.v2.band_nr_0, band->modem.v2.band_lte_ext);
} else {
- sprintf(cmd, "serial_atcmd AT*BAND=%d,%d,%d,%d,%d,%d,%d,%d,%d,0", band->net_pref, band->band_gsm, band->band_wcdma, band->band_tdlte, band->band_fddlte,
- band->band_nr_3, band->band_nr_2, band->band_nr_1, band->band_nr_0);
+ sprintf(cmd, "serial_atcmd AT*BAND=%d,%d,%d,%d,%d,%d,%d,%d,%d,0", band->modem.v2.net_pref, band->modem.v2.band_gsm,
+ band->modem.v2.band_wcdma, band->modem.v2.band_tdlte, band->modem.v2.band_fddlte,
+ band->modem.v2.band_nr_3, band->modem.v2.band_nr_2, band->modem.v2.band_nr_1, band->modem.v2.band_nr_0);
}
} else {
- if(band->band_lte_ext > 0) {
- sprintf(cmd, "serial_atcmd AT*BAND=%d,%d,%d,%d,%d,,,,%d", band->net_pref, band->band_gsm, band->band_wcdma, band->band_tdlte, band->band_fddlte, band->band_lte_ext);
+ if(band->modem.v2.band_lte_ext > 0) {
+ sprintf(cmd, "serial_atcmd AT*BAND=%d,%d,%d,%d,%d,,,,%d", band->modem.v2.net_pref, band->modem.v2.band_gsm, band->modem.v2.band_wcdma,
+ band->modem.v2.band_tdlte, band->modem.v2.band_fddlte, band->modem.v2.band_lte_ext);
} else {
- sprintf(cmd, "serial_atcmd AT*BAND=%d,%d,%d,%d,%d", band->net_pref, band->band_gsm, band->band_wcdma, band->band_tdlte, band->band_fddlte);
+ sprintf(cmd, "serial_atcmd AT*BAND=%d,%d,%d,%d,%d", band->modem.v2.net_pref, band->modem.v2.band_gsm, band->modem.v2.band_wcdma, band->modem.v2.band_tdlte, band->modem.v2.band_fddlte);
}
}
@@ -205,11 +210,11 @@
}
else // Set band success.
{
- if(info_modem->band_area == MBTK_MODEM_BAND_AREA_CN) {
+ if(info_modem->modem.v2.band_area == MBTK_MODEM_BAND_AREA_CN) {
property_set("persist.mbtk.band_config", "CN");
- } else if(info_modem->band_area == MBTK_MODEM_BAND_AREA_EU) {
+ } else if(info_modem->modem.v2.band_area == MBTK_MODEM_BAND_AREA_EU) {
property_set("persist.mbtk.band_config", "EU");
- } else if(info_modem->band_area == MBTK_MODEM_BAND_AREA_SA) {
+ } else if(info_modem->modem.v2.band_area == MBTK_MODEM_BAND_AREA_SA) {
property_set("persist.mbtk.band_config", "SA");
} else {
property_set("persist.mbtk.band_config", "ALL");
@@ -258,14 +263,25 @@
uint8 revision_out[48]; // L508_X6v01.01b04.00
uint8 revision_in[64];
*/
- printf("Project:%s\n", info_basic.project);
- printf("Custom_Model:%s\n", info_basic.project_cust);
- printf("Revision_Out:%s\n", info_basic.revision_out);
- printf("Revision_In:%s\n", info_basic.revision_in);
- printf("Build_Time:%s\n", info_basic.build_time);
- printf("AB System:%s\n", info_basic.ab_support ? "Yes" : "No");
- printf("Reboot flag:%d\n", info_basic.reboot_flag);
- printf("ASR Baseline:%s\n", info_basic.asr_baseline);
+ printf("Version:%d\n", info_basic.version);
+ if(info_basic.version == DEV_INFO_VERSION_V1) {
+ printf("Project:%s\n", info_basic.basic.v1.project);
+ printf("Custom_Model:%s\n", info_basic.basic.v1.project_cust);
+ printf("Revision_Out:%s\n", info_basic.basic.v1.revision_out);
+ printf("Revision_In:%s\n", info_basic.basic.v1.revision_in);
+ printf("Build_Time:%s\n", info_basic.basic.v1.build_time);
+ printf("AB System:%s\n", info_basic.basic.v1.ab_support ? "Yes" : "No");
+ printf("Reboot flag:%d\n", info_basic.basic.v1.reboot_flag);
+ } else {
+ printf("Project:%s\n", info_basic.basic.v2.project);
+ printf("Custom_Model:%s\n", info_basic.basic.v2.project_cust);
+ printf("Revision_Out:%s\n", info_basic.basic.v2.revision_out);
+ printf("Revision_In:%s\n", info_basic.basic.v2.revision_in);
+ printf("Build_Time:%s\n", info_basic.basic.v2.build_time);
+ printf("AB System:%s\n", info_basic.basic.v2.ab_support ? "Yes" : "No");
+ printf("Reboot flag:%d\n", info_basic.basic.v2.reboot_flag);
+ printf("ASR Baseline:%s\n", info_basic.basic.v2.asr_baseline);
+ }
mbtk_device_info_modem_t info_modem;
memset(&info_modem, 0, sizeof(mbtk_device_info_modem_t));
@@ -275,18 +291,27 @@
return -1;
}
- printf("net_pref:%d\n", info_modem.net_pref);
- printf("net_support:%s\n", net_support_str_get(info_modem.net_support));
- printf("Band:%s\n", band_2_str(info_modem.band_area));
- printf("Band GSM:0x%08x(%s)\n", info_modem.band_gsm, band_str_get(info_modem.band_gsm, 0));
- printf("Band WCDMA:0x%08x(%s)\n", info_modem.band_wcdma, band_str_get(info_modem.band_wcdma, 0));
- printf("Band TDLTE:0x%08x(%s)\n", info_modem.band_tdlte, band_str_get(info_modem.band_tdlte, 1));
- printf("Band FDDLTE:0x%08x(%s)\n", info_modem.band_fddlte, band_str_get(info_modem.band_fddlte, 0));
- printf("Band EXT_LTE:0x%08x(%s)\n", info_modem.band_lte_ext, band_str_get(info_modem.band_lte_ext, 0));
- printf("Band NR_3:0x%08x(%s)\n", info_modem.band_nr_3, band_str_get(info_modem.band_nr_3, 3));
- printf("Band NR_2:0x%08x(%s)\n", info_modem.band_nr_2, band_str_get(info_modem.band_nr_2, 2));
- printf("Band NR_1:0x%08x(%s)\n", info_modem.band_nr_1, band_str_get(info_modem.band_nr_1, 1));
- printf("Band NR_0:0x%08x(%s)\n", info_modem.band_nr_0, band_str_get(info_modem.band_nr_0, 0));
+ if(info_modem.version == DEV_INFO_VERSION_V1) {
+ printf("Band:%s\n", band_2_str(info_modem.modem.v1.band_area));
+ printf("Band GSM:0x%08x(%s)\n", info_modem.modem.v1.band_gsm, band_str_get(info_modem.modem.v1.band_gsm, 0));
+ printf("Band WCDMA:0x%08x(%s)\n", info_modem.modem.v1.band_wcdma, band_str_get(info_modem.modem.v1.band_wcdma, 0));
+ printf("Band TDLTE:0x%08x(%s)\n", info_modem.modem.v1.band_tdlte, band_str_get(info_modem.modem.v1.band_tdlte, 1));
+ printf("Band FDDLTE:0x%08x(%s)\n", info_modem.modem.v1.band_fddlte, band_str_get(info_modem.modem.v1.band_fddlte, 0));
+ printf("Band EXT_LTE:0x%08x(%s)\n", info_modem.modem.v1.band_lte_ext, band_str_get(info_modem.modem.v1.band_lte_ext, 0));
+ } else {
+ printf("net_pref:%d\n", info_modem.modem.v2.net_pref);
+ printf("net_support:%s\n", net_support_str_get(info_modem.modem.v2.net_support));
+ printf("Band:%s\n", band_2_str(info_modem.modem.v2.band_area));
+ printf("Band GSM:0x%08x(%s)\n", info_modem.modem.v2.band_gsm, band_str_get(info_modem.modem.v2.band_gsm, 0));
+ printf("Band WCDMA:0x%08x(%s)\n", info_modem.modem.v2.band_wcdma, band_str_get(info_modem.modem.v2.band_wcdma, 0));
+ printf("Band TDLTE:0x%08x(%s)\n", info_modem.modem.v2.band_tdlte, band_str_get(info_modem.modem.v2.band_tdlte, 1));
+ printf("Band FDDLTE:0x%08x(%s)\n", info_modem.modem.v2.band_fddlte, band_str_get(info_modem.modem.v2.band_fddlte, 0));
+ printf("Band EXT_LTE:0x%08x(%s)\n", info_modem.modem.v2.band_lte_ext, band_str_get(info_modem.modem.v2.band_lte_ext, 0));
+ printf("Band NR_3:0x%08x(%s)\n", info_modem.modem.v2.band_nr_3, band_str_get(info_modem.modem.v2.band_nr_3, 3));
+ printf("Band NR_2:0x%08x(%s)\n", info_modem.modem.v2.band_nr_2, band_str_get(info_modem.modem.v2.band_nr_2, 2));
+ printf("Band NR_1:0x%08x(%s)\n", info_modem.modem.v2.band_nr_1, band_str_get(info_modem.modem.v2.band_nr_1, 1));
+ printf("Band NR_0:0x%08x(%s)\n", info_modem.modem.v2.band_nr_0, band_str_get(info_modem.modem.v2.band_nr_0, 0));
+ }
}
return 0;
}
diff --git a/mbtk/mbtk_utils/mbtk_reboot.c b/mbtk/mbtk_utils/mbtk_reboot.c
index a355235..d3861e2 100755
--- a/mbtk/mbtk_utils/mbtk_reboot.c
+++ b/mbtk/mbtk_utils/mbtk_reboot.c
@@ -45,7 +45,11 @@
return -1;
}
- info_basic.reboot_flag = MBTK_REBOOT_FLAG_DOWNLOAD;
+ if(info_basic.version == DEV_INFO_VERSION_V1) {
+ info_basic.basic.v1.reboot_flag = MBTK_REBOOT_FLAG_DOWNLOAD;
+ } else {
+ info_basic.basic.v2.reboot_flag = MBTK_REBOOT_FLAG_DOWNLOAD;
+ }
result = mbtk_dev_info_write(MBTK_DEVICE_INFO_ITEM_BASIC, &info_basic, sizeof(mbtk_device_info_basic_t));
if(result) {
printf("mbtk_dev_info_write(BASIC) fail.\n");