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;