commit 9f91db309c6810e0c1584c017830d04991d82805
author b.liu <b.liu@mobiletek.cn> Thu Feb 13 11:24:18 2025 +0800
committer b.liu <b.liu@mobiletek.cn> Thu Feb 13 11:24:18 2025 +0800
tree 1770b9b968cd865c848f8d0af6920535a86010be
parent beb61cc3d916d494a348c93a7e1c76ae5997f02b

Del dev_info v1

Change-Id: Iaa89db40f960f30dfefe6f455dbe886c9d2bb2df

mbtk/mbtk_utils/device_info.c

diff --git a/mbtk/mbtk_utils/device_info.c b/mbtk/mbtk_utils/device_info.c
index da66f3d..a25016d 100755
--- a/mbtk/mbtk_utils/device_info.c
+++ b/mbtk/mbtk_utils/device_info.c
@@ -2,11 +2,7 @@
 #include "mbtk_type.h"
 #include "mbtk_utils.h"
 
-#ifdef MBTK_DEV_INFO_VERSION_2
-#include "mbtk_device_v2.h"
-#else
 #include "mbtk_device.h"
-#endif
 
 
 static char* band_2_str(mbtk_modem_band_area_enum band_area)
@@ -24,7 +20,6 @@
     }
 }
 
-#ifdef MBTK_DEV_INFO_VERSION_2
 static char* net_support_str_get(uint32 net_support)
 {
     static char net_str[100] = {0};
@@ -62,7 +57,6 @@
     }
     return net_str;
 }
-#endif
 
 static char* band_str_get(uint32 band, int index)
 {
@@ -119,7 +113,6 @@
         return -1;
     }
 
-#ifdef MBTK_DEV_INFO_VERSION_2
     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));
@@ -132,14 +125,6 @@
     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));
-#else
-    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));
-#endif
 
     return 0;
 }

mbtk/mbtk_utils/mbtk_reboot.c

diff --git a/mbtk/mbtk_utils/mbtk_reboot.c b/mbtk/mbtk_utils/mbtk_reboot.c
index 3a85294..a355235 100755
--- a/mbtk/mbtk_utils/mbtk_reboot.c
+++ b/mbtk/mbtk_utils/mbtk_reboot.c
@@ -1,10 +1,7 @@
 #include <string.h>
 #include "mbtk_type.h"
-#ifdef MBTK_DEV_INFO_VERSION_2
-#include "mbtk_device_v2.h"
-#else
+
 #include "mbtk_device.h"
-#endif
 #include "mbtk_utils.h"
 #if 0
 static char* band_2_str(mbtk_modem_band_area_enum band_area)