remove redefinition and repair compile error

This commit is contained in:
Wang_Weigen
2021-10-18 18:17:24 +08:00
parent 9bf26cdbf9
commit abe138ab27
4 changed files with 419 additions and 33 deletions
@@ -4,7 +4,7 @@ if CONNECTION_ADAPTER_NB
default y
if ADAPTER_BC28
source "$APP_DIR/Framework/connection/nbiot/BC28/Kconfig"
source "$APP_DIR/Framework/connection/nbiot/bc28/Kconfig"
endif
endif
@@ -1,7 +1,7 @@
SRC_FILES := adapter_nbiot.c
ifeq ($(CONFIG_ADAPTER_BC28),y)
SRC_DIR += BC28
SRC_DIR += bc28
endif
include $(KERNEL_ROOT)/compiler.mk
@@ -30,37 +30,6 @@
#define SOCKET_INVALID_ID (-1)
static int AtCmdConfigAndCheck(ATAgentType agent, char *cmd, char *check)
{
char *result = NULL;
if (NULL == agent || NULL == cmd || NULL == check ) {
return -1;
}
ATReplyType reply = CreateATReply(64);
if (NULL == reply) {
printf("%s %d at_create_resp failed!\n",__func__,__LINE__);
return -1;
}
ATOrderSend(agent, REPLY_TIME_OUT, reply, cmd);
PrivTaskDelay(300);
result = GetReplyText(reply);
if (!result) {
printf("%s %n get reply failed.\n",__func__,__LINE__);
goto __exit;
}
if(0 != strncmp(result, check, strlen(check))) {
printf("%s %d check[%s] reply[%s] failed.\n",__func__,__LINE__,check,result);
goto __exit;
}
return 0;
__exit:
DeleteATReply(reply);
return -1;
}
static int BC28UartOpen(struct Adapter *adapter)
{