Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into ok1052

2022-04-25 11:56:33 +08:00
parent 4bfa154ed6 03bfe85c2b
commit 770a713179
18 changed files with 738 additions and 95 deletions
--- a/APP_Framework/Framework/connection/4g/adapter_4g.c
+++ b/APP_Framework/Framework/connection/4g/adapter_4g.c
@@ -24,8 +24,6 @@
 extern AdapterProductInfoType Ec200tAttach(struct Adapter *adapter);
 #endif

-#define ADAPTER_4G_NAME "4G"
-
 static int Adapter4GRegister(struct Adapter *adapter)
 {
    int ret = 0;