Revert "Revert "Fix device_info for v1/v2.""
This reverts commit 7514c31bc41f710de696c1b9c8ba446482eea641.
Reason for revert: okay
Change-Id: I2c8d1230db2998acc728dcd5496e71c1a9ca2eff
diff --git a/mbtk/mbtk_at/asr/mbtk_device_info.c b/mbtk/mbtk_at/asr/mbtk_device_info.c
index 1158301..e1238a6 100755
--- a/mbtk/mbtk_at/asr/mbtk_device_info.c
+++ b/mbtk/mbtk_at/asr/mbtk_device_info.c
@@ -61,11 +61,20 @@
return -1;
}
- if(strlen(info_basic.revision_out) > 0) {
- memcpy(revision_out, info_basic.revision_out, strlen(info_basic.revision_out));
- }
- if(strlen(info_basic.revision_in) > 0) {
- memcpy(revision_in, info_basic.revision_in, strlen(info_basic.revision_in));
+ if(info_basic.version == DEV_INFO_VERSION_V1) {
+ if(strlen(info_basic.basic.v1.revision_out) > 0) {
+ memcpy(revision_out, info_basic.basic.v1.revision_out, strlen(info_basic.basic.v1.revision_out));
+ }
+ if(strlen(info_basic.basic.v1.revision_in) > 0) {
+ memcpy(revision_in, info_basic.basic.v1.revision_in, strlen(info_basic.basic.v1.revision_in));
+ }
+ } else {
+ if(strlen(info_basic.basic.v2.revision_out) > 0) {
+ memcpy(revision_out, info_basic.basic.v2.revision_out, strlen(info_basic.basic.v2.revision_out));
+ }
+ if(strlen(info_basic.basic.v2.revision_in) > 0) {
+ memcpy(revision_in, info_basic.basic.v2.revision_in, strlen(info_basic.basic.v2.revision_in));
+ }
}
dev_info_inited = TRUE;
return 0;
diff --git a/mbtk/mbtk_at/src/mbtk_at_basic.c b/mbtk/mbtk_at/src/mbtk_at_basic.c
index 55638ef..77be9bf 100755
--- a/mbtk/mbtk_at/src/mbtk_at_basic.c
+++ b/mbtk/mbtk_at/src/mbtk_at_basic.c
@@ -734,13 +734,23 @@
{
char resp_buf[MBTK_AT_RESP_LEN_MAX] = {0};
if(!dev_info_get()) {
- snprintf(resp_buf, MBTK_AT_RESP_LEN_MAX,
- "Revision:%s\r\n"
- "Custom_Model:%s\r\n"
- "Module_Type:%s\r\n",
- strlen(info_basic.revision_out) > 0 ? info_basic.revision_out: "Unknown",
- strlen(info_basic.project_cust) > 0 ? info_basic.project_cust: "Unknown",
- band_area_2_str(info_modem.band_area));
+ if(info_basic.version == DEV_INFO_VERSION_V1) {
+ snprintf(resp_buf, MBTK_AT_RESP_LEN_MAX,
+ "Revision:%s\r\n"
+ "Custom_Model:%s\r\n"
+ "Module_Type:%s\r\n",
+ strlen(info_basic.basic.v1.revision_out) > 0 ? info_basic.basic.v1.revision_out: "Unknown",
+ strlen(info_basic.basic.v1.project_cust) > 0 ? info_basic.basic.v1.project_cust: "Unknown",
+ band_area_2_str(info_modem.modem.v1.band_area));
+ } else {
+ snprintf(resp_buf, MBTK_AT_RESP_LEN_MAX,
+ "Revision:%s\r\n"
+ "Custom_Model:%s\r\n"
+ "Module_Type:%s\r\n",
+ strlen(info_basic.basic.v2.revision_out) > 0 ? info_basic.basic.v2.revision_out: "Unknown",
+ strlen(info_basic.basic.v2.project_cust) > 0 ? info_basic.basic.v2.project_cust: "Unknown",
+ band_area_2_str(info_modem.modem.v2.band_area));
+ }
} else {
snprintf(resp_buf, MBTK_AT_RESP_LEN_MAX,
"Revision:%s\r\n"
@@ -1003,9 +1013,15 @@
{
char resp_buf[MBTK_AT_RESP_LEN_MAX] = {0};
if(!dev_info_get()) {
- snprintf(resp_buf, MBTK_AT_RESP_LEN_MAX, "Version: %s\r\nBuild time: %s\r\n",
- strlen(info_basic.revision_out) > 0 ? info_basic.revision_out: "Unknown",
- strlen(info_basic.build_time) > 0 ? info_basic.build_time: "Unknown");
+ if(info_basic.version == DEV_INFO_VERSION_V1) {
+ snprintf(resp_buf, MBTK_AT_RESP_LEN_MAX, "Version: %s\r\nBuild time: %s\r\n",
+ strlen(info_basic.basic.v1.revision_out) > 0 ? info_basic.basic.v1.revision_out: "Unknown",
+ strlen(info_basic.basic.v1.build_time) > 0 ? info_basic.basic.v1.build_time: "Unknown");
+ } else {
+ snprintf(resp_buf, MBTK_AT_RESP_LEN_MAX, "Version: %s\r\nBuild time: %s\r\n",
+ strlen(info_basic.basic.v2.revision_out) > 0 ? info_basic.basic.v2.revision_out: "Unknown",
+ strlen(info_basic.basic.v2.build_time) > 0 ? info_basic.basic.v2.build_time: "Unknown");
+ }
} else {
snprintf(resp_buf, MBTK_AT_RESP_LEN_MAX, "Version: %s\r\nBuild time: %s\r\n",
"Unknown", "Unknown");