From d155d5e6726f2447a684b593b1b66e89614d765a Mon Sep 17 00:00:00 2001 From: Zhao_Jiasheng <18535861947@163.com> Date: Fri, 30 Apr 2021 15:51:45 +0800 Subject: [PATCH] Repair NBIoT changed interfaces --- applications/connection_demo/nbiot_demo/nbiot_demo.c | 4 +++- framework/connection/Adapter/include/xs_adapter_at_nbiot.h | 2 +- framework/connection/Adapter/nbiot/bc28/xs_adapter_at_nbiot.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/applications/connection_demo/nbiot_demo/nbiot_demo.c b/applications/connection_demo/nbiot_demo/nbiot_demo.c index 272a6aaf..40219762 100644 --- a/applications/connection_demo/nbiot_demo/nbiot_demo.c +++ b/applications/connection_demo/nbiot_demo/nbiot_demo.c @@ -24,6 +24,8 @@ #include #include +extern void RegisterAdapterNBIoT(void); + void NbiotEnable(void) { RegisterAdapterNBIoT(); @@ -39,7 +41,7 @@ void NbiotEnable(void) at_adapter->atdone.ATSocketCreate(at_adapter, 1, SOCKET_TYPE_STREAM, NET_TYPE_AF_INET); UserTaskDelay(1000); - struct ADDRESS_IPV4 addr; + struct AddressIpv4 addr; addr.ipv4 = IpTint("115.236.53.226"); at_adapter->atdone.ATSocketConnect(at_adapter, 1, addr, 8989, 0); diff --git a/framework/connection/Adapter/include/xs_adapter_at_nbiot.h b/framework/connection/Adapter/include/xs_adapter_at_nbiot.h index 5e7e4d8b..ed1f0763 100644 --- a/framework/connection/Adapter/include/xs_adapter_at_nbiot.h +++ b/framework/connection/Adapter/include/xs_adapter_at_nbiot.h @@ -47,7 +47,7 @@ int NbiotOpen(struct Adapter *padapter); int NbiotSend(struct Adapter *padapter, const char* data, int len, bool block, int time_out, int delay, send_success cb, void* param, void* reserved); int NBIotRecv(struct Adapter *padapter, char *rev_buffer, int buffer_len, int time_out, bool block); -int NBIoTSocketConnect(struct AdapterAT *adapterAT , uint8_t socket_fd , struct ADDRESS_IPV4 dst_ip , uint16_t dst_port, uint8 is_client); +int NBIoTSocketConnect(struct AdapterAT *adapterAT , uint8_t socket_fd , struct AddressIpv4 dst_ip , uint16_t dst_port, uint8 is_client); int NBIoTSocketCreate(struct AdapterAT *adapterAT, uint8_t socket_fd, uint8_t type, uint8_t af_type ); int NBIoTSocketClose(struct AdapterAT *adapterAT, uint8_t socket_fd ); diff --git a/framework/connection/Adapter/nbiot/bc28/xs_adapter_at_nbiot.c b/framework/connection/Adapter/nbiot/bc28/xs_adapter_at_nbiot.c index 89248230..44e37d09 100644 --- a/framework/connection/Adapter/nbiot/bc28/xs_adapter_at_nbiot.c +++ b/framework/connection/Adapter/nbiot/bc28/xs_adapter_at_nbiot.c @@ -153,7 +153,7 @@ int NBIoTSocketCreate(struct AdapterAT *adapterAT, uint8_t socket_fd, uint8_t ty printf("error socket type \n"); return -1 ; } - + printf("cmd : %s\n", at_cmd); ATOrderSend(adapterAT->agent, REPLY_TIME_OUT, reply, at_cmd); MdelayKTask(3000); @@ -180,7 +180,7 @@ __exit: * @param is_client - whether it is a client * @return success: EOK, failure: -ERROR */ -int NBIoTSocketConnect(struct AdapterAT *adapterAT , uint8_t socket_fd , struct ADDRESS_IPV4 dst_ip , uint16_t dst_port, uint8 is_client) +int NBIoTSocketConnect(struct AdapterAT *adapterAT , uint8_t socket_fd , struct AddressIpv4 dst_ip , uint16_t dst_port, uint8 is_client) { int result;