From a3333a2bb36cef3aebe85ff053efc42ee0dc1cfb Mon Sep 17 00:00:00 2001 From: bob_qu Date: Thu, 3 Nov 2022 17:40:35 +0800 Subject: [PATCH] add AT functions Signed-off-by: bob_qu --- wm800/board/include/net/wm_socket2.0.3.h | 243 +++--- wm800/board/include/net/wm_sockets2.0.3.h | 268 +++--- wm800/board/platform/common/task/wm_wl_task.c | 4 +- wm800/board/src/app/wm_atcmd/wm_cmdp.c | 23 +- wm800/board/src/app/wm_atcmd/wm_cmdp_hostif.c | 778 +++++++++++------- .../board/src/network/api2.0.3/tls_netconn.c | 32 +- 6 files changed, 751 insertions(+), 597 deletions(-) diff --git a/wm800/board/include/net/wm_socket2.0.3.h b/wm800/board/include/net/wm_socket2.0.3.h index c837251..f93ad2e 100755 --- a/wm800/board/include/net/wm_socket2.0.3.h +++ b/wm800/board/include/net/wm_socket2.0.3.h @@ -18,13 +18,13 @@ #include "wm_type_def.h" #include "wm_netif.h" -//socket state defination + /* socket state defination */ #define NETCONN_STATE_NONE 0 #define NETCONN_STATE_WAITING 1 #define NETCONN_STATE_CONNECTED 2 #define NETCONN_STATE_CLOSED 3 -//socket event defination + /* socket event defination */ #define NET_EVENT_TCP_JOINED 0 #define NET_EVENT_TCP_DISCONNECT 1 #define NET_EVENT_TCP_CONNECTED 2 @@ -35,38 +35,38 @@ #define TLS_MAX_SOCKET_NUM 4 #define TLS_MAX_NETCONN_NUM 20 -/** Main packet buffer struct */ + /** Main packet buffer struct */ struct pbuf { - /** next pbuf in singly linked pbuf chain */ - struct pbuf *next; + /** next pbuf in singly linked pbuf chain */ + struct pbuf *next; - /** pointer to the actual data in the buffer */ - void *payload; + /** pointer to the actual data in the buffer */ + void *payload; - /** - * total length of this buffer and all next buffers in chain - * belonging to the same packet. - * - * For non-queue packet chains this is the invariant: - * p->tot_len == p->len + (p->next? p->next->tot_len: 0) - */ - u16_t tot_len; + /** + * total length of this buffer and all next buffers in chain + * belonging to the same packet. + * + * For non-queue packet chains this is the invariant: + * p->tot_len == p->len + (p->next? p->next->tot_len: 0) + */ + u16_t tot_len; - /** length of this buffer */ - u16_t len; + /** length of this buffer */ + u16_t len; - /** pbuf_type as u8_t instead of enum to save space */ - u8_t /*pbuf_type*/ type; + /** pbuf_type as u8_t instead of enum to save space */ + u8_t /*pbuf_type*/ type; - /** misc flags */ - u8_t flags; + /** misc flags */ + u8_t flags; - /** - * the reference count always equals the number of pointers - * that refer to this pbuf. This can be pointers from an application, - * the stack itself, or pbuf->next pointers from a chain. - */ - u16_t ref; + /** + * the reference count always equals the number of pointers + * that refer to this pbuf. This can be pointers from an application, + * the stack itself, or pbuf->next pointers from a chain. + */ + u16_t ref; }; /** @@ -81,7 +81,7 @@ struct pbuf { * callback functions * ERR_RST: the connection was reset by the remote host */ -typedef void (*socket_err_fn)(u8 skt_num, err_t err); +typedef void (*socket_err_fn)(u8 skt_num, err_t err); /** * @brief This Function prototype for socket receive callback functions. Called when data has @@ -94,12 +94,12 @@ typedef void (*socket_err_fn)(u8 skt_num, err_t err); * @param[in] err An error code if there has been an error receiving, always be ERR_OK * when cs mode is udp. * -* @retval The return value is only valid for tcp receive, for upd it means nothing. +* @retval The return value is only valid for tcp receive, for upd it means nothing. * ERR_OK: Return this value after handling the received data. * ERR_ABRT: Only return ERR_ABRT if you want to abort the socket from within the * callback function! */ -typedef err_t (*socket_recv_fn)(u8 skt_num, struct pbuf *p, err_t err); +typedef err_t (*socket_recv_fn)(u8 skt_num, struct pbuf *p, err_t err); /** * @brief This Function prototype for socket srce ip callback functions. Called when data has @@ -116,12 +116,12 @@ typedef err_t (*socket_recv_fn)(u8 skt_num, struct pbuf *p, err_t err); * @param[in] err An error code if there has been an error receiving, always be ERR_OK * when cs mode is udp. * -* @retval The return value is only valid for UDP receive, for udp it means nothing. +* @retval The return value is only valid for UDP receive, for udp it means nothing. * ERR_OK: Return this value after handling the received data. * ERR_ABRT: Only return ERR_ABRT if you want to abort the socket from within the * callback function! */ -typedef err_t (*socket_recv_ip_rpt_fn)(u8 skt_num, u16 datalen, u8 *ipsrc, u16 port, err_t err); +typedef err_t (*socket_recv_ip_rpt_fn)(u8 skt_num, u16 datalen, u8 *ipsrc, u16 port, err_t err); /** * @brief This Function prototype for tcp connected callback functions. Called when @@ -135,7 +135,7 @@ typedef err_t (*socket_recv_ip_rpt_fn)(u8 skt_num, u16 datalen, u8 *ipsrc, u16 * @retval ERR_ABRT: Only return ERR_ABRT if you want to abort the socket from within the * callback function! */ -typedef err_t (*socket_connected_fn)(u8 skt_num, err_t err); +typedef err_t (*socket_connected_fn)(u8 skt_num, err_t err); /** * @brief This Function prototype for tcp poll callback functions. Called periodically. @@ -176,44 +176,43 @@ typedef void(*socket_state_changed_fn)(u8 skt_num, u8 event, u8 state); /** Definitions for error constants. */ typedef enum { -/** No error, everything OK. */ - ERR_OK = 0, -/** Out of memory error. */ - ERR_MEM = -1, -/** Buffer error. */ - ERR_BUF = -2, -/** Timeout. */ - ERR_TIMEOUT = -3, -/** Routing problem. */ - ERR_RTE = -4, -/** Operation in progress */ - ERR_INPROGRESS = -5, -/** Illegal value. */ - ERR_VAL = -6, -/** Operation would block. */ - ERR_WOULDBLOCK = -7, -/** Address in use. */ - ERR_USE = -8, -/** Already connecting. */ - ERR_ALREADY = -9, -/** Conn already established.*/ - ERR_ISCONN = -10, -/** Not connected. */ - ERR_CONN = -11, -/** Low-level netif error */ - ERR_IF = -12, + /** No error, everything OK. */ + ERR_OK = 0, + /** Out of memory error. */ + ERR_MEM = -1, + /** Buffer error. */ + ERR_BUF = -2, + /** Timeout. */ + ERR_TIMEOUT = -3, + /** Routing problem. */ + ERR_RTE = -4, + /** Operation in progress */ + ERR_INPROGRESS = -5, + /** Illegal value. */ + ERR_VAL = -6, + /** Operation would block. */ + ERR_WOULDBLOCK = -7, + /** Address in use. */ + ERR_USE = -8, + /** Already connecting. */ + ERR_ALREADY = -9, + /** Conn already established.*/ + ERR_ISCONN = -10, + /** Not connected. */ + ERR_CONN = -11, + /** Low-level netif error */ + ERR_IF = -12, + /** Connection aborted. */ + ERR_ABRT = -13, + /** Connection reset. */ + ERR_RST = -14, + /** Connection closed. */ + ERR_CLSD = -15, + /** Illegal argument. */ + ERR_ARG = -16 +}err_enum_t; -/** Connection aborted. */ - ERR_ABRT = -13, -/** Connection reset. */ - ERR_RST = -14, -/** Connection closed. */ - ERR_CLSD = -15, -/** Illegal argument. */ - ERR_ARG = -16 -} err_enum_t; - -enum tls_socket_protocol{ +enum tls_socket_protocol { SOCKET_PROTO_TCP, /* TCP Protocol */ SOCKET_PROTO_UDP, /* UDP Protocol */ }; @@ -225,22 +224,22 @@ enum tls_socket_cs_mode{ struct tls_socket_desc { enum tls_socket_cs_mode cs_mode; /* Server mode or Client mode, Only for tcp protocol is valid */ - enum tls_socket_protocol protocol; /* TCP Protocol or UDP Protocol */ - ip_addr_t ip_addr; /* Remote ip address, for tcp client mode is remote server's ip address; for tcp server mode can be any address. */ - /* for udp is remote server's ip address */ - u16 port; /* port, for tcp client mode is remote server's port; for tcp server mode is local listen port . - for udp is remote server's port */ - u16 localport; /* local port, for udp and tcp client is local listen port, for tcp server means nothing, tcp server always listen at port */ - char host_name[32]; /* remote host name, not support for now */ - u8 host_len; /* the length of host name */ - u32 timeout; /* poll timeout, not implemented for now */ - socket_err_fn errf; /* a pointer to socket_err_fn */ - socket_recv_fn recvf; /* a pointer to socket_recv_fn */ - socket_connected_fn connf; /* a pointer to socket_connected_fn */ - socket_poll_fn pollf; /* a pointer to socket_poll_fn */ - socket_accept_fn acceptf; /* a pointer to socket_accept_fn */ - socket_state_changed_fn state_changed; /* a pointer to socket_state_changed_fn */ - socket_recv_ip_rpt_fn recvwithipf; /*recv skt info report*/ + enum tls_socket_protocol protocol; /* TCP Protocol or UDP Protocol */ + ip_addr_t ip_addr; /* Remote ip address, for tcp client mode is remote server's ip address; for tcp server mode can be any address. */ + /* for udp is remote server's ip address */ + u16 port; /* port, for tcp client mode is remote server's port; for tcp server mode is local listen port . + for udp is remote server's port */ + u16 localport; /* local port, for udp and tcp client is local listen port, for tcp server means nothing, tcp server always listen at port */ + char host_name[32]; /* remote host name, not support for now */ + u8 host_len; /* the length of host name */ + u32 timeout; /* poll timeout, not implemented for now */ + socket_err_fn errf; /* a pointer to socket_err_fn */ + socket_recv_fn recvf; /* a pointer to socket_recv_fn */ + socket_connected_fn connf; /* a pointer to socket_connected_fn */ + socket_poll_fn pollf; /* a pointer to socket_poll_fn */ + socket_accept_fn acceptf; /* a pointer to socket_accept_fn */ + socket_state_changed_fn state_changed; /* a pointer to socket_state_changed_fn */ + socket_recv_ip_rpt_fn recvwithipf; /*recv skt info report*/ }; /** @@ -248,7 +247,7 @@ struct tls_socket_desc { * * @param[in] skd Is a pointer to an tls_socket_desc. * -* @retval ERR_OK If create socket successfully. +* @retval ERR_OK If create socket successfully. * negative number If an error was detected. */ int tls_socket_create(struct tls_socket_desc * skd); @@ -262,7 +261,7 @@ int tls_socket_create(struct tls_socket_desc * skd); * * @param[in] len The data's length. * -* @retval ERR_OK If send data successfully. +* @retval ERR_OK If send data successfully. * negative number If an error was detected. */ int tls_socket_send(u8 skt_num, void *pdata, u16 len); @@ -272,7 +271,7 @@ int tls_socket_send(u8 skt_num, void *pdata, u16 len); * * @param[in] skt_num Is the socket number that returned by tls_socket_create function. * -* @retval ERR_OK If close socket successfully. +* @retval ERR_OK If close socket successfully. * negative number If an error was detected. */ int tls_socket_close(u8 skt_num); @@ -299,7 +298,7 @@ struct tls_skt_status_t { * * @param[in] len The buf's length. At least, the len should be bigger than sizeof(struct tls_skt_status_t). * -* @retval ERR_OK If send data successfully. +* @retval ERR_OK If send data successfully. * negative number If an error was detected. */ int tls_socket_get_status(u8 skt_num, u8 *buf, u32 bufsize); @@ -317,68 +316,68 @@ int tls_socket_get_status(u8 skt_num, u8 *buf, u32 bufsize); * @param[in] pdata Is a pointer to the data which need to be send by the socket. * * @param[in] len The data's length. -* @retval ERR_OK If send data successfully. +* @retval ERR_OK If send data successfully. * negative number If an error was detected. */ -int tls_socket_udp_sendto(u16 localport, u8 *ip_addr, u16 port, void *pdata, u16 len); +int tls_socket_udp_sendto(u16 localport, u8 *ip_addr, u16 port, void *pdata, u16 len); /** * @ingroup pbuf * Enumeration of pbuf layers */ typedef enum { - /** Includes spare room for transport layer header, e.g. UDP header. - * Use this if you intend to pass the pbuf to functions like udp_send(). - */ - PBUF_TRANSPORT, - /** Includes spare room for IP header. - * Use this if you intend to pass the pbuf to functions like raw_send(). - */ - PBUF_IP, - /** Includes spare room for link layer header (ethernet header). - * Use this if you intend to pass the pbuf to functions like ethernet_output(). - * @see PBUF_LINK_HLEN - */ - PBUF_LINK, - /** Includes spare room for additional encapsulation header before ethernet - * headers (e.g. 802.11). - * Use this if you intend to pass the pbuf to functions like netif->linkoutput(). - * @see PBUF_LINK_ENCAPSULATION_HLEN - */ - PBUF_RAW_TX, - /** Use this for input packets in a netif driver when calling netif->input() - * in the most common case - ethernet-layer netif driver. */ - PBUF_RAW -} pbuf_layer; + /** Includes spare room for transport layer header, e.g. UDP header. + * Use this if you intend to pass the pbuf to functions like udp_send(). + */ + PBUF_TRANSPORT, + /** Includes spare room for IP header. + * Use this if you intend to pass the pbuf to functions like raw_send(). + */ + PBUF_IP, + /** Includes spare room for link layer header (ethernet header). + * Use this if you intend to pass the pbuf to functions like ethernet_output(). + * @see PBUF_LINK_HLEN + */ + PBUF_LINK, + /** Includes spare room for additional encapsulation header before ethernet + * headers (e.g. 802.11). + * Use this if you intend to pass the pbuf to functions like netif->linkoutput(). + * @see PBUF_LINK_ENCAPSULATION_HLEN + */ + PBUF_RAW_TX, + /** Use this for input packets in a netif driver when calling netif->input() + * in the most common case - ethernet-layer netif driver. */ + PBUF_RAW +}pbuf_layer; /** * @ingroup pbuf * Enumeration of pbuf types */ typedef enum { - /** pbuf data is stored in RAM, used for TX mostly, struct pbuf and its payload + /** pbuf data is stored in RAM, used for TX mostly, struct pbuf and its payload are allocated in one piece of contiguous memory (so the first payload byte can be calculated from struct pbuf). pbuf_alloc() allocates PBUF_RAM pbufs as unchained pbufs (although that might change in future versions). This should be used for all OUTGOING packets (TX).*/ - PBUF_RAM, - /** pbuf data is stored in ROM, i.e. struct pbuf and its payload are located in + PBUF_RAM, + /** pbuf data is stored in ROM, i.e. struct pbuf and its payload are located in totally different memory areas. Since it points to ROM, payload does not have to be copied when queued for transmission. */ PBUF_ROM, /** pbuf comes from the pbuf pool. Much like PBUF_ROM but payload might change so it has to be duplicated when queued before transmitting, depending on who has a 'ref' to it. */ - PBUF_REF, - /** pbuf payload refers to RAM. This one comes from a pool and should be used + PBUF_REF, + /** pbuf payload refers to RAM. This one comes from a pool and should be used for RX. Payload can be chained (scatter-gather RX) but like PBUF_RAM, struct pbuf and its payload are allocated in one piece of contiguous memory (so the first payload byte can be calculated from struct pbuf). Don't use this for TX, if the pool becomes empty e.g. because of TCP queuing, you are unable to receive TCP acks! */ - PBUF_POOL -} pbuf_type; + PBUF_POOL +}pbuf_type; /** * @brief This Function allocates a pbuf of the given type (possibly a chain for PBUF_POOL type). diff --git a/wm800/board/include/net/wm_sockets2.0.3.h b/wm800/board/include/net/wm_sockets2.0.3.h index 4d11ce5..d743f04 100755 --- a/wm800/board/include/net/wm_sockets2.0.3.h +++ b/wm800/board/include/net/wm_sockets2.0.3.h @@ -41,15 +41,15 @@ typedef u32_t in_addr_t; #endif struct in_addr { - in_addr_t s_addr; + in_addr_t s_addr; }; struct in6_addr { - union { - u32_t u32_addr[4]; - u8_t u8_addr[16]; - } un; -#define s6_addr un.u8_addr + union { + u32_t u32_addr[4]; + u8_t u8_addr[16]; + }un; +#define s6_addr un.u8_addr }; /** 255.255.255.255 */ @@ -82,39 +82,39 @@ extern const struct in6_addr in6addr_any; #if TLS_CONFIG_IPV4 /** members are in network byte order */ struct sockaddr_in { - u8_t sin_len; - sa_family_t sin_family; - in_port_t sin_port; - struct in_addr sin_addr; + u8_t sin_len; + sa_family_t sin_family; + in_port_t sin_port; + struct in_addr sin_addr; #define SIN_ZERO_LEN 8 - char sin_zero[SIN_ZERO_LEN]; + char sin_zero[SIN_ZERO_LEN]; }; #endif /* TLS_CONFIG_IPV4 */ #if TLS_CONFIG_IPV6 struct sockaddr_in6 { - u8_t sin6_len; /* length of this structure */ - sa_family_t sin6_family; /* AF_INET6 */ - in_port_t sin6_port; /* Transport layer port # */ - u32_t sin6_flowinfo; /* IPv6 flow information */ - struct in6_addr sin6_addr; /* IPv6 address */ - u32_t sin6_scope_id; /* Set of interfaces for scope */ + u8_t sin6_len; /* length of this structure */ + sa_family_t sin6_family; /* AF_INET6 */ + in_port_t sin6_port; /* Transport layer port # */ + u32_t sin6_flowinfo; /* IPv6 flow information */ + struct in6_addr sin6_addr; /* IPv6 address */ + u32_t sin6_scope_id; /* Set of interfaces for scope */ }; #endif /* TLS_CONFIG_IPV6 */ struct sockaddr { - u8_t sa_len; - sa_family_t sa_family; - char sa_data[14]; + u8_t sa_len; + sa_family_t sa_family; + char sa_data[14]; }; struct sockaddr_storage { - u8_t s2_len; - sa_family_t ss_family; - char s2_data1[2]; - u32_t s2_data2[3]; + u8_t s2_len; + sa_family_t ss_family; + char s2_data1[2]; + u32_t s2_data2[3]; #if TLS_CONFIG_IPV6 - u32_t s2_data3[3]; + u32_t s2_data3[3]; #endif /* TLS_CONFIG_IPV6 */ }; @@ -130,12 +130,12 @@ struct hostent { }; struct sockaddr_store { - u8_t s2_len; - sa_family_t ss_family; - char s2_data1[2]; - u32_t s2_data2[3]; + u8_t s2_len; + sa_family_t ss_family; + char s2_data1[2]; + u32_t s2_data2[3]; #if TLS_CONFIG_IPV6 - u32_t s2_data3[3]; + u32_t s2_data3[3]; #endif /* TLS_CONFIG_IPV6 */ }; @@ -276,7 +276,7 @@ struct linger { typedef struct ip_mreq { struct in_addr imr_multiaddr; /* IP multicast address of group */ struct in_addr imr_interface; /* local IP address of interface */ -} ip_mreq; +}ip_mreq; #if TLS_CONFIG_IPV6 #define IPV6_JOIN_GROUP 38 @@ -284,7 +284,7 @@ typedef struct ip_mreq { typedef struct ipv6_mreq { struct in6_addr ipv6mr_multiaddr; /* IP multicast address of group */ int ipv6mr_interface; /* index of interface */ -} ipv6_mreq; +}ipv6_mreq; #endif #endif /* TLS_CONFIG_IGMP */ @@ -348,9 +348,6 @@ typedef struct ipv6_mreq { #define IOC_OUT 0x40000000UL /* copy out parameters */ #define IOC_IN 0x80000000UL /* copy in parameters */ #define IOC_INOUT (IOC_IN | IOC_OUT) /* 0x20000000 distinguishes new & old ioctl's */ -#define _IO(x, y) (IOC_VOID|((x) << 8) | (y)) -#define _IOR(x, y, t) (IOC_OUT|(((long)sizeof(t) & IOCPARM_MASK) << 16)|((x) << 8) | (y)) -#define _IOW(x, y, t) (IOC_IN|(((long)sizeof(t) & IOCPARM_MASK) << 16)|((x) << 8) | (y)) #endif /* !defined(FIONREAD) || !defined(FIONBIO) */ #ifndef FIONREAD @@ -387,9 +384,9 @@ typedef struct ipv6_mreq { #endif #ifndef SHUT_RD - #define SHUT_RD 0 - #define SHUT_WR 1 - #define SHUT_RDWR 2 + #define SHUT_RD 0 + #define SHUT_WR 1 + #define SHUT_RDWR 2 #endif /** FD_SET used for lwip_select */ @@ -407,8 +404,8 @@ typedef struct ipv6_mreq { /** Make FD_SETSIZE match NUM_SOCKETS in socket.c */ #define FD_SETSIZE MEMP_NUM_NETCONN #define FDSETSAFESET(n, code) do { \ - if (((n) - LWIP_SOCKET_OFFSET < MEMP_NUM_NETCONN) && (((int)(n) - LWIP_SOCKET_OFFSET) >= 0)) { \ - code; }} while(0) + if (((n) - LWIP_SOCKET_OFFSET < MEMP_NUM_NETCONN) && (((int)(n) - LWIP_SOCKET_OFFSET) >= 0)) { \ + code; }} while(0) #define FDSETSAFEGET(n, code) (((n) - LWIP_SOCKET_OFFSET < MEMP_NUM_NETCONN) && \ (((int)(n) - LWIP_SOCKET_OFFSET) >= 0) ? (code) : 0) @@ -424,8 +421,8 @@ typedef struct ipv6_mreq { #define FD_ZERO(p) memset((void*)(p), 0, sizeof(*(p))) typedef struct fd_set { - unsigned char fd_bits [(FD_SETSIZE + 7) / 8]; -} fd_set; + unsigned char fd_bits [(FD_SETSIZE + 7) / 8]; +}fd_set; #elif LWIP_SOCKET_OFFSET #error LWIP_SOCKET_OFFSET does not work with external FD_SET! @@ -439,8 +436,8 @@ typedef struct fd_set { #if LWIP_TIMEVAL_PRIVATE struct timeval { - long tv_sec; /* seconds */ - long tv_usec; /* and microseconds */ + long tv_sec; /* seconds */ + long tv_usec; /* and microseconds */ }; #endif /* LWIP_TIMEVAL_PRIVATE */ @@ -535,7 +532,7 @@ u32_t ipaddr_addr(const char *cp); /** This is the aligned version of ip4_addr_t, used as local variable, on the stack, etc. */ struct ip4_addr { - u32_t addr; + u32_t addr; }; /** ip4_addr_t uses a struct for convenience only, so that the same defines can @@ -608,13 +605,13 @@ u8_t ip4_addr_netmask_valid(u32_t netmask); #define ip4_addr_debug_print_parts(debug, a, b, c, d) \ LWIP_DEBUGF(debug, ("%" U16_F ".%" U16_F ".%" U16_F ".%" U16_F, a, b, c, d)) #define ip4_addr_debug_print(debug, ipaddr) \ - ip4_addr_debug_print_parts(debug, \ + ip4_addr_debug_print_parts(debug, \ (u16_t)((ipaddr) != NULL ? ip4_addr1_16(ipaddr) : 0), \ (u16_t)((ipaddr) != NULL ? ip4_addr2_16(ipaddr) : 0), \ (u16_t)((ipaddr) != NULL ? ip4_addr3_16(ipaddr) : 0), \ (u16_t)((ipaddr) != NULL ? ip4_addr4_16(ipaddr) : 0)) #define ip4_addr_debug_print_val(debug, ipaddr) \ - ip4_addr_debug_print_parts(debug, \ + ip4_addr_debug_print_parts(debug, \ ip4_addr1_16(&(ipaddr)), \ ip4_addr2_16(&(ipaddr)), \ ip4_addr3_16(&(ipaddr)), \ @@ -657,7 +654,7 @@ char *ip4addr_ntoa_r(const ip4_addr_t *addr, char *buf, int buflen); /** This is the aligned version of ip6_addr_t, used as local variable, on the stack, etc. */ struct ip6_addr { - u32_t addr[4]; + u32_t addr[4]; }; /** IPv6 address */ @@ -665,15 +662,15 @@ typedef struct ip6_addr ip6_addr_t; /** Set an IPv6 partial address given by byte-parts */ #define IP6_ADDR_PART(ip6addr, index, a, b, c, d) \ - (ip6addr)->addr[index] = PP_HTONL(LWIP_MAKEU32(a, b, c, d)) + (ip6addr)->addr[index] = PP_HTONL(LWIP_MAKEU32(a, b, c, d)) /** Set a full IPv6 address by passing the 4 u32_t indices in network byte order (use PP_HTONL() for constants) */ #define IP6_ADDR(ip6addr, idx0, idx1, idx2, idx3) do { \ - (ip6addr)->addr[0] = idx0; \ - (ip6addr)->addr[1] = idx1; \ - (ip6addr)->addr[2] = idx2; \ - (ip6addr)->addr[3] = idx3; } while(0) + (ip6addr)->addr[0] = idx0; \ + (ip6addr)->addr[1] = idx1; \ + (ip6addr)->addr[2] = idx2; \ + (ip6addr)->addr[3] = idx3; } while(0) /** Access address in 16-bit block */ #define IP6_ADDR_BLOCK1(ip6addr) ((u16_t)((lwip_htonl((ip6addr)->addr[0]) >> 16) & 0xffff)) @@ -808,9 +805,9 @@ typedef struct ip6_addr ip6_addr_t; ((ip6addr)->addr[3] == PP_HTONL(0x00000001UL))) #define ip6_addr_set_allnodes_linklocal(ip6addr) do {(ip6addr)->addr[0] = PP_HTONL(0xff020000UL); \ - (ip6addr)->addr[1] = 0; \ - (ip6addr)->addr[2] = 0; \ - (ip6addr)->addr[3] = PP_HTONL(0x00000001UL);} while(0) + (ip6addr)->addr[1] = 0; \ + (ip6addr)->addr[2] = 0; \ + (ip6addr)->addr[3] = PP_HTONL(0x00000001UL);} while(0) #define ip6_addr_isallrouters_linklocal(ip6addr) (((ip6addr)->addr[0] == PP_HTONL(0xff020000UL)) && \ ((ip6addr)->addr[1] == 0UL) && \ @@ -818,23 +815,23 @@ typedef struct ip6_addr ip6_addr_t; ((ip6addr)->addr[3] == PP_HTONL(0x00000002UL))) #define ip6_addr_set_allrouters_linklocal(ip6addr) do {(ip6addr)->addr[0] = PP_HTONL(0xff020000UL); \ - (ip6addr)->addr[1] = 0; \ - (ip6addr)->addr[2] = 0; \ - (ip6addr)->addr[3] = PP_HTONL(0x00000002UL);} while(0) + (ip6addr)->addr[1] = 0; \ + (ip6addr)->addr[2] = 0; \ + (ip6addr)->addr[3] = PP_HTONL(0x00000002UL);} while(0) #define ip6_addr_issolicitednode(ip6addr) ( ((ip6addr)->addr[0] == PP_HTONL(0xff020000UL)) && \ - ((ip6addr)->addr[2] == PP_HTONL(0x00000001UL)) && \ - (((ip6addr)->addr[3] & PP_HTONL(0xff000000UL)) == PP_HTONL(0xff000000UL)) ) + ((ip6addr)->addr[2] == PP_HTONL(0x00000001UL)) && \ + (((ip6addr)->addr[3] & PP_HTONL(0xff000000UL)) == PP_HTONL(0xff000000UL)) ) #define ip6_addr_set_solicitednode(ip6addr, if_id) do {(ip6addr)->addr[0] = PP_HTONL(0xff020000UL); \ - (ip6addr)->addr[1] = 0; \ - (ip6addr)->addr[2] = PP_HTONL(0x00000001UL); \ - (ip6addr)->addr[3] = (PP_HTONL(0xff000000UL) | (if_id));} while(0) + (ip6addr)->addr[1] = 0; \ + (ip6addr)->addr[2] = PP_HTONL(0x00000001UL); \ + (ip6addr)->addr[3] = (PP_HTONL(0xff000000UL) | (if_id));} while(0) #define ip6_addr_cmp_solicitednode(ip6addr, sn_addr) (((ip6addr)->addr[0] == PP_HTONL(0xff020000UL)) && \ - ((ip6addr)->addr[1] == 0) && \ - ((ip6addr)->addr[2] == PP_HTONL(0x00000001UL)) && \ - ((ip6addr)->addr[3] == (PP_HTONL(0xff000000UL) | (sn_addr)->addr[3]))) + ((ip6addr)->addr[1] == 0) && \ + ((ip6addr)->addr[2] == PP_HTONL(0x00000001UL)) && \ + ((ip6addr)->addr[3] == (PP_HTONL(0xff000000UL) | (sn_addr)->addr[3]))) /* IPv6 address states. */ #define IP6_ADDR_INVALID 0x00 @@ -859,10 +856,10 @@ typedef struct ip6_addr ip6_addr_t; #define ip6_addr_isdeprecated(addr_state) (addr_state == IP6_ADDR_DEPRECATED) #define ip6_addr_debug_print_parts(debug, a, b, c, d, e, f, g, h) \ - LWIP_DEBUGF(debug, ("%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F, \ + LWIP_DEBUGF(debug, ("%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F, \ a, b, c, d, e, f, g, h)) #define ip6_addr_debug_print(debug, ipaddr) \ - ip6_addr_debug_print_parts(debug, \ + ip6_addr_debug_print_parts(debug, \ (u16_t)((ipaddr) != NULL ? IP6_ADDR_BLOCK1(ipaddr) : 0), \ (u16_t)((ipaddr) != NULL ? IP6_ADDR_BLOCK2(ipaddr) : 0), \ (u16_t)((ipaddr) != NULL ? IP6_ADDR_BLOCK3(ipaddr) : 0), \ @@ -872,7 +869,7 @@ typedef struct ip6_addr ip6_addr_t; (u16_t)((ipaddr) != NULL ? IP6_ADDR_BLOCK7(ipaddr) : 0), \ (u16_t)((ipaddr) != NULL ? IP6_ADDR_BLOCK8(ipaddr) : 0)) #define ip6_addr_debug_print_val(debug, ipaddr) \ - ip6_addr_debug_print_parts(debug, \ + ip6_addr_debug_print_parts(debug, \ IP6_ADDR_BLOCK1(&(ipaddr)), \ IP6_ADDR_BLOCK2(&(ipaddr)), \ IP6_ADDR_BLOCK3(&(ipaddr)), \ @@ -888,7 +885,7 @@ int ip6addr_aton(const char *cp, ip6_addr_t *addr); /** returns ptr to static buffer; not reentrant! */ char *ip6addr_ntoa(const ip6_addr_t *addr); char *ip6addr_ntoa_r(const ip6_addr_t *addr, char *buf, int buflen); - + #endif /** @ingroup ipaddr @@ -896,12 +893,12 @@ char *ip6addr_ntoa_r(const ip6_addr_t *addr, char *buf, int buflen); * @see tcp_new_ip_type(), udp_new_ip_type(), raw_new_ip_type(). */ enum lwip_ip_addr_type { - /** IPv4 */ - IPADDR_TYPE_V4 = 0U, - /** IPv6 */ - IPADDR_TYPE_V6 = 6U, - /** IPv4+IPv6 ("dual-stack") */ - IPADDR_TYPE_ANY = 46U + /** IPv4 */ + IPADDR_TYPE_V4 = 0U, + /** IPv6 */ + IPADDR_TYPE_V6 = 6U, + /** IPv4+IPv6 ("dual-stack") */ + IPADDR_TYPE_ANY = 46U }; #if TLS_CONFIG_IPV4&&TLS_CONFIG_IPV6 @@ -911,13 +908,13 @@ enum lwip_ip_addr_type { * ATTENTION: watch out for its size when adding IPv6 address scope! */ typedef struct ip_addr { - union { - ip6_addr_t ip6; - ip4_addr_t ip4; - } u_addr; - /** @ref lwip_ip_addr_type */ - u8_t type; -} ip_addr_t; + union { + ip6_addr_t ip6; + ip4_addr_t ip4; + }u_addr; + /** @ref lwip_ip_addr_type */ + u8_t type; +}ip_addr_t; extern const ip_addr_t ip_addr_any_type; @@ -949,7 +946,8 @@ extern const ip_addr_t ip_addr_any_type; #define IP_GET_TYPE(ipaddr) ((ipaddr)->type) #define IP_ADDR_PCB_VERSION_MATCH_EXACT(pcb, ipaddr) (IP_GET_TYPE(&pcb->local_ip) == IP_GET_TYPE(ipaddr)) -#define IP_ADDR_PCB_VERSION_MATCH(pcb, ipaddr) (IP_IS_ANY_TYPE_VAL(pcb->local_ip) || IP_ADDR_PCB_VERSION_MATCH_EXACT(pcb, ipaddr)) +#define IP_ADDR_PCB_VERSION_MATCH(pcb, ipaddr) (IP_IS_ANY_TYPE_VAL(pcb->local_ip) || \ + IP_ADDR_PCB_VERSION_MATCH_EXACT(pcb, ipaddr)) /** @ingroup ip6addr * Convert generic ip address to specific protocol version @@ -971,96 +969,94 @@ extern const ip_addr_t ip_addr_any_type; /** @ingroup ipaddr */ #define ip_addr_copy(dest, src) do { IP_SET_TYPE_VAL(dest, IP_GET_TYPE(&src)); if(IP_IS_V6_VAL(src)){ \ - ip6_addr_copy(*ip_2_ip6(&(dest)), *ip_2_ip6(&(src))); } else { \ - ip4_addr_copy(*ip_2_ip4(&(dest)), *ip_2_ip4(&(src))); }} while(0) + ip6_addr_copy(*ip_2_ip6(&(dest)), *ip_2_ip6(&(src))); } else { \ + ip4_addr_copy(*ip_2_ip4(&(dest)), *ip_2_ip4(&(src))); }} while(0) /** @ingroup ip6addr */ #define ip_addr_copy_from_ip6(dest, src) do { \ - ip6_addr_copy(*ip_2_ip6(&(dest)), src); IP_SET_TYPE_VAL(dest, IPADDR_TYPE_V6);} while(0) + ip6_addr_copy(*ip_2_ip6(&(dest)), src); IP_SET_TYPE_VAL(dest, IPADDR_TYPE_V6);} while(0) /** @ingroup ip4addr */ #define ip_addr_copy_from_ip4(dest, src) do { \ - ip4_addr_copy(*ip_2_ip4(&(dest)), src); IP_SET_TYPE_VAL(dest, IPADDR_TYPE_V4);} while(0) + ip4_addr_copy(*ip_2_ip4(&(dest)), src); IP_SET_TYPE_VAL(dest, IPADDR_TYPE_V4);} while(0) /** @ingroup ip4addr */ #define ip_addr_set_ip4_u32(ipaddr, val) do {if(ipaddr){ip4_addr_set_u32(ip_2_ip4(ipaddr), val); \ - IP_SET_TYPE(ipaddr, IPADDR_TYPE_V4); }} while(0) + IP_SET_TYPE(ipaddr, IPADDR_TYPE_V4); }} while(0) /** @ingroup ip4addr */ #define ip_addr_get_ip4_u32(ipaddr) (((ipaddr) && IP_IS_V4(ipaddr)) ? \ - ip4_addr_get_u32(ip_2_ip4(ipaddr)) : 0) + ip4_addr_get_u32(ip_2_ip4(ipaddr)) : 0) /** @ingroup ipaddr */ #define ip_addr_set(dest, src) do { IP_SET_TYPE(dest, IP_GET_TYPE(src)); if(IP_IS_V6(src)){ \ - ip6_addr_set(ip_2_ip6(dest), ip_2_ip6(src)); } else { \ - ip4_addr_set(ip_2_ip4(dest), ip_2_ip4(src)); }} while(0) + ip6_addr_set(ip_2_ip6(dest), ip_2_ip6(src)); } else { \ + ip4_addr_set(ip_2_ip4(dest), ip_2_ip4(src)); }} while(0) /** @ingroup ipaddr */ #define ip_addr_set_ipaddr(dest, src) ip_addr_set(dest, src) /** @ingroup ipaddr */ #define ip_addr_set_zero(ipaddr) do { \ - ip6_addr_set_zero(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, 0); } while(0) + ip6_addr_set_zero(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, 0); } while(0) /** @ingroup ip5addr */ #define ip_addr_set_zero_ip4(ipaddr) do { \ - ip6_addr_set_zero(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V4); } while(0) + ip6_addr_set_zero(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V4); } while(0) /** @ingroup ip6addr */ #define ip_addr_set_zero_ip6(ipaddr) do { \ - ip6_addr_set_zero(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V6); } while(0) + ip6_addr_set_zero(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V6); } while(0) /** @ingroup ipaddr */ #define ip_addr_set_any(is_ipv6, ipaddr) do {if(is_ipv6){ \ - ip6_addr_set_any(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V6); } else { \ - ip4_addr_set_any(ip_2_ip4(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V4); }} while(0) + ip6_addr_set_any(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V6); } else { \ + ip4_addr_set_any(ip_2_ip4(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V4); }} while(0) /** @ingroup ipaddr */ #define ip_addr_set_loopback(is_ipv6, ipaddr) do {if(is_ipv6){ \ - ip6_addr_set_loopback(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V6); } else { \ - ip4_addr_set_loopback(ip_2_ip4(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V4); }} while(0) + ip6_addr_set_loopback(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V6); } else { \ + ip4_addr_set_loopback(ip_2_ip4(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V4); }} while(0) /** @ingroup ipaddr */ #define ip_addr_set_hton(dest, src) do {if (IP_IS_V6(src)){ \ - ip6_addr_set_hton(ip_2_ip6(ipaddr), (src)); IP_SET_TYPE(dest, IPADDR_TYPE_V6); } else { \ - ip4_addr_set_hton(ip_2_ip4(ipaddr), (src)); IP_SET_TYPE(dest, IPADDR_TYPE_V4); }} while(0) + ip6_addr_set_hton(ip_2_ip6(ipaddr), (src)); IP_SET_TYPE(dest, IPADDR_TYPE_V6); } else { \ + ip4_addr_set_hton(ip_2_ip4(ipaddr), (src)); IP_SET_TYPE(dest, IPADDR_TYPE_V4); }} while(0) /** @ingroup ipaddr */ #define ip_addr_get_network(target, host, netmask) do {if (IP_IS_V6(host)){ \ - ip4_addr_set_zero(ip_2_ip4(target)); IP_SET_TYPE(target, IPADDR_TYPE_V6); } else { \ - ip4_addr_get_network(ip_2_ip4(target), ip_2_ip4(host), ip_2_ip4(netmask)); \ - IP_SET_TYPE(target, IPADDR_TYPE_V4); }} while(0) + ip4_addr_set_zero(ip_2_ip4(target)); IP_SET_TYPE(target, IPADDR_TYPE_V6); } else { \ + ip4_addr_get_network(ip_2_ip4(target), ip_2_ip4(host), ip_2_ip4(netmask)); \ + IP_SET_TYPE(target, IPADDR_TYPE_V4); }} while(0) /** @ingroup ipaddr */ #define ip_addr_netcmp(addr1, addr2, mask) ((IP_IS_V6(addr1) && IP_IS_V6(addr2)) ? \ - 0 : \ - ip4_addr_netcmp(ip_2_ip4(addr1), ip_2_ip4(addr2), mask)) + 0 : ip4_addr_netcmp(ip_2_ip4(addr1), ip_2_ip4(addr2), mask)) /** @ingroup ipaddr */ #define ip_addr_cmp(addr1, addr2) ((IP_GET_TYPE(addr1) != IP_GET_TYPE(addr2)) ? 0 : (IP_IS_V6_VAL(*(addr1)) ? \ - ip6_addr_cmp(ip_2_ip6(addr1), ip_2_ip6(addr2)) : \ - ip4_addr_cmp(ip_2_ip4(addr1), ip_2_ip4(addr2)))) + ip6_addr_cmp(ip_2_ip6(addr1), ip_2_ip6(addr2)) : \ + ip4_addr_cmp(ip_2_ip4(addr1), ip_2_ip4(addr2)))) /** @ingroup ipaddr */ #define ip_addr_isany(ipaddr) ((IP_IS_V6(ipaddr)) ? \ - ip6_addr_isany(ip_2_ip6(ipaddr)) : \ - ip4_addr_isany(ip_2_ip4(ipaddr))) + ip6_addr_isany(ip_2_ip6(ipaddr)) : \ + ip4_addr_isany(ip_2_ip4(ipaddr))) /** @ingroup ipaddr */ #define ip_addr_isany_val(ipaddr) ((IP_IS_V6_VAL(ipaddr)) ? \ - ip6_addr_isany_val(*ip_2_ip6(&(ipaddr))) : \ - ip4_addr_isany_val(*ip_2_ip4(&(ipaddr)))) + ip6_addr_isany_val(*ip_2_ip6(&(ipaddr))) : \ + ip4_addr_isany_val(*ip_2_ip4(&(ipaddr)))) /** @ingroup ipaddr */ #define ip_addr_isbroadcast(ipaddr, netif) ((IP_IS_V6(ipaddr)) ? \ - 0 : \ - ip4_addr_isbroadcast(ip_2_ip4(ipaddr), netif)) + 0 : ip4_addr_isbroadcast(ip_2_ip4(ipaddr), netif)) /** @ingroup ipaddr */ #define ip_addr_ismulticast(ipaddr) ((IP_IS_V6(ipaddr)) ? \ - ip6_addr_ismulticast(ip_2_ip6(ipaddr)) : \ - ip4_addr_ismulticast(ip_2_ip4(ipaddr))) + ip6_addr_ismulticast(ip_2_ip6(ipaddr)) : \ + ip4_addr_ismulticast(ip_2_ip4(ipaddr))) /** @ingroup ipaddr */ #define ip_addr_isloopback(ipaddr) ((IP_IS_V6(ipaddr)) ? \ - ip6_addr_isloopback(ip_2_ip6(ipaddr)) : \ - ip4_addr_isloopback(ip_2_ip4(ipaddr))) + ip6_addr_isloopback(ip_2_ip6(ipaddr)) : \ + ip4_addr_isloopback(ip_2_ip4(ipaddr))) /** @ingroup ipaddr */ #define ip_addr_islinklocal(ipaddr) ((IP_IS_V6(ipaddr)) ? \ - ip6_addr_islinklocal(ip_2_ip6(ipaddr)) : \ - ip4_addr_islinklocal(ip_2_ip4(ipaddr))) + ip6_addr_islinklocal(ip_2_ip6(ipaddr)) : \ + ip4_addr_islinklocal(ip_2_ip4(ipaddr))) #define ip_addr_debug_print(debug, ipaddr) do { if(IP_IS_V6(ipaddr)) { \ - ip6_addr_debug_print(debug, ip_2_ip6(ipaddr)); } else { \ - ip4_addr_debug_print(debug, ip_2_ip4(ipaddr)); }} while(0) + ip6_addr_debug_print(debug, ip_2_ip6(ipaddr)); } else { \ + ip4_addr_debug_print(debug, ip_2_ip4(ipaddr)); }} while(0) #define ip_addr_debug_print_val(debug, ipaddr) do {if (IP_IS_V6_VAL(ipaddr)) { \ - ip6_addr_debug_print_val(debug, *ip_2_ip6(&(ipaddr))); } else { \ - ip4_addr_debug_print_val(debug, *ip_2_ip4(&(ipaddr))); }} while(0) + ip6_addr_debug_print_val(debug, *ip_2_ip6(&(ipaddr))); } else { \ + ip4_addr_debug_print_val(debug, *ip_2_ip4(&(ipaddr))); }} while(0) /** @ingroup ipaddr */ #define ipaddr_ntoa(addr) (((addr) == NULL) ? "NULL" : \ - ((IP_IS_V6(addr)) ? ip6addr_ntoa(ip_2_ip6(addr)) : ip4addr_ntoa(ip_2_ip4(addr)))) + ((IP_IS_V6(addr)) ? ip6addr_ntoa(ip_2_ip6(addr)) : ip4addr_ntoa(ip_2_ip4(addr)))) /** @ingroup ipaddr */ #define ipaddr_ntoa_r(addr, buf, buflen) (((addr) == NULL) ? "NULL" : \ - ((IP_IS_V6(addr)) ? ip6addr_ntoa_r(ip_2_ip6(addr), buf, buflen) : ip4addr_ntoa_r(ip_2_ip4(addr), buf, buflen))) + ((IP_IS_V6(addr)) ? ip6addr_ntoa_r(ip_2_ip6(addr), buf, buflen) : ip4addr_ntoa_r(ip_2_ip4(addr), buf, buflen))) int ipaddr_aton(const char *cp, ip_addr_t *addr); /** @ingroup ipaddr */ @@ -1068,14 +1064,14 @@ int ipaddr_aton(const char *cp, ip_addr_t *addr); /** @ingroup ipaddr */ #define ip4_2_ipv4_mapped_ipv6(ip6addr, ip4addr) do { \ - (ip6addr)->addr[3] = (ip4addr)->addr; \ - (ip6addr)->addr[2] = PP_HTONL(0x0000FFFFUL); \ - (ip6addr)->addr[1] = 0; \ - (ip6addr)->addr[0] = 0; } while(0); + (ip6addr)->addr[3] = (ip4addr)->addr; \ + (ip6addr)->addr[2] = PP_HTONL(0x0000FFFFUL); \ + (ip6addr)->addr[1] = 0; \ + (ip6addr)->addr[0] = 0; } while(0); /** @ingroup ipaddr */ #define unmap_ipv4_mapped_ipv6(ip4addr, ip6addr) \ - (ip4addr)->addr = (ip6addr)->addr[3]; + (ip4addr)->addr = (ip6addr)->addr[3]; #define IP46_ADDR_ANY(type) (((type) == IPADDR_TYPE_V6) ? IP6_ADDR_ANY : IP4_ADDR_ANY) @@ -1189,11 +1185,11 @@ typedef ip6_addr_t ip_addr_t; /** @ingroup socket */ #define inet_ntop(af, src, dst, size) \ (((af) == AF_INET6) ? ip6addr_ntoa_r((const ip6_addr_t*)(src), (dst), (size)) \ - : (((af) == AF_INET) ? ip4addr_ntoa_r((const ip4_addr_t*)(src), (dst), (size)) : NULL)) + : (((af) == AF_INET) ? ip4addr_ntoa_r((const ip4_addr_t*)(src), (dst), (size)) : NULL)) /** @ingroup socket */ #define inet_pton(af, src, dst) \ (((af) == AF_INET6) ? ip6addr_aton((src), (ip6_addr_t*)(dst)) \ - : (((af) == AF_INET) ? ip4addr_aton((src), (ip4_addr_t*)(dst)) : 0)) + : (((af) == AF_INET) ? ip4addr_aton((src), (ip4_addr_t*)(dst)) : 0)) #elif TLS_CONFIG_IPV4 /* TLS_CONFIG_IPV4 && TLS_CONFIG_IPV6 */ #define inet_ntop(af, src, dst, size) \ (((af) == AF_INET) ? ip4addr_ntoa_r((const ip4_addr_t*)(src), (dst), (size)) : NULL) @@ -1212,11 +1208,11 @@ typedef ip6_addr_t ip_addr_t; /** @ingroup socket */ #define inet_ntop(af, src, dst, size) \ (((af) == AF_INET6) ? ip6addr_ntoa_r((const ip6_addr_t*)(src), (dst), (size)) \ - : (((af) == AF_INET) ? ip4addr_ntoa_r((const ip4_addr_t*)(src), (dst), (size)) : NULL)) + : (((af) == AF_INET) ? ip4addr_ntoa_r((const ip4_addr_t*)(src), (dst), (size)) : NULL)) /** @ingroup socket */ #define inet_pton(af, src, dst) \ (((af) == AF_INET6) ? ip6addr_aton((src), (ip6_addr_t*)(dst)) \ - : (((af) == AF_INET) ? ip4addr_aton((src), (ip4_addr_t*)(dst)) : -1)) + : (((af) == AF_INET) ? ip4addr_aton((src), (ip4_addr_t*)(dst)) : -1)) #elif TLS_CONFIG_IPV4 /* TLS_CONFIG_IPV4 && TLS_CONFIG_IPV6 */ #define inet_ntop(af, src, dst, size) \ (((af) == AF_INET) ? ip4addr_ntoa_r((const ip4_addr_t*)(src), (dst), (size)) : NULL) diff --git a/wm800/board/platform/common/task/wm_wl_task.c b/wm800/board/platform/common/task/wm_wl_task.c index 5adee02..ef42ad4 100755 --- a/wm800/board/platform/common/task/wm_wl_task.c +++ b/wm800/board/platform/common/task/wm_wl_task.c @@ -152,7 +152,7 @@ s8 tls_wl_task_untimeout(struct task_parameter *task_param, tls_timeout_handler if (tls_mbox_valid(task_mbox[task_param->mbox_id])) { msg = (struct task_msg *)tls_mem_alloc(sizeof(struct task_msg)); if (msg == NULL) { - return TLS_OS_ERROR; + return TLS_OS_ERROR; } msg->type = TASK_MSG_UNTIMEOUT; @@ -161,7 +161,7 @@ s8 tls_wl_task_untimeout(struct task_parameter *task_param, tls_timeout_handler tls_mbox_post(task_mbox[task_param->mbox_id], msg); return TLS_OS_SUCCESS; } - return TLS_OS_ERROR; + return TLS_OS_ERROR; } s8 tls_wl_task_init(void) diff --git a/wm800/board/src/app/wm_atcmd/wm_cmdp.c b/wm800/board/src/app/wm_atcmd/wm_cmdp.c index ac66fa1..0f38d0a 100755 --- a/wm800/board/src/app/wm_atcmd/wm_cmdp.c +++ b/wm800/board/src/app/wm_atcmd/wm_cmdp.c @@ -18,7 +18,7 @@ #include #include "wm_config.h" #include "wm_cmdp.h" -#if (GCC_COMPILE==1) +#if (GCC_COMPILE == 1) #include "wm_cmdp_hostif_gcc.h" #else #include "wm_cmdp_hostif.h" @@ -53,7 +53,8 @@ extern const char HwVer[TEN]; tls_os_timer_t *RSTTIMER = NULL; u8 gfwupdatemode = 0; -u8 tls_get_fwup_mode(void) { +u8 tls_get_fwup_mode(void) +{ return gfwupdatemode; } @@ -308,7 +309,7 @@ int tls_cmd_create_net(void) int tls_cmd_create_ibss_net(void) { - int ret=CMD_ERR_UNSUPP; + int ret = CMD_ERR_UNSUPP; return ret; } @@ -381,8 +382,8 @@ int tls_cmd_get_wireless_mode(u8 *mode) int err = 0; u8 wmode = 0; - tls_param_get(TLS_PARAM_ID_WPROTOCOL, (void* )&wmode, TRUE); - /* set WPAS_MODE to do*/ + tls_param_get(TLS_PARAM_ID_WPROTOCOL, (void *)&wmode, TRUE); + /* set WPAS_MODE to do */ switch (wmode) { case IEEE80211_MODE_INFRA: *mode = 0; @@ -544,8 +545,8 @@ int tls_cmd_get_original_ssid(struct tls_param_ssid *original_ssid) { tls_param_get(TLS_PARAM_ID_ORIGIN_SSID, (void *)original_ssid, 1); if (original_ssid->ssid_len > THIRTY_TWO) { - original_ssid->ssid_len = 0; - original_ssid->ssid[0] = '\0'; + original_ssid->ssid_len = 0; + original_ssid->ssid[0] = '\0'; } return 0; @@ -1019,7 +1020,7 @@ int tls_cmd_set_sha1(u8* psk, u8 update_flash) int tls_cmd_get_sha1(u8 *psk) { - tls_param_get(TLS_PARAM_ID_SHA1, (void *)psk,1); + tls_param_get(TLS_PARAM_ID_SHA1, (void *)psk, 1); return 0; } @@ -1032,7 +1033,7 @@ int tls_cmd_set_wps_pin(struct tls_param_wps* wps, u8 update_flash) int tls_cmd_get_wps_pin(struct tls_param_wps *wps) { - tls_param_get(TLS_PARAM_ID_WPS, (void *)wps,1); + tls_param_get(TLS_PARAM_ID_WPS, (void *)wps, 1); return 0; } #endif @@ -1089,7 +1090,7 @@ int tls_cmd_wr_flash(struct tls_cmd_flash_t *wr_flash) { u8 data[TWENTY_FOUR]; tls_fls_write(wr_flash->flash_addr, (u8 *)wr_flash->value, - sizeof(u32) * wr_flash->word_cnt); + sizeof(u32) * wr_flash->word_cnt); memset(data, 0, TWENTY_FOUR); tls_fls_read(wr_flash->flash_addr, data, TWENTY_FOUR); @@ -1215,7 +1216,7 @@ int tls_cmd_set_softap_encrypt(u8 encrypt, u8 update_flash) { struct tls_param_key param_key; - if (0 == encrypt) { + if (encrypt == 0) { memset(param_key.psk, 0, SIXTY_FOUR); param_key.key_format = 0; param_key.key_index = 0; diff --git a/wm800/board/src/app/wm_atcmd/wm_cmdp_hostif.c b/wm800/board/src/app/wm_atcmd/wm_cmdp_hostif.c index 5f71b77..e4da5c1 100755 --- a/wm800/board/src/app/wm_atcmd/wm_cmdp_hostif.c +++ b/wm800/board/src/app/wm_atcmd/wm_cmdp_hostif.c @@ -169,7 +169,8 @@ extern int tls_ble_gap_set_name(const char *dev_name, uint8_t update_flash); extern int tls_ble_gap_set_data(uint8_t type, uint8_t *data, uint8_t data_len); extern int tls_ble_gap_set_adv_data(bool include_name, uint8_t *mfg_data, int mfg_data_len); extern int tls_ble_gap_set_adv_param(uint32_t min, uint32_t max, uint8_t chn_map, uint8_t filter_policy, uint8_t *dir_mac); -extern int tls_ble_gap_set_scan_param(uint32_t intv, uint32_t window, uint8_t filter_policy, bool limited, bool passive, bool filter_duplicate); +extern int tls_ble_gap_set_scan_param(uint32_t intv, uint32_t window, + uint8_t filter_policy, bool limited, bool passive, bool filter_duplicate); #endif #endif @@ -344,7 +345,7 @@ int tls_hostif_atcmd_loopback(u8 hostif_type, return 0; } -extern struct tls_uart_port uart_port[]; +extern struct tls_uart_port uart_port[FOUR]; int tls_hostif_process_cmdrsp(u8 hostif_type, char *cmdrsp, u32 cmdrsp_size) { struct tls_hostif_tx_msg *tx_msg; @@ -692,7 +693,8 @@ int tls_hostif_send_event_wjoin_success(void) } tls_wifi_get_current_bss(&bss); - buflen = sizeof(struct tls_hostif_hdr) + sizeof(struct tls_hostif_cmd_hdr) + TEN + TWO + bss.ssid_len; + buflen = sizeof(struct tls_hostif_hdr) + sizeof(struct tls_hostif_cmd_hdr) + + TEN + TWO + bss.ssid_len; buf = (char *)tls_mem_alloc(buflen); if (!buf) { return 0; @@ -1136,23 +1138,23 @@ void hostif_wscan_cmplt(void) #if TLS_OS_FREERTOS u32 hostif_stk[HOSTIF_TASK_STK_SIZE]; struct task_parameter wl_task_param_hostif = { - .mbox_size = THIRTY + TWO, - .name = "uart spi task", - .stk_size = HOSTIF_TASK_STK_SIZE, - .stk_start = (u8 *)hostif_stk, - .task_id = TLS_HOSTIF_TASK_PRIO, - .mbox_id = TLS_MBOX_ID_HOSTIF_TASK, - .timeo_id = TLS_TIMEO_ID_HOSTIF_TASK, + .mbox_size = THIRTY + TWO, + .name = "uart spi task", + .stk_size = HOSTIF_TASK_STK_SIZE, + .stk_start = (u8 *)hostif_stk, + .task_id = TLS_HOSTIF_TASK_PRIO, + .mbox_id = TLS_MBOX_ID_HOSTIF_TASK, + .timeo_id = TLS_TIMEO_ID_HOSTIF_TASK, }; #elif TLS_OS_LITEOS struct task_parameter wl_task_param_hostif = { - .mbox_size = THIRTY + TWO, - .name = "uart spi task", - .stk_size = HOSTIF_TASK_STK_SIZE, - .stk_start = (u8 *)NULL, - .task_id = TLS_HOSTIF_TASK_PRIO, - .mbox_id = TLS_MBOX_ID_HOSTIF_TASK, - .timeo_id = TLS_TIMEO_ID_HOSTIF_TASK, + .mbox_size = THIRTY + TWO, + .name = "uart spi task", + .stk_size = HOSTIF_TASK_STK_SIZE, + .stk_start = (u8 *)NULL, + .task_id = TLS_HOSTIF_TASK_PRIO, + .mbox_id = TLS_MBOX_ID_HOSTIF_TASK, + .timeo_id = TLS_TIMEO_ID_HOSTIF_TASK, }; #endif @@ -1283,7 +1285,8 @@ int tls_hostif_send_data(struct tls_hostif_socket_info *skt_info, if (skt_info->socket) { err = tls_socket_send(skt_info->socket, buf, buflen); } else if (skt_info->proto == 1) { // udp - err = tls_socket_udp_sendto(skt_info->local_port, (u8 *)(&skt_info->remote_ip), skt_info->remote_port, buf, buflen); + err = tls_socket_udp_sendto(skt_info->local_port, + (u8 *)(&skt_info->remote_ip), skt_info->remote_port, buf, buflen); } #else if (FD_ISSET(skt_info->socket, &fdatsockets)) { @@ -1303,7 +1306,8 @@ int tls_hostif_send_data(struct tls_hostif_socket_info *skt_info, } ext = &skt_status->skts_ext[0]; if (ext->protocol == SOCKET_PROTO_UDP) { - err = sendto(skt_info->socket, buf, buflen, 0, &sock_cmdp_addrs[skt_info->socket - LWIP_SOCKET_OFFSET], (socklen_t)sizeof(struct sockaddr)); + err = sendto(skt_info->socket, buf, buflen, 0, + &sock_cmdp_addrs[skt_info->socket - LWIP_SOCKET_OFFSET], (socklen_t)sizeof(struct sockaddr)); } else if (skt_status->socket_cnt > 1) { for(n = 1; n < skt_status->socket_cnt; n++) { ext = &skt_status->skts_ext[n]; @@ -1344,8 +1348,9 @@ static void hostif_default_socket_create_tmr(int ticks) FALSE, NULL); - if (!err) + if (!err) { tls_os_timer_start(default_sock_tmr); + } } static void hostif_default_socket_stop_tmr() @@ -1376,7 +1381,8 @@ static s8 hostif_socket_rpt(u8 skt_num, u16 datalen, u8 *ipaddr, u16 port, s8 er if (hif->rptmode) { cmdind_buf = tls_mem_alloc(CMDIND_BUF_SIZE); if (cmdind_buf) { - cmdind_size = sprintf(cmdind_buf,"+SKTRPT=%d,%d,%d.%d.%d.%d,%d\r\n\r\n", skt_num, datalen, ipaddr[0], ipaddr[1], ipaddr[TWO], ipaddr[THREE], port); + cmdind_size = sprintf(cmdind_buf,"+SKTRPT=%d,%d,%d.%d.%d.%d,%d\r\n\r\n", + skt_num, datalen, ipaddr[0], ipaddr[1], ipaddr[TWO], ipaddr[THREE], port); if (tls_hostif_process_cmdrsp(hif->hostif_mode, cmdind_buf, cmdind_size)) { tls_mem_free(cmdind_buf); } @@ -1551,13 +1557,13 @@ static void sock_recv_timeout_handler(void * arg) for(sock = LWIP_SOCKET_OFFSET; sock < (MEMP_NUM_NETCONN + LWIP_SOCKET_OFFSET); sock++) { if (FD_ISSET(sock, &fdatsockets) && FD_ISSET(sock, &rdset)) { getsockopt(sock, SOL_SOCKET, SO_TYPE, &optval, (socklen_t *)&optlen); - if (optval == SOCK_STREAM) { //tcp + if (optval == SOCK_STREAM) { // tcp ret = getsockopt(sock, SOL_SOCKET, SO_ACCEPTCONN, &optval, (socklen_t *)&optlen); if (ret) { optval = 0; } } - if (1 != optval) { //is udp or tcp client + if (1 != optval) { // is udp or tcp client p = pbuf_alloc(PBUF_RAW, TLS_SOCKET_RECV_BUF_SIZE, PBUF_RAM); ret = recvfrom(sock, p->payload, TLS_SOCKET_RECV_BUF_SIZE, 0, (struct sockaddr *)&from, &fromlen); if (ret <= 0) { @@ -1954,7 +1960,8 @@ int tls_hostif_set_net_status_callback(void) #if TLS_CONFIG_HTTP_CLIENT_TASK u8 pSession_flag = 0; -void tls_hostif_http_client_recv_callback(HTTP_SESSION_HANDLE pSession, CHAR *data, u32 totallen, u32 datalen) +void tls_hostif_http_client_recv_callback(HTTP_SESSION_HANDLE pSession, CHAR *data, + u32 totallen, u32 datalen) { #undef CMDIND_BUF_SIZE #define CMDIND_BUF_SIZE 64 @@ -2042,12 +2049,16 @@ int atcmd_filter_quotation(u8 **keyInfo, u8 *inbuf) } #if 1 -int z_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { +int z_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +{ tls_cmd_reset_sys(); return 0; } -int e_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { +int e_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +{ struct tls_hostif *hif = tls_get_hostif(); if (hif->uart_insdisp) { hif->uart_insdisp = 0; @@ -2057,7 +2068,9 @@ int e_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, unio return 0; } -int ents_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp){ +int ents_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +{ int ret = 0; struct tls_cmd_ps_t ps; @@ -2066,7 +2079,8 @@ int ents_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u } if ((cmd->ps.ps_type == 1 || cmd->ps.ps_type == TWO) - && (((cmd->ps.wake_type == 1) && (cmd->ps.wake_time > SIXTY_FIVE_THOUSAND_FIVE_HUNDRED_AND_THIRTY_FIVE || cmd->ps.wake_time < ONE_THOUSAND)) + && (((cmd->ps.wake_type == 1) + && (cmd->ps.wake_time > SIXTY_FIVE_THOUSAND_FIVE_HUNDRED_AND_THIRTY_FIVE || cmd->ps.wake_time < ONE_THOUSAND)) || (cmd->ps.delay_time < ONE_HUNDRED || cmd->ps.delay_time > TEN_THOUSAND))) { return -CMD_ERR_INV_PARAMS; } @@ -2079,24 +2093,28 @@ int ents_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int rstf_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int rstf_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return; } -int pmtf_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int pmtf_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret=0; ret = tls_cmd_pmtf(); return ret ? -CMD_ERR_OPS : 0; } -int ioc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ioc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return 0; } -int wjoin_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int wjoin_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int err; struct tls_hostif *hif = tls_get_hostif(); @@ -2107,7 +2125,7 @@ int wjoin_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, err = tls_cmd_join(cmd->wjoin.mode, NULL); tls_netif_set_status(0); - if (cmd->wjoin.mode!=CMD_MODE_HSPI_RICMD && cmd->wjoin.mode!=CMD_MODE_UART1_RICMD) { + if (cmd->wjoin.mode!=CMD_MODE_HSPI_RICMD && cmd->wjoin.mode != CMD_MODE_UART1_RICMD) { if (err == CMD_ERR_OK) { sem_acquire: /* waiting for ever: infact 20s, determind by wpa_supplicant_connect_timeout */ @@ -2152,7 +2170,8 @@ sem_acquire: return 0; } -int wleav_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int wleav_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret=0; if (cmd->wreg.region == TWO) { @@ -2163,7 +2182,8 @@ int wleav_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return ret ? -CMD_ERR_FLASH : 0; } -int wscan_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int wscan_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret=0; u32 time, offset = 0; @@ -2173,7 +2193,8 @@ int wscan_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, struct tls_hostif *hif = tls_get_hostif(); hif->uart_atcmd_bits &= ~(1 << UART_ATCMD_BIT_WSCAN); - ret = tls_cmd_scan_by_param(cmd->scanparam.mode, cmd->scanparam.chlist, cmd->scanparam.scantimes, cmd->scanparam.switchinterval); + ret = tls_cmd_scan_by_param(cmd->scanparam.mode, cmd->scanparam.chlist, + cmd->scanparam.scantimes, cmd->scanparam.switchinterval); if (ret) { return -ret; } @@ -2188,7 +2209,8 @@ int wscan_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, } expiredtime = (time == 0) ? TEN + FOUR : time; expiredtime *= (cmd->scanparam.scantimes > 0 ? (cmd->scanparam.scantimes) : 1); - expiredtime *= (cmd->scanparam.switchinterval > ONE_HUNDRED ? (cmd->scanparam.switchinterval) : TWO_HUNDRED); + expiredtime *= (cmd->scanparam.switchinterval > ONE_HUNDRED + ? (cmd->scanparam.switchinterval) : TWO_HUNDRED); expiredtime += FIVE * HZ; time = tls_os_get_time(); @@ -2215,7 +2237,8 @@ sem_acquire: #if TLS_CONFIG_SOCKET_RAW || TLS_CONFIG_SOCKET_STD -int lkstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lkstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { struct tls_cmd_link_status_t lk; @@ -2234,7 +2257,8 @@ int lkstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return 0; } -int entm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int entm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { u16 rx_fifocnt; u8 ch; @@ -2278,7 +2302,8 @@ int entm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return 0; } -int skct_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int skct_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int socket_num; #if TLS_CONFIG_CMD_USE_RAW_SOCKET @@ -2340,7 +2365,8 @@ sem_acquire: return 0; } -int skstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int skstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0, i = 0; u32 buflen; @@ -2379,7 +2405,8 @@ int skstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return ret ? -CMD_ERR_OPS : 0; } -int skcls_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int skcls_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2394,7 +2421,8 @@ int skcls_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return ret ? -CMD_ERR_OPS : 0; } -int sksdf_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int sksdf_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { if (set_opt) { if (cmd->sksdf.socket < 1 || cmd->sksdf.socket > TWENTY) { @@ -2406,7 +2434,8 @@ int sksdf_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return 0; } -int sksnd_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int sksnd_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int err = 0; @@ -2445,7 +2474,8 @@ int sksnd_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return 0; } -int skrcv_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int skrcv_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { u32 socket = 0, size = 0, maxsize; u8 state; @@ -2473,7 +2503,8 @@ int skrcv_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return 0; } -int skrptm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int skrptm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; struct tls_hostif *hif = tls_get_hostif(); @@ -2489,12 +2520,14 @@ int skrptm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return ret ? -CMD_ERR_OPS : 0; } -int sksrcip_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int sksrcip_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return; } -int skghbn_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int skghbn_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { u8 *ipstr = NULL; int i = 0; @@ -2516,7 +2549,8 @@ int skghbn_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, #endif -int wprt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int wprt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2530,7 +2564,8 @@ int wprt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int ssid_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ssid_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; struct tls_cmd_ssid_t ssid; @@ -2553,7 +2588,8 @@ int ssid_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int key_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int key_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; struct tls_cmd_key_t key; @@ -2579,7 +2615,8 @@ int key_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, un return ret ? -CMD_ERR_OPS : 0; } -int encry_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int encry_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2594,7 +2631,8 @@ int encry_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return ret ? -CMD_ERR_OPS : 0; } -int bssid_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int bssid_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; struct tls_cmd_bssid_t bssid; @@ -2616,7 +2654,8 @@ int bssid_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return ret ? -CMD_ERR_OPS : 0; } -int brdssid_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int brdssid_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2631,7 +2670,8 @@ int brdssid_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd return ret ? -CMD_ERR_OPS : 0; } -int cntparam_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int cntparam_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { struct tls_param_ssid original_ssid; struct tls_param_original_key original_key; @@ -2653,16 +2693,20 @@ int cntparam_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cm cmdrsp->cntparam_bssid_dis.ssid_len = original_ssid.ssid_len; memcpy(cmdrsp->cntparam_bssid_dis.ssid_key, original_ssid.ssid, original_ssid.ssid_len); cmdrsp->cntparam_bssid_dis.key_len = original_key.key_length; - memcpy(cmdrsp->cntparam_bssid_dis.ssid_key+cmdrsp->cntparam_bssid_dis.ssid_len, original_key.psk, original_key.key_length); + memcpy(cmdrsp->cntparam_bssid_dis.ssid_key+cmdrsp->cntparam_bssid_dis.ssid_len, + original_key.psk, original_key.key_length); } return 0; } -int chl_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int chl_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { - if ((cmd->channel.enable > 1) || ((cmd->channel.enable == 1) && ((cmd->channel.channel > (TEN + FOUR)) || (cmd->channel.channel < 1)))) { + if ((cmd->channel.enable > 1) || ((cmd->channel.enable == 1) + && ((cmd->channel.channel > (TEN + FOUR)) + || (cmd->channel.channel < 1)))) { return -CMD_ERR_INV_PARAMS; } if(cmd->channel.enable == 0) { @@ -2676,7 +2720,8 @@ int chl_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, un return ret ? -CMD_ERR_OPS : 0; } -int chll_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int chll_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { if (set_opt) { if ((cmd->channel_list.channellist & (~0x3fff)) || (cmd->channel_list.channellist == 0)) { @@ -2690,7 +2735,8 @@ int chll_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return 0; } -int wreg_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int wreg_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { if (set_opt) { tls_cmd_set_region(cmd->wreg.region, update_flash); @@ -2700,7 +2746,8 @@ int wreg_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return 0; } -int wbgr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int wbgr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret=0; int limit_rate; @@ -2711,7 +2758,8 @@ int wbgr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u if(cmd->wbgr.mode > THREE || cmd->wbgr.rate > (TWENTY + EIGHT)) { return -CMD_ERR_INV_PARAMS; } - limit_rate = (cmd->wbgr.mode == 1) ? THREE : ((cmd->wbgr.mode == TWO) ? (TWENTY + EIGHT) : (TEN + 1)); + limit_rate = (cmd->wbgr.mode == 1) ? THREE : ((cmd->wbgr.mode == TWO) + ? (TWENTY + EIGHT) : (TEN + 1)); hw_mode.max_rate = (cmd->wbgr.rate > limit_rate) ? limit_rate: cmd->wbgr.rate; hw_mode.hw_mode = cmd->wbgr.mode; ret = tls_cmd_set_hw_mode(&hw_mode, update_flash); @@ -2723,7 +2771,8 @@ int wbgr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int watc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int watc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2738,7 +2787,8 @@ int watc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int wpsm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int wpsm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2753,7 +2803,8 @@ int wpsm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int warc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int warc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2768,7 +2819,8 @@ int warc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int warm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int warm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2784,7 +2836,8 @@ int warm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u } #if TLS_CONFIG_SOCKET_RAW || TLS_CONFIG_SOCKET_STD -int nip_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int nip_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; struct tls_cmd_ip_params_t ip_info; @@ -2811,7 +2864,8 @@ int nip_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, un } #endif -int atm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int atm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2826,7 +2880,8 @@ int atm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, un return ret ? -CMD_ERR_OPS : 0; } -int atrm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int atrm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { if (set_opt) { tls_cmd_set_default_socket_params((struct tls_cmd_socket_t *)&cmd->atrm, update_flash); @@ -2836,12 +2891,14 @@ int atrm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return 0; } -int aolm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int aolm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return 0; } -int portm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int portm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2856,7 +2913,8 @@ int portm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return ret ? -CMD_ERR_OPS : 0; } -int uart_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int uart_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; struct tls_cmd_uart_params_t uart_cfg; @@ -2880,7 +2938,8 @@ int uart_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int atlt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int atlt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2895,7 +2954,8 @@ int atlt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int dns_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int dns_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2912,22 +2972,26 @@ int dns_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, un return ret ? -CMD_ERR_OPS : 0; } -int ddns_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ddns_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return 0; } -int upnp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int upnp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return 0; } -int dname_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int dname_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return 0; } -int atpt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int atpt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2942,7 +3006,8 @@ int atpt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int dbg_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int dbg_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { if (set_opt) { tls_cmd_set_dbg(cmd->dbg.dbg_level); @@ -2951,7 +3016,8 @@ int dbg_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, un return 0; } -int espc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int espc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2966,7 +3032,8 @@ int espc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int espt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int espt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -2981,7 +3048,8 @@ int espt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int webs_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int webs_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; struct tls_webs_cfg stWebsCfg; @@ -3001,7 +3069,8 @@ int webs_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int iom_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int iom_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -3016,7 +3085,8 @@ int iom_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, un return ret ? -CMD_ERR_OPS : 0; } -int cmdm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int cmdm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -3031,7 +3101,8 @@ int cmdm_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int pass_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int pass_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -3047,7 +3118,8 @@ int pass_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return ret ? -CMD_ERR_OPS : 0; } -int oneshot_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int oneshot_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -3066,7 +3138,8 @@ int oneshot_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd return ret ? -CMD_ERR_OPS : 0; } -int updp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int updp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { if (set_opt) { if (cmd->updp.mode > 1) { @@ -3089,7 +3162,8 @@ int updp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u } #if TLS_CONFIG_HTTP_CLIENT_TASK -int httpc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int httpc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { http_client_msg msg; @@ -3113,7 +3187,8 @@ int httpc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return 0; } -int fwup_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int fwup_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return; } @@ -3121,7 +3196,8 @@ int fwup_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u #endif #endif -int tem_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int tem_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; struct tls_cmd_tem_t tem = { 0 }; @@ -3152,7 +3228,8 @@ int tem_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, un return ret ? -CMD_ERR_OPS : 0; } -int qmac_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int qmac_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { u8 *mac = NULL; mac = wpa_supplicant_get_mac(); @@ -3161,7 +3238,8 @@ int qmac_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u } #if TLS_CONFIG_AP -int slist_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int slist_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { #define STA_DETAIL_BUF_LEN 320 u32 sta_num = 0; @@ -3187,7 +3265,8 @@ int slist_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return 0; } -int softap_lkstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int softap_lkstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { struct tls_cmd_link_status_t lk; @@ -3206,7 +3285,8 @@ int softap_lkstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION return 0; } -int softap_ssid_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int softap_ssid_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; struct tls_cmd_ssid_t ssid; @@ -3229,7 +3309,8 @@ int softap_ssid_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION return ret ? -CMD_ERR_OPS : 0; } -int softap_qmac_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int softap_qmac_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { u8 *mac = NULL; mac = hostapd_get_mac(); @@ -3237,7 +3318,8 @@ int softap_qmac_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION return 0; } -int softap_encry_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int softap_encry_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -3252,7 +3334,8 @@ int softap_encry_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION return ret ? -CMD_ERR_OPS : 0; } -int softap_key_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int softap_key_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; struct tls_cmd_key_t key; @@ -3278,7 +3361,8 @@ int softap_key_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION * return ret ? -CMD_ERR_OPS : 0; } -int softap_chl_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int softap_chl_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; if (set_opt) { @@ -3297,7 +3381,8 @@ int softap_chl_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION * return ret ? -CMD_ERR_OPS : 0; } -int softap_wbgr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int softap_wbgr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret=0; int limit_rate; @@ -3320,7 +3405,8 @@ int softap_wbgr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION return ret ? -CMD_ERR_OPS : 0; } -int softap_nip_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int softap_nip_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = 0; struct tls_cmd_ip_params_t ip_info; @@ -3347,13 +3433,15 @@ int softap_nip_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION * } #endif -int qver_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int qver_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_cmd_get_ver((struct tls_cmd_ver_t *)&cmdrsp->ver); return 0; } -int updd_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int updd_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int datasize, session_id; int err = 0; @@ -3384,7 +3472,8 @@ int updd_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u * Author: kevin 2014-03-19 ******************************************************************/ -int regr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int regr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { u32 Addr, Num; int i = 0; @@ -3408,7 +3497,8 @@ int regr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u * Author: kevin 2014-03-19 ******************************************************************/ -int regw_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int regw_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { u32 Addr, i; u32 cpu_sr; @@ -3433,7 +3523,8 @@ int regw_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u * Author: kevin 2014-03-19 ******************************************************************/ -int rfr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int rfr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int i; u32 Addr, Num; @@ -3463,7 +3554,8 @@ int rfr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, un * Author: kevin 2014-03-19 ******************************************************************/ -int rfw_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int rfw_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int i; u32 Addr, Num; @@ -3485,7 +3577,8 @@ int rfw_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, un return 0; } -int flsr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int flsr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { u32 addr, len, ret = 0; u8 buff[THIRTY + TWO]; @@ -3509,7 +3602,8 @@ int flsr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u return 0; } -int flsw_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int flsw_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { u32 addr, num, data, ret, i; u8 buff[THIRTY + TWO]; @@ -3540,7 +3634,8 @@ int flsw_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u * Author: kevin 2014-03-12 ******************************************************************/ -int txg_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int txg_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { u8* tx_gain = ieee80211_get_tx_gain(); if (set_opt) { @@ -3565,14 +3660,14 @@ int txg_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, un * Author: ******************************************************************/ -int txgi_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int txgi_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { u8* tx_gain = ieee80211_get_tx_gain(); int i = 0; int j = 0; - const unsigned char rf_txgainmap[] = - { + const unsigned char rf_txgainmap[] = { 0x52, 0x54, 0x20, 0x24, 0x26, 0x60, 0x62, 0x64, 0x70, 0x72, 0x74, 0x76, 0x78, 0x7A, 0x38, 0x3A, /*for NC*/ 0x10, 0x12, 0x50, 0x52, 0x54, 0x20, 0x24, 0x26, 0x60, 0x62, 0x64, 0x70, 0x72, 0x74, 0x76, 0x78, 0x7A, 0x7C, 0x7E, 0x38, 0x3A, @@ -3603,7 +3698,8 @@ int txgi_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, u } -int txg_rate_set_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int txg_rate_set_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { u8* tx_gain = ieee80211_get_tx_gain(); if (set_opt) { @@ -3615,7 +3711,8 @@ int txg_rate_set_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION return 0; } -int txg_rate_get_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int txg_rate_get_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { u8* tx_gain = ieee80211_get_tx_gain(); cmdrsp->txgr.tx_rate = cmd->txgr.tx_rate; @@ -3625,7 +3722,8 @@ int txg_rate_get_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION return 0; } -int mac_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int mac_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { if (set_opt) { if (cmd->mac.length > (TEN + TWO)) { @@ -3641,7 +3739,8 @@ int mac_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, un return 0; } -int hwv_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int hwv_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_cmd_get_ver((struct tls_cmd_ver_t *)&cmdrsp->ver); return 0; @@ -3657,7 +3756,8 @@ int hwv_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, un * Author: kevin 2014-03-17 ******************************************************************/ -int spif_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int spif_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return 0; } @@ -3687,7 +3787,8 @@ static void atcmd_lpinit(void) * Author: kevin 2014-03-12 ******************************************************************/ -int lpchl_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lpchl_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { if ((cmd->lpchl.channel < 1) || (cmd->lpchl.channel > (TEN + FOUR))) { TLS_DBGPRT_INFO("kevin params err! %x\r\n", cmd->lpchl.channel); @@ -3723,7 +3824,8 @@ int lpchl_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, [gimode], 1: mac_txbd->ctrl4 |= (1 << 19) [timedelay] °όΌδΈτΚ±Όδ£¬΅₯λΒΓ16½ψΦΖ ******************************************************************/ -int lptstr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lptstr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { TLS_DBGPRT_INFO("tempcomp = 0x%x, PacketCount = 0x%x, PsduLen = 0x%x, TxGain = 0x%x, DataRate = 0x%x" "rifs:0x%x,greenfield:0x%x, gimode:0x%x \r\n", @@ -3737,7 +3839,8 @@ int lptstr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return 0; } -int tls_lptperiod_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int tls_lptperiod_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { if (set_opt) { tls_set_tx_litepoint_period(cmd->rxsin.rxlen); @@ -3755,7 +3858,8 @@ int tls_lptperiod_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNIO * Author: kevin 2014-03-13 ******************************************************************/ -int lptstp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lptstp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_txrx_litepoint_test_stop(); return 0; @@ -3771,7 +3875,8 @@ int lptstp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, * Author: kevin 2014-03-13 ******************************************************************/ -int lptstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lptstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return 0; } @@ -3786,7 +3891,8 @@ int lptstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, * Author: kevin 2014-03-13 ******************************************************************/ -int lprstr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lprstr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { if ((cmd->lpchl.channel < 1) || (cmd->lpchl.channel > (TEN + FOUR))) { TLS_DBGPRT_INFO("Channel = 0x%x \r\n", cmd->lpchl.channel); @@ -3807,7 +3913,8 @@ int lprstr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, * Author: kevin 2014-03-13 ******************************************************************/ -int lprstp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lprstp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_txrx_litepoint_test_stop(); return 0; @@ -3823,7 +3930,8 @@ int lprstp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, * Author: kevin 2014-03-13 ******************************************************************/ -int lprstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lprstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return 0; } @@ -3839,7 +3947,8 @@ int lprstt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, * Author: kevin 2014-03-14 ******************************************************************/ u8 gulCalFlag = 0; -int lppstr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lppstr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return 0; } @@ -3854,7 +3963,8 @@ int lppstr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, * Author: kevin 2014-03-14 ******************************************************************/ -int lppstp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lppstp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return 0; } @@ -3870,7 +3980,8 @@ int lppstp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, * Author: kevin 2014-03-14 ******************************************************************/ -int lprfps_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lprfps_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return 0; } @@ -3886,7 +3997,8 @@ int lprfps_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, * Author: kevin 2014-03-14 ******************************************************************/ -int lpchrs_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lpchrs_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return lpchl_proc(set_opt, update_flash, cmd, cmdrsp); } @@ -3914,7 +4026,8 @@ int lpchrs_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, * Author: kevin 2014-03-14 ******************************************************************/ -int lptbd_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lptbd_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return lptstr_proc(set_opt, update_flash, cmd, cmdrsp); } @@ -3929,7 +4042,8 @@ int lptbd_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, * Author: kevin 2014-03-14 ******************************************************************/ -int lpstpt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lpstpt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return lptstp_proc(set_opt, update_flash, cmd, cmdrsp); } @@ -3944,7 +4058,8 @@ int lpstpt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, * Author: kevin 2014-03-14 ******************************************************************/ -int lpchlr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lpchlr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return lprstr_proc(set_opt, update_flash, cmd, cmdrsp); } @@ -3959,7 +4074,8 @@ int lpchlr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, * Author: kevin 2014-03-14 ******************************************************************/ -int lpstpr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lpstpr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return lprstp_proc(set_opt, update_flash, cmd, cmdrsp); } @@ -3974,7 +4090,8 @@ int lpstpr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, * Author: kevin 2014-03-14 ******************************************************************/ -int lpragc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lpragc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return 0; } @@ -3989,13 +4106,15 @@ int lpragc_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, * Author: kevin 2014-03-14 ******************************************************************/ -int lprsr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int lprsr_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return 0; } extern int tls_tx_wave_start(u32 freq, u32 dividend); -int tls_tx_sin(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int tls_tx_sin(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = -1; ret = tls_tx_wave_start(cmd->width.freq, cmd->width.dividend); @@ -4004,7 +4123,8 @@ int tls_tx_sin(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cmd, u } extern int tls_rx_data_from_adc(u32 datalen, char showtouart); -int tls_rx_wave(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int tls_rx_wave(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = -1; ret = tls_rx_data_from_adc(cmd->rxsin.rxlen, cmd->rxsin.isprint); @@ -4013,7 +4133,8 @@ int tls_rx_wave(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cmd, } -int tls_tx_lo_proc(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int tls_tx_lo_proc(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = -1; @@ -4027,7 +4148,8 @@ int tls_tx_lo_proc(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cm } -int tls_tx_iq_mismatch_proc(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int tls_tx_iq_mismatch_proc(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = -1; @@ -4042,7 +4164,8 @@ int tls_tx_iq_mismatch_proc(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_ return ret; } -int tls_freq_error_proc(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int tls_freq_error_proc(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = -1; @@ -4055,7 +4178,8 @@ int tls_freq_error_proc(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNIO return ret; } -int tls_rf_vcg_ctrl_proc(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int tls_rf_vcg_ctrl_proc(u8 set_opt, u8 update_flah, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return; } @@ -4081,7 +4205,8 @@ TCP TX: AT+THT=Cc,192.168.1.100, TCP, -l=1024,-t=10,-i=1 * Argument: ******************************************************************/ -int tht_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int tht_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = -1; ret = tht_start_iperf_test(((struct tls_atcmd_token_t *)cmd->tht.tok)->arg); @@ -4120,7 +4245,8 @@ static int ping_parse_param(struct ping_param *para, AT+PING=HOST,INTERVAL(ms),T(0|1),START(1) AT+PING=HOST,INTERVAL(ms),T(0|1),STOP(0) */ -static int ping_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +static int ping_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret = -1; struct ping_param para; @@ -4179,7 +4305,8 @@ Step1: AT+WWPS=start_pbc */ #if TLS_CONFIG_WPS -int wwps_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int wwps_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { struct tls_param_wps tmp_wps; int err=0; @@ -4264,7 +4391,7 @@ s32 tls_uart_bps_set(u8 portNum, u32 bdrate) reg_addr = HR_UART0_BAUD_RATE_CTRL + portNum * 0x200; tls_sys_clk_get(&sysclk); val = (sysclk.apbclk * ONE_MILLION / ((TEN + SIX) * bdrate) - 1) | - (((sysclk.apbclk * ONE_MILLION % (bdrate * (TEN + SIX))) * (TEN + SIX) / (bdrate * (TEN + SIX))) << (TEN + SIX)); + (((sysclk.apbclk * ONE_MILLION % (bdrate * (TEN + SIX))) * (TEN + SIX) / (bdrate * (TEN + SIX))) << (TEN + SIX)); tls_reg_write32(reg_addr, val); @@ -4454,7 +4581,8 @@ int bt_test_mode_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int bt_mac_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int bt_mac_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { int ret; @@ -4469,12 +4597,14 @@ int bt_mac_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, return ret; } -int bt_name_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int bt_name_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return; } -int bt_rf_mode_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int bt_rf_mode_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret = TLS_BT_STATUS_SUCCESS; tls_rf_bt_mode(cmd->bt.cmd); @@ -4483,7 +4613,8 @@ int bt_rf_mode_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION * #if (WM_BTA_AV_SINK_INCLUDED == CFG_ON) -int bt_audio_sink_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int bt_audio_sink_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret = TLS_BT_STATUS_SUCCESS; @@ -4498,7 +4629,8 @@ int bt_audio_sink_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNIO #if (WM_BTA_HFP_HSP_INCLUDED == CFG_ON) -int bt_hfp_client_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int bt_hfp_client_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret = TLS_BT_STATUS_SUCCESS; @@ -4510,7 +4642,8 @@ int bt_hfp_client_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNIO return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int bt_dial_up_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int bt_dial_up_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret = TLS_BT_STATUS_FAIL; @@ -4522,7 +4655,8 @@ int bt_dial_up_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION * #endif #if (WM_BTA_SPPC_INCLUDED == CFG_ON) -int bt_spp_client_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int bt_spp_client_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret = TLS_BT_STATUS_SUCCESS; @@ -4537,7 +4671,8 @@ int bt_spp_client_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNIO #if (WM_BTA_SPPS_INCLUDED == CFG_ON) -int bt_spp_server_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int bt_spp_server_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret = TLS_BT_STATUS_SUCCESS; @@ -4552,7 +4687,8 @@ int bt_spp_server_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNIO #if (WM_BT_INCLUDED == CFG_ON) -int bt_scan_mode_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int bt_scan_mode_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret = TLS_BT_STATUS_SUCCESS; ret = demo_bt_scan_mode(cmd->bt.cmd); @@ -4560,7 +4696,8 @@ int bt_scan_mode_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int bt_inquiry_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int bt_inquiry_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret = TLS_BT_STATUS_SUCCESS; ret = demo_bt_inquiry(cmd->bt.cmd); @@ -4642,7 +4779,8 @@ static u8 get_valid_adv_length_and_name(uint8_t *ptr, uint8_t *pname) return ret; } -int ble_read_rssi_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_read_rssi_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; #if (WM_BLE_INCLUDED == CFG_ON) @@ -4669,37 +4807,44 @@ int ble_read_rssi_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNIO return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_demo_send_indicate(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_demo_send_indicate(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return; } -int ble_demo_scan_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_demo_scan_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return; } -int ble_scan_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_scan_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return; } -int ble_demo_server_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_demo_server_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return; } -int ble_demo_client_multi_conn_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_demo_client_multi_conn_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return; } -int ble_demo_client_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_demo_client_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return; } -int ble_scan_chnl_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_scan_chnl_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; @@ -4708,7 +4853,8 @@ int ble_scan_chnl_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNIO return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_uart_mode_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_uart_mode_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return; } @@ -4759,7 +4905,8 @@ void ble_gatt_evt_cback(tls_ble_evt_t event, tls_ble_msg_t *msg) break; case WM_BLE_SE_ADD_CHAR_DESCR_EVT: len = sprintf(buf, "+OK=%hhu,%hhu,%hhu,%hhu\r\n", msg->ser_add_char_descr.status, - msg->ser_add_char_descr.server_if, msg->ser_add_char_descr.service_id, msg->ser_add_char_descr.attr_id); + msg->ser_add_char_descr.server_if, msg->ser_add_char_descr.service_id, + msg->ser_add_char_descr.attr_id); ret = tls_hostif_process_cmdrsp(hostif_type, buf, len); break; case WM_BLE_SE_START_EVT: @@ -4830,8 +4977,8 @@ void ble_gatt_evt_cback(tls_ble_evt_t event, tls_ble_msg_t *msg) passive_response = 1; break; case WM_BLE_SE_WRITE_EVT: - len = sprintf(buf, "+OK=0,%hu,%hhu,%hhu,%hhu,", msg->ser_write.conn_id,msg->ser_write.handle, msg->ser_write.trans_id, - msg->ser_write.len); + len = sprintf(buf, "+OK=0,%hu,%hhu,%hhu,%hhu,", msg->ser_write.conn_id,msg->ser_write.handle, + msg->ser_write.trans_id, msg->ser_write.len); tmp_len = MIN(TWO_HUNDRED_AND_FIFTY_SIX, msg->ser_write.len); for(index = 0; index < tmp_len; index++) { @@ -4867,7 +5014,8 @@ void ble_gatt_evt_cback(tls_ble_evt_t event, tls_ble_msg_t *msg) /**Note, if w800 triger the disconnect event, status and reason always 0; * otherwise, status is 0, reason indicates the actual disconnect reason */ - len = sprintf(buf, "+OK=%hhu,%hu,%hhu,%hhu\r\n",0, msg->cli_close.client_if, msg->cli_close.conn_id, msg->cli_close.reason); + len = sprintf(buf, "+OK=%hhu,%hu,%hhu,%hhu\r\n",0, msg->cli_close.client_if, msg->cli_close.conn_id, + msg->cli_close.reason); ret = tls_hostif_process_cmdrsp(hostif_type, buf, len); if (hif->uart_atcmd_bits & (1 << UART_ATCMD_BIT_ACTIVE_BT)) { passive_response = 0; @@ -4886,9 +5034,11 @@ void ble_gatt_evt_cback(tls_ble_evt_t event, tls_ble_msg_t *msg) if (msg->cli_db.db) { memcpy(&uuid, msg->cli_db.db->uuid.uu + (TEN + TWO), TWO); if (msg->cli_db.db->type == 0) { - len += sprintf(buf + len, "0x%04x,T=0x%02x,HDL=%hhu,PROP=0x%02x \r\n",uuid, msg->cli_db.db->type, msg->cli_db.db->attribute_handle, msg->cli_db.db->properties); + len += sprintf(buf + len, "0x%04x,T=0x%02x,HDL=%hhu,PROP=0x%02x \r\n",uuid, + msg->cli_db.db->type, msg->cli_db.db->attribute_handle, msg->cli_db.db->properties); } else { - len += sprintf(buf + len, "\t0x%04x,T=0x%02x,HDL=%hhu,PROP=0x%02x \r\n",uuid, msg->cli_db.db->type, msg->cli_db.db->attribute_handle, msg->cli_db.db->properties); + len += sprintf(buf + len, "\t0x%04x,T=0x%02x,HDL=%hhu,PROP=0x%02x \r\n",uuid, + msg->cli_db.db->type, msg->cli_db.db->attribute_handle, msg->cli_db.db->properties); } msg->cli_db.db++; } @@ -4896,7 +5046,8 @@ void ble_gatt_evt_cback(tls_ble_evt_t event, tls_ble_msg_t *msg) ret = tls_hostif_process_cmdrsp(hostif_type, buf, len); break; case WM_BLE_CL_REG_NOTIFY_EVT: - len = sprintf(buf, "+OK=%hhu,%hu,%hhu\r\n", msg->cli_reg_notify.status, msg->cli_reg_notify.conn_id, msg->cli_reg_notify.handle); + len = sprintf(buf, "+OK=%hhu,%hu,%hhu\r\n", msg->cli_reg_notify.status, + msg->cli_reg_notify.conn_id, msg->cli_reg_notify.handle); ret = tls_hostif_process_cmdrsp(hostif_type, buf, len); break; case WM_BLE_CL_READ_CHAR_EVT: @@ -4916,7 +5067,8 @@ void ble_gatt_evt_cback(tls_ble_evt_t event, tls_ble_msg_t *msg) ret = tls_hostif_process_cmdrsp(hostif_type, buf, len); break; case WM_BLE_CL_DEREG_NOTIFY_EVT: - len = sprintf(buf, "+OK=%hhu,%hhu,%hu\r\n", msg->cli_reg_notify.status, msg->cli_reg_notify.handle, msg->cli_reg_notify.conn_id); + len = sprintf(buf, "+OK=%hhu,%hhu,%hu\r\n", msg->cli_reg_notify.status, + msg->cli_reg_notify.handle, msg->cli_reg_notify.conn_id); ret = tls_hostif_process_cmdrsp(hostif_type, buf, len); break; case WM_BLE_CL_DEREGISTER_EVT: @@ -4930,7 +5082,8 @@ void ble_gatt_evt_cback(tls_ble_evt_t event, tls_ble_msg_t *msg) } break; case WM_BLE_CL_CFG_MTU_EVT: - len = sprintf(buf, "+OK=%hhu,%hu,%hu\r\n", msg->cli_cfg_mtu.status, msg->cli_cfg_mtu.conn_id, msg->cli_cfg_mtu.mtu); + len = sprintf(buf, "+OK=%hhu,%hu,%hu\r\n", msg->cli_cfg_mtu.status, + msg->cli_cfg_mtu.conn_id, msg->cli_cfg_mtu.mtu); ret = tls_hostif_process_cmdrsp(hostif_type, buf, len); if (hif->uart_atcmd_bits & (1 << UART_ATCMD_BIT_ACTIVE_BT)) { passive_response = 0; @@ -4954,7 +5107,8 @@ void ble_gatt_evt_cback(tls_ble_evt_t event, tls_ble_msg_t *msg) tls_os_sem_release(hif->uart_atcmd_sem); } -int ble_create_server_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_create_server_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -4973,7 +5127,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_add_service_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_add_service_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -4986,7 +5141,8 @@ int ble_add_service_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UN hif->last_bt_cmd_mode = cmd->blesc.cmd_mode; hif->uart_atcmd_bits &= ~(1 << UART_ATCMD_BIT_BT); - ret = tls_ble_server_add_service(cmd->blesc.server_if, cmd->blesc.inst_id, 1, app_uuid16_to_uuid128(cmd->blesc.uuid), cmd->blesc.handles); + ret = tls_ble_server_add_service(cmd->blesc.server_if, cmd->blesc.inst_id, 1, + app_uuid16_to_uuid128(cmd->blesc.uuid), cmd->blesc.handles); if (ret != TLS_BT_STATUS_SUCCESS) { goto end_tag; } @@ -4998,7 +5154,8 @@ end_tag: } -int ble_add_characteristic_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_add_characteristic_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5019,7 +5176,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_add_descript_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_add_descript_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5039,7 +5197,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_start_service_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_start_service_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5058,7 +5217,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_stop_service_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_stop_service_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5078,7 +5238,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_del_service_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_del_service_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5098,7 +5259,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_destory_server_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_destory_server_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5118,7 +5280,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_server_connect_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_server_connect_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; tls_bt_addr_t addr; @@ -5143,7 +5306,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_server_disconnect_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_server_disconnect_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; tls_bt_addr_t addr; @@ -5165,7 +5329,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_server_send_indication_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_server_send_indication_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5185,7 +5350,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_server_send_resp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_server_send_resp_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5205,7 +5371,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_client_create_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_client_create_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5224,7 +5391,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_client_connect_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_client_connect_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; tls_bt_addr_t addr; @@ -5246,7 +5414,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_client_scan_service_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_client_scan_service_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5265,7 +5434,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_client_get_gatt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_client_get_gatt_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5284,7 +5454,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_client_reg_notify_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_client_reg_notify_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5304,7 +5475,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_client_dereg_notify_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_client_dereg_notify_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5324,7 +5496,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_client_access_characteristic_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_client_access_characteristic_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5350,7 +5523,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_client_disconnect_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_client_disconnect_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5369,7 +5543,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_client_destory_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_client_destory_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5389,7 +5564,8 @@ end_tag: return (ret == TLS_BT_STATUS_SUCCESS) ? 0 : -CMD_ERR_OPS; } -int ble_client_cfg_mtu_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int ble_client_cfg_mtu_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { tls_bt_status_t ret; struct tls_hostif *hif = tls_get_hostif(); @@ -5410,7 +5586,8 @@ end_tag: #endif -int cpu_clock_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int cpu_clock_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { u8 div = (u8)cmd->width.freq; if (set_opt) { @@ -5426,7 +5603,8 @@ int cpu_clock_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *c return 0; } -int set_token_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) +int set_token_proc(u8 set_opt, u8 update_flash, union HOSTIF_CMD_PARAMS_UNION *cmd, + union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp) { return; } @@ -5571,7 +5749,9 @@ static struct tls_cmd_t at_ri_cmd_tbl[] = { { "BTSLEEP", HOSTIF_CMD_NOP, ATCMD_OP_EQ | ATCMD_OP_EP | RICMD_OP_SET, 1, 0, bt_sleep_proc}, { "BLETPS", HOSTIF_CMD_NOP, ATCMD_OP_EQ | ATCMD_OP_EP | RICMD_OP_SET, TWO, 0, ble_tx_power_set_proc}, { "BLETPG", HOSTIF_CMD_NOP, ATCMD_OP_NULL | ATCMD_OP_QU | RICMD_OP_GET, 1, 0, ble_tx_power_get_proc}, - { "BTTXPOW", HOSTIF_CMD_NOP, ATCMD_OP_NULL | ATCMD_OP_EQ | ATCMD_OP_EP | ATCMD_OP_QU | RICMD_OP_GET | RICMD_OP_SET, TWO, 0, bt_tx_power_proc}, + { "BTTXPOW", HOSTIF_CMD_NOP, ATCMD_OP_NULL | ATCMD_OP_EQ | ATCMD_OP_EP | ATCMD_OP_QU + | RICMD_OP_GET | RICMD_OP_SET, TWO, 0, bt_tx_power_proc}, + { "BTTEST", HOSTIF_CMD_NOP, ATCMD_OP_EQ | ATCMD_OP_EP | RICMD_OP_SET, 1, 0, bt_test_mode_proc}, { "BTRF", HOSTIF_CMD_NOP, ATCMD_OP_EQ | ATCMD_OP_EP | RICMD_OP_SET, 1, 0, bt_rf_mode_proc}, #if (WM_BTA_AV_SINK_INCLUDED == CFG_ON) @@ -5597,7 +5777,8 @@ static struct tls_cmd_t at_ri_cmd_tbl[] = { { "BLEADV", HOSTIF_CMD_NOP, ATCMD_OP_EQ | ATCMD_OP_EP | RICMD_OP_SET, 1, 0, ble_adv_proc}, { "BLEADATA", HOSTIF_CMD_NOP, ATCMD_OP_EQ | ATCMD_OP_EP | RICMD_OP_SET, TWO, 0, ble_adv_data_proc}, { "BLESCRSP", HOSTIF_CMD_NOP, ATCMD_OP_EQ | ATCMD_OP_EP | RICMD_OP_SET, TWO, 0, ble_scan_rsp_proc}, - { "BLEAPRM", HOSTIF_CMD_NOP, ATCMD_OP_NULL | ATCMD_OP_EQ | ATCMD_OP_EP | ATCMD_OP_QU | RICMD_OP_SET | RICMD_OP_SET, FIVE, 0, ble_adv_param_proc}, + { "BLEAPRM", HOSTIF_CMD_NOP, ATCMD_OP_NULL | ATCMD_OP_EQ | ATCMD_OP_EP | ATCMD_OP_QU | RICMD_OP_SET + | RICMD_OP_SET, FIVE, 0, ble_adv_param_proc}, { "BLESCPRM", HOSTIF_CMD_NOP, ATCMD_OP_EQ | ATCMD_OP_EP | RICMD_OP_SET, THREE, 0, ble_scan_param_proc}, { "BLESFLT", HOSTIF_CMD_NOP, ATCMD_OP_EQ | ATCMD_OP_EP | RICMD_OP_SET, 1, 0, ble_scan_filter_proc}, { "BLESCAN", HOSTIF_CMD_NOP, ATCMD_OP_EQ | ATCMD_OP_EP | RICMD_OP_SET, 1, 0, ble_scan_proc}, @@ -5641,7 +5822,8 @@ static struct tls_cmd_t at_ri_cmd_tbl[] = { { NULL, HOSTIF_CMD_NOP, 0, 0 , 0, NULL}, }; -int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD_PARAMS_UNION *cmd) { +int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD_PARAMS_UNION *cmd) +{ if (strcmp("QMAC", at_name) == 0 || strcmp("QVER", at_name) == 0 || strcmp("&HWV", at_name) == 0 || strcmp("&LPTSTP", at_name) == 0 || strcmp("&LPTSTT", at_name) == 0 || strcmp("&LPRSTP", at_name) == 0 || strcmp("&LPRSTT", at_name) == 0 || strcmp("&LPRFPS", at_name) == 0 || strcmp("&LPSTPT", at_name) == 0 || @@ -5654,9 +5836,8 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD #endif ) { ; - } #if TLS_CONFIG_AT_CMD - else if ((strcmp("Z", at_name) == 0) || (strcmp("E", at_name) == 0) || (strcmp("RSTF", at_name) == 0) || + } else if ((strcmp("Z", at_name) == 0) || (strcmp("E", at_name) == 0) || (strcmp("RSTF", at_name) == 0) || (strcmp("PMTF", at_name) == 0) || (strcmp("IOC", at_name) == 0) || (strcmp("LKSTT", at_name) == 0) || (strcmp("CNTPARAM", at_name) == 0) #if (WM_BLE_INCLUDED == CFG_ON) || (WM_BT_INCLUDED == CFG_ON) @@ -5710,8 +5891,7 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD cmd->scanparam.scantimes = 0; cmd->scanparam.chlist = 0; - switch(tok->arg_found) - { + switch(tok->arg_found) { case THREE: ret = string_to_uint(tok->arg[TWO], &value); if (ret) @@ -5738,7 +5918,7 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD #if TLS_CONFIG_AP || strcmp("APSSID", at_name) == 0 #endif - ) { + ) { int ret=0; u8 *tmpssid; if (tok->arg_found > 1) @@ -5770,7 +5950,7 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD #if TLS_CONFIG_AP ||(strcmp("APENCRY", at_name) == 0) #endif - ) { + ) { int ret = 0; u32 param; if (tok->arg_found > 1) @@ -5821,7 +6001,8 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD if (ret) return -CMD_ERR_INV_PARAMS; cmd->bssid.enable = (u8)params; - if (((cmd->bssid.enable == 0) && (tok->arg_found == TWO)) || ((cmd->bssid.enable == 1) && (tok->arg_found == 1))) + if (((cmd->bssid.enable == 0) && (tok->arg_found == TWO)) || + ((cmd->bssid.enable == 1) && (tok->arg_found == 1))) return -CMD_ERR_INV_PARAMS; if (tok->arg_found == TWO) { len = tok->arg[TWO] - tok->arg[1] - 1; @@ -5875,8 +6056,9 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD return -CMD_ERR_INV_PARAMS; cmd->channel_list.channellist = (u16)params; } - } else if(strcmp("WREG", at_name) == 0 || strcmp("ATLT", at_name) == 0 || strcmp("ATPT", at_name) == 0 || - strcmp("ESPT", at_name) == 0 + } else if(strcmp("WREG", at_name) == 0 || strcmp("ATLT", at_name) == 0 + || strcmp("ATPT", at_name) == 0 + || strcmp("ESPT", at_name) == 0 || (strcmp("WLEAV", at_name) == 0)) { int ret; u32 params; @@ -5918,9 +6100,8 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD cmd->btctrl.level = (u8)params; } cmd->btctrl.cmd_mode = tok->cmd_mode; - } #if TLS_CONFIG_BT - else if (strcmp("BTTXPOW", at_name) == 0) { + } else if (strcmp("BTTXPOW", at_name) == 0) { int ret; u32 params; if (tok->arg_found > TWO) @@ -5940,9 +6121,8 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD if(tok->arg_found != 0) return -CMD_ERR_INV_PARAMS; cmd->bt.cmd_mode = tok->cmd_mode; - } #if (WM_BT_INCLUDED == CFG_ON) - else if ((strcmp("BTAVS", at_name) == 0)|| (strcmp("BTHFP", at_name) == 0) + } else if ((strcmp("BTAVS", at_name) == 0)|| (strcmp("BTHFP", at_name) == 0) || (strcmp("BTSPPS", at_name) == 0)|| (strcmp("BTSPPC", at_name) == 0)) { int ret = 0; u32 param; @@ -5979,12 +6159,11 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD cmd->btname.len = strlen((char *)namestr); memcpy(cmd->btname.name, namestr, cmd->btname.len); cmd->btname.cmd_mode = tok->cmd_mode; - } - #endif - else if ( + } else if ( (strcmp("BTSLEEP", at_name) == 0) || (strcmp("BTTEST", at_name) == 0) - || (strcmp("BLEDS", at_name) == 0)|| (strcmp("BLEDC", at_name) == 0)|| (strcmp("BLEDCMC", at_name) == 0) + || (strcmp("BLEDS", at_name) == 0) || (strcmp("BLEDC", at_name) == 0) + || (strcmp("BLEDCMC", at_name) == 0) || (strcmp("BLESSCM", at_name) == 0) || (strcmp("BTRF", at_name) == 0) ) { int ret = 0; @@ -6089,8 +6268,7 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD } cmd->bleprm.channel_map = (u8)params; memset(cmd->bleprm.peer_addr, 0 , ETH_ALEN); - switch (tok->arg_found) - { + switch (tok->arg_found) { case EIGHT: if (atcmd_filter_quotation(&tmpmac, (u8 *)tok->arg[SEVEN])) { return -CMD_ERR_INV_PARAMS; @@ -6492,7 +6670,7 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD cmd->bleconn.cmd_mode = tok->cmd_mode; } else if(strcmp("&BTMAC", at_name) == 0) { u8 *tmpmac = NULL; - if (tok->arg_found == 1){ + if (tok->arg_found == 1) { if (atcmd_filter_quotation(&tmpmac, (u8 *)tok->arg[0])) { return -CMD_ERR_INV_PARAMS; } @@ -6860,9 +7038,8 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD } cmd->webs.portnum = (u16)params; } - } #if TLS_CONFIG_SOCKET_RAW || TLS_CONFIG_SOCKET_STD - else if ((strcmp("ENTM", at_name) == 0) || (strcmp("SKSRCIP", at_name) == 0)) { + } else if ((strcmp("ENTM", at_name) == 0) || (strcmp("SKSRCIP", at_name) == 0)) { ; } else if (strcmp("SKCT", at_name) == 0) { struct tls_cmd_socket_t socket; @@ -7012,7 +7189,7 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD if (tok->arg_found > 1) { return -CMD_ERR_INV_PARAMS; } - if (tok->arg_found == 1){ + if (tok->arg_found == 1) { err = string_to_uint(tok->arg[0], ¶ms); if (err) { return -CMD_ERR_INV_PARAMS; @@ -7026,10 +7203,9 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD } atcmd_filter_quotation(&ipstr, (u8 *)tok->arg[0]); memcpy(cmd->skghbn.ipstr, ipstr, strlen((char *)ipstr)); - } #endif #if TLS_CONFIG_HTTP_CLIENT_TASK - else if (strcmp("HTTPC", at_name) == 0) { + } else if (strcmp("HTTPC", at_name) == 0) { int ret, verb; u8 * uri; if (tok->arg_found != TWO && tok->arg_found != THREE) { @@ -7065,10 +7241,9 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD } cmd->httpc.url_len = strlen((char *)uri); cmd->httpc.url = uri; - } #endif #endif - else if (strcmp("&UPDM", at_name) == 0) { + } else if (strcmp("&UPDM", at_name) == 0) { int ret, mode; if (tok->arg_found != 1) { return -CMD_ERR_INV_PARAMS; @@ -7361,7 +7536,8 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD default: break; } - } else if (strcmp("&LPRSTR", at_name) == 0 || strcmp("&LPCHRS", at_name) == 0 || strcmp("&LPCHLR", at_name) == 0) { + } else if (strcmp("&LPRSTR", at_name) == 0 || strcmp("&LPCHRS", at_name) == 0 + || strcmp("&LPCHLR", at_name) == 0) { int ret; if ((tok->arg_found != 1) && (tok->arg_found != TWO)) { return -CMD_ERR_INV_PARAMS; @@ -7472,15 +7648,13 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD return -CMD_ERR_INV_PARAMS; } } - } #if TLS_CONFIG_WIFI_PERF_TEST - else if (strcmp("THT", at_name) == 0) { + } else if (strcmp("THT", at_name) == 0) { cmd->tht.tok = (u32 *)tok; return 0; - } #endif #if TLS_CONFIG_WPS - else if (strcmp("WWPS", at_name) == 0) { + } else if (strcmp("WWPS", at_name) == 0) { if (tok->arg_found > TWO) { return -CMD_ERR_INV_PARAMS; } @@ -7501,10 +7675,9 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD return -CMD_ERR_INV_PARAMS; } } - } #endif #if TLS_CONFIG_WIFI_PING_TEST - else if (strcmp("PING", at_name) == 0) { + } else if (strcmp("PING", at_name) == 0) { if (CMD_MODE_UART0_ATCMD == tok->cmd_mode) { cmd->ping.src = 0; } else { @@ -7532,9 +7705,8 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD return -CMD_ERR_INV_PARAMS; } } - } #endif - else if (strcmp("SETTOKEN", at_name) == 0) { + } else if (strcmp("SETTOKEN", at_name) == 0) { int i,j; int count = 0; @@ -7557,7 +7729,8 @@ int at_parse_func(char *at_name, struct tls_atcmd_token_t *tok, union HOSTIF_CMD return 0; } -int at_format_func(char *at_name, u8 set_opt, u8 update_flash, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp, char *res_resp, u32 *res_len) { +int at_format_func(char *at_name, u8 set_opt, u8 update_flash, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp, + char *res_resp, u32 *res_len) { if (strcmp("QMAC", at_name) == 0 || strcmp("&HWV", at_name) == 0 #if TLS_CONFIG_AP || strcmp("APMAC", at_name) == 0 @@ -7573,9 +7746,8 @@ int at_format_func(char *at_name, u8 set_opt, u8 update_flash, union HOSTIF_CMDR else { *res_len = sprintf(res_resp, "+OK=%s", cmdrsp->tem.offset); } - } #if TLS_CONFIG_AT_CMD - else if ((strcmp("Z", at_name) == 0) || (strcmp("E", at_name) == 0) || (strcmp("ENTS", at_name) == 0) || + } else if ((strcmp("Z", at_name) == 0) || (strcmp("E", at_name) == 0) || (strcmp("ENTS", at_name) == 0) || (strcmp("RSTF", at_name) == 0) || (strcmp("PMTF", at_name) == 0) || (strcmp("IOC", at_name) == 0) || (strcmp("WLEAV", at_name) == 0) || (strcmp("AOLM", at_name) == 0) || (strcmp("DDNS", at_name) == 0) || (strcmp("UPNP", at_name) == 0) || (strcmp("DNAME", at_name) == 0) || (strcmp("&DBG", at_name) == 0) || @@ -7583,12 +7755,16 @@ int at_format_func(char *at_name, u8 set_opt, u8 update_flash, union HOSTIF_CMDR #if (WM_BLE_INCLUDED == CFG_ON || WM_BT_INCLUDED == CFG_ON || WM_NIMBLE_INCLUDED == CFG_ON) || (strcmp("BTSLEEP", at_name) == 0) || (strcmp("BLETPS", at_name) == 0) || (strcmp("BLESSCM", at_name) == 0) || (strcmp("BLESND", at_name) == 0) - || (strcmp("BTTEST", at_name) == 0)|| (strcmp("BLEDS", at_name) == 0)|| (strcmp("BLEDC", at_name) == 0) || (strcmp("BLEUM", at_name) == 0) - || (strcmp("BLEADV", at_name) == 0) || (strcmp("BLEADATA", at_name) == 0) || (strcmp("BLESCRSP", at_name) == 0) - || (strcmp("BLESCPRM", at_name) == 0) || (strcmp("BLESFLT", at_name) == 0) || (strcmp("BLESCAN", at_name) == 0) - || (strcmp("BTAVS", at_name) == 0)|| (strcmp("BTHFP", at_name) == 0)|| (strcmp("BTSPPS", at_name) == 0)|| (strcmp("BTSPPC", at_name) == 0) - || (strcmp("BTSCM", at_name) == 0) || (strcmp("BLEDMADV", at_name) == 0) || (strcmp("BLEDMSCAN", at_name) == 0) || (strcmp("BTRF", at_name) == 0) - ||(strcmp("BTINQUIRY", at_name) == 0)|| (strcmp("BLEDCMC", at_name) == 0)|| (strcmp("BLEHIDS", at_name) == 0)|| (strcmp("BLEHIDU", at_name) == 0) + || (strcmp("BTTEST", at_name) == 0)|| (strcmp("BLEDS", at_name) == 0)|| (strcmp("BLEDC", at_name) == 0) + || (strcmp("BLEUM", at_name) == 0) || (strcmp("BLEADV", at_name) == 0) || (strcmp("BLEADATA", at_name) == 0) + || (strcmp("BLESCRSP", at_name) == 0) || (strcmp("BLESCPRM", at_name) == 0) + || (strcmp("BLESFLT", at_name) == 0) || (strcmp("BLESCAN", at_name) == 0) + || (strcmp("BTAVS", at_name) == 0)|| (strcmp("BTHFP", at_name) == 0) + || (strcmp("BTSPPS", at_name) == 0)|| (strcmp("BTSPPC", at_name) == 0) + || (strcmp("BTSCM", at_name) == 0) || (strcmp("BLEDMADV", at_name) == 0) + || (strcmp("BLEDMSCAN", at_name) == 0) || (strcmp("BTRF", at_name) == 0) + ||(strcmp("BTINQUIRY", at_name) == 0)|| (strcmp("BLEDCMC", at_name) == 0) + || (strcmp("BLEHIDS", at_name) == 0)|| (strcmp("BLEHIDU", at_name) == 0) #endif ) { *res_len = atcmd_ok_resp(res_resp); @@ -7693,7 +7869,8 @@ int at_format_func(char *at_name, u8 set_opt, u8 update_flash, union HOSTIF_CMDR *res_len += sprintf(res_resp + (*res_len), "%c", cmdrsp->cntparam_bssid_dis.ssid_key[i]); } *res_len += sprintf(res_resp + *res_len,","); - MEMCPY(res_resp + *res_len, cmdrsp->cntparam_bssid_dis.ssid_key + cmdrsp->cntparam_bssid_dis.ssid_len, cmdrsp->cntparam_bssid_dis.key_len); + MEMCPY(res_resp + *res_len, cmdrsp->cntparam_bssid_dis.ssid_key + + cmdrsp->cntparam_bssid_dis.ssid_len, cmdrsp->cntparam_bssid_dis.key_len); *res_len += cmdrsp->cntparam_bssid_dis.key_len; } } @@ -7740,9 +7917,8 @@ int at_format_func(char *at_name, u8 set_opt, u8 update_flash, union HOSTIF_CMDR cmdrsp->mac.addr[0], cmdrsp->mac.addr[1], cmdrsp->mac.addr[TWO], cmdrsp->mac.addr[THREE], cmdrsp->mac.addr[FOUR], cmdrsp->mac.addr[FIVE]); } - } #if (WM_NIMBLE_INCLUDED == CFG_ON) - else if (strcmp("BTEN", at_name) == 0|| strcmp("BTDES", at_name) == 0 ) { + } else if (strcmp("BTEN", at_name) == 0|| strcmp("BTDES", at_name) == 0 ) { *res_len = atcmd_ok_resp(res_resp); } else if (strcmp("&BTNAME", at_name) == 0) { if (set_opt) { @@ -7750,24 +7926,21 @@ int at_format_func(char *at_name, u8 set_opt, u8 update_flash, union HOSTIF_CMDR } else { *res_len = sprintf(res_resp, "+OK=%s", cmdrsp->btname.name); } - } - #else - else if (strcmp("BLECTSV", at_name) == 0 || strcmp("BLECCT", at_name) == 0|| strcmp("BTEN", at_name) == 0 - || strcmp("BTDES", at_name) == 0 || (strcmp("BLEADDSC", at_name) == 0) + } else if (strcmp("BLECTSV", at_name) == 0 || strcmp("BLECCT", at_name) == 0 || strcmp("BTEN", at_name) == 0 + || strcmp("BTDES", at_name) == 0 || (strcmp("BLEADDSC", at_name) == 0) || (strcmp("BLEADDCH", at_name) == 0) || (strcmp("BLEADESC", at_name) == 0) ||(strcmp("BLESTTSC", at_name) == 0) - || (strcmp("BLESTPSC", at_name) == 0) || (strcmp("BLEDELSC", at_name) == 0)|| (strcmp("BLEDESSV", at_name) == 0) - || (strcmp("BLESVDIS", at_name) == 0) || (strcmp("BLESIND", at_name) == 0)||(strcmp("BLECMTU", at_name) == 0) - || (strcmp("BLESRSP", at_name) == 0) ||(strcmp("BLECDIS", at_name) == 0) ||(strcmp("BLESCONN", at_name) == 0) + || (strcmp("BLESTPSC", at_name) == 0) || (strcmp("BLEDELSC", at_name) == 0) || (strcmp("BLEDESSV", at_name) == 0) + || (strcmp("BLESVDIS", at_name) == 0) || (strcmp("BLESIND", at_name) == 0) || (strcmp("BLECMTU", at_name) == 0) + || (strcmp("BLESRSP", at_name) == 0) || (strcmp("BLECDIS", at_name) == 0) || (strcmp("BLESCONN", at_name) == 0) || (strcmp("BLECSSC", at_name) == 0) || (strcmp("BLECRNTY", at_name) == 0) || (strcmp("BLECDNTY", at_name) == 0) - || (strcmp("BLECGDB", at_name) == 0) || (strcmp("BLECCONN", at_name) == 0)||(strcmp("BLECACH", at_name) == 0) + || (strcmp("BLECGDB", at_name) == 0) || (strcmp("BLECCONN", at_name) == 0) || (strcmp("BLECACH", at_name) == 0) ||(strcmp("BLECDES", at_name) == 0) || (strcmp("BLERDRSSI", at_name) == 0) || (strcmp("&BTNAME", at_name) == 0) ) { *res_len = 0; - } #endif - else if ((strcmp("BTDIAL", at_name) == 0)) { + } else if ((strcmp("BTDIAL", at_name) == 0)) { *res_len = atcmd_ok_resp(res_resp); } else if (strcmp("BLEAPRM", at_name) == 0) { if (set_opt) { @@ -7780,9 +7953,8 @@ int at_format_func(char *at_name, u8 set_opt, u8 update_flash, union HOSTIF_CMDR cmdrsp->bleprm.peer_addr[0], cmdrsp->bleprm.peer_addr[1], cmdrsp->bleprm.peer_addr[TWO], cmdrsp->bleprm.peer_addr[THREE], cmdrsp->bleprm.peer_addr[FOUR], cmdrsp->bleprm.peer_addr[FIVE]); } - } #endif - else if (strcmp("WREG", at_name) == 0 || strcmp("ATLT", at_name) == 0 || strcmp("ATPT", at_name) == 0 || + } else if (strcmp("WREG", at_name) == 0 || strcmp("ATLT", at_name) == 0 || strcmp("ATPT", at_name) == 0 || strcmp("ESPT", at_name) == 0) { if (set_opt) { *res_len = atcmd_ok_resp(res_resp); @@ -7868,9 +8040,8 @@ int at_format_func(char *at_name, u8 set_opt, u8 update_flash, union HOSTIF_CMDR *res_len = sprintf(res_resp, "+OK=%d", cmdrsp->webs.autorun); } } - } #if TLS_CONFIG_SOCKET_RAW || TLS_CONFIG_SOCKET_STD - else if (strcmp("ENTM", at_name) == 0 || strcmp("SKCLS", at_name) == 0 || strcmp("SKSDF", at_name) == 0) { + } else if (strcmp("ENTM", at_name) == 0 || strcmp("SKCLS", at_name) == 0 || strcmp("SKSDF", at_name) == 0) { *res_len = atcmd_ok_resp(res_resp); } else if (strcmp("SKCT", at_name) == 0) { if (set_opt) { @@ -7948,22 +8119,21 @@ int at_format_func(char *at_name, u8 set_opt, u8 update_flash, union HOSTIF_CMDR *res_len = sprintf(res_resp, "+OK=%d\n", cmdrsp->skrptm.mode); } } else if (strcmp("SKSRCIP", at_name) == 0) { - *res_len = sprintf(res_resp, "+OK=%d.%d.%d.%d", cmdrsp->sksrcip.ipvalue[0], cmdrsp->sksrcip.ipvalue[1], cmdrsp->sksrcip.ipvalue[TWO], cmdrsp->sksrcip.ipvalue[THREE]); + *res_len = sprintf(res_resp, "+OK=%d.%d.%d.%d", cmdrsp->sksrcip.ipvalue[0], cmdrsp->sksrcip.ipvalue[1], + cmdrsp->sksrcip.ipvalue[TWO], cmdrsp->sksrcip.ipvalue[THREE]); } else if (strcmp("SKGHBN", at_name) == 0) { *res_len = sprintf(res_resp, "+OK=\"%d.%d.%d.%d\"", \ cmdrsp->skghbn.h_addr_list[0], cmdrsp->skghbn.h_addr_list[1], \ cmdrsp->skghbn.h_addr_list[TWO], cmdrsp->skghbn.h_addr_list[THREE]); - } #endif #if TLS_CONFIG_HTTP_CLIENT_TASK - else if (strcmp("HTTPC", at_name) == 0) { + } else if (strcmp("HTTPC", at_name) == 0) { *res_len = sprintf(res_resp, "+OK=%d", cmdrsp->httpc.psession); } else if (strcmp("FWUP", at_name) == 0) { *res_len = sprintf(res_resp, "+OK=%d", cmdrsp->httpc.psession); - } #endif #endif - else if (strcmp("QVER", at_name) == 0) { + } else if (strcmp("QVER", at_name) == 0) { *res_len = sprintf(res_resp, "+OK=%c%x.%02x.%02x.%02x%02x,%c%x.%02x.%02x@ %s %s", cmdrsp->ver.hw_ver[0], cmdrsp->ver.hw_ver[1], cmdrsp->ver.hw_ver[TWO], cmdrsp->ver.hw_ver[THREE], cmdrsp->ver.hw_ver[FOUR], cmdrsp->ver.hw_ver[FIVE], @@ -8037,7 +8207,8 @@ int at_format_func(char *at_name, u8 set_opt, u8 update_flash, union HOSTIF_CMDR cmdrsp->txg.tx_gain[TWENTY + NINE], cmdrsp->txg.tx_gain[THIRTY], cmdrsp->txg.tx_gain[THIRTY + 1], \ cmdrsp->txg.tx_gain[THIRTY + TWO], cmdrsp->txg.tx_gain[THIRTY + THREE], cmdrsp->txg.tx_gain[THIRTY + FOUR],\ cmdrsp->txg.tx_gain[THIRTY + FIVE], cmdrsp->txg.tx_gain[THIRTY + SIX], cmdrsp->txg.tx_gain[THIRTY + SEVEN],\ - cmdrsp->txg.tx_gain[THIRTY + EIGHT], cmdrsp->txg.tx_gain[THIRTY + NINE], cmdrsp->txg.tx_gain[FORTY], cmdrsp->txg.tx_gain[FORTY + 1],\ + cmdrsp->txg.tx_gain[THIRTY + EIGHT], cmdrsp->txg.tx_gain[THIRTY + NINE],\ + cmdrsp->txg.tx_gain[FORTY], cmdrsp->txg.tx_gain[FORTY + 1],\ cmdrsp->txg.tx_gain[FORTY + TWO], cmdrsp->txg.tx_gain[FORTY + THREE], cmdrsp->txg.tx_gain[FORTY + FOUR],\ cmdrsp->txg.tx_gain[FORTY + FIVE], cmdrsp->txg.tx_gain[FORTY + SIX], cmdrsp->txg.tx_gain[FORTY + SEVEN],\ cmdrsp->txg.tx_gain[FORTY + EIGHT], cmdrsp->txg.tx_gain[FORTY + NINE], cmdrsp->txg.tx_gain[FIFTY],\ @@ -8077,7 +8248,8 @@ int at_format_func(char *at_name, u8 set_opt, u8 update_flash, union HOSTIF_CMDR *res_len = atcmd_ok_resp(res_resp); } if (strcmp("&TXGG", at_name) == 0) { - *res_len = sprintf(res_resp, "+OK=%d,%02x%02x%02x", cmdrsp->txgr.tx_rate, cmdrsp->txgr.txr_gain[0], cmdrsp->txgr.txr_gain[1], cmdrsp->txgr.txr_gain[TWO]); + *res_len = sprintf(res_resp, "+OK=%d,%02x%02x%02x", cmdrsp->txgr.tx_rate, cmdrsp->txgr.txr_gain[0], + cmdrsp->txgr.txr_gain[1], cmdrsp->txgr.txr_gain[TWO]); } if (strcmp("&MAC", at_name) == 0) { @@ -8144,14 +8316,12 @@ int at_format_func(char *at_name, u8 set_opt, u8 update_flash, union HOSTIF_CMDR } else { *res_len = sprintf(res_resp, "+OK=%d", rx_valid); } - } #if TLS_CONFIG_WIFI_PERF_TEST - else if (strcmp("THT", at_name) == 0) { + } else if (strcmp("THT", at_name) == 0) { *res_len = atcmd_ok_resp(res_resp); - } #endif #if TLS_CONFIG_WPS - else if (strcmp("WWPS", at_name) == 0) { + } else if (strcmp("WWPS", at_name) == 0) { if (set_opt) { if (cmdrsp->wps.result == 0) { *res_len = atcmd_ok_resp(res_resp); @@ -8164,21 +8334,18 @@ int at_format_func(char *at_name, u8 set_opt, u8 update_flash, union HOSTIF_CMDR } else { *res_len = atcmd_ok_resp(res_resp); } - } #endif - else if (strcmp("CUSTDATA", at_name) == 0) { + } else if (strcmp("CUSTDATA", at_name) == 0) { *res_len = sprintf(res_resp, "+OK=\"%s\"", cmdrsp->custdata.data); - } #if TLS_CONFIG_AP - else if (strcmp("SLIST", at_name) == 0) { + } else if (strcmp("SLIST", at_name) == 0) { if (0 == cmdrsp->stalist.sta_num) { *res_len = sprintf(res_resp, "+OK=%hhu", cmdrsp->stalist.sta_num); } else { *res_len = sprintf(res_resp, "+OK=%hhu%s", cmdrsp->stalist.sta_num, cmdrsp->stalist.data); } - } #endif - else if (strcmp("PING", at_name) == 0) { + } else if (strcmp("PING", at_name) == 0) { if (cmdrsp->ping.ext) { *res_len = atcmd_ok_resp(res_resp); } else { @@ -8217,9 +8384,8 @@ int ri_parse_func(s16 ri_cmd_id, char *buf, u32 length, union HOSTIF_CMD_PARAMS_ cmd->updm.src = 1; } else if (ri_cmd_id == HOSTIF_CMD_UPDD) { cmd->updd.data[0] = 1; /* ±κΚΆΚΗriΦΈΑξ */ - } #if TLS_CONFIG_RI_CMD - else if(ri_cmd_id == HOSTIF_CMD_WSCAN || ri_cmd_id == HOSTIF_CMD_WJOIN) { + } else if(ri_cmd_id == HOSTIF_CMD_WSCAN || ri_cmd_id == HOSTIF_CMD_WJOIN) { struct tls_hostif *hif = tls_get_hostif(); if (hif->hostif_mode == HOSTIF_MODE_HSPI) { cmd->scanparam.mode = CMD_MODE_HSPI_RICMD; @@ -8229,9 +8395,8 @@ int ri_parse_func(s16 ri_cmd_id, char *buf, u32 length, union HOSTIF_CMD_PARAMS_ cmd->scanparam.chlist = 0; cmd->scanparam.scantimes = 0; cmd->scanparam.switchinterval = 0; - } #if TLS_CONFIG_SOCKET_RAW || TLS_CONFIG_SOCKET_STD - else if(ri_cmd_id == HOSTIF_CMD_SKCT) { + } else if(ri_cmd_id == HOSTIF_CMD_SKCT) { u8 *p = (u8 *)buf + sizeof(struct tls_hostif_cmd_hdr); u32 len= length - sizeof(struct tls_hostif_cmd_hdr); int err = CMD_ERR_INV_PARAMS; @@ -8338,9 +8503,8 @@ int ri_parse_func(s16 ri_cmd_id, char *buf, u32 length, union HOSTIF_CMD_PARAMS_ cmd->skct.timeout = socket.timeout; } else if (ri_cmd_id == HOSTIF_CMD_SKGHBN) { cmd->skghbn.ipstr[length - FOUR] = '\0'; - } #endif - else if (ri_cmd_id == HOSTIF_CMD_ATRM) { + } else if (ri_cmd_id == HOSTIF_CMD_ATRM) { struct tls_cmd_socket_t socket; u8 *p = (u8 *)buf + sizeof(struct tls_hostif_cmd_hdr); u32 len = length - sizeof(struct tls_hostif_cmd_hdr); @@ -8445,9 +8609,8 @@ int ri_parse_func(s16 ri_cmd_id, char *buf, u32 length, union HOSTIF_CMD_PARAMS_ if (length == FIVE) { cmd->webs.portnum = EIGHTY; } - } #if TLS_CONFIG_HTTP_CLIENT_TASK - else if (ri_cmd_id == HOSTIF_CMD_HTTPC || ri_cmd_id == HOSTIF_CMD_FWUP) { + } else if (ri_cmd_id == HOSTIF_CMD_HTTPC || ri_cmd_id == HOSTIF_CMD_FWUP) { u8 *p = (u8 *)buf + sizeof(struct tls_hostif_cmd_hdr); u8 *url = NULL; if (cmd->httpc.url_len > TWO_HUNDRED_AND_FIFTY_FIVE) { @@ -8477,7 +8640,8 @@ int ri_parse_func(s16 ri_cmd_id, char *buf, u32 length, union HOSTIF_CMD_PARAMS_ return 0; } -int ri_format_func(s16 ri_cmd_id, u8 set_opt, u8 update_flash, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp, char *res_resp, u32 *res_len) +int ri_format_func(s16 ri_cmd_id, u8 set_opt, u8 update_flash, union HOSTIF_CMDRSP_PARAMS_UNION *cmdrsp, + char *res_resp, u32 *res_len) { if(ri_cmd_id == HOSTIF_CMD_MAC #if TLS_CONFIG_AP @@ -8487,9 +8651,8 @@ int ri_format_func(s16 ri_cmd_id, u8 set_opt, u8 update_flash, union HOSTIF_CMDR *res_len = sizeof(struct tls_hostif_cmd_hdr) + SIX; } else if(ri_cmd_id == HOSTIF_CMD_VER) { *res_len = sizeof(struct tls_hostif_cmd_hdr) + TEN; - } #if TLS_CONFIG_RI_CMD - else if (ri_cmd_id == HOSTIF_CMD_PS || ri_cmd_id == HOSTIF_CMD_DBG || ri_cmd_id == HOSTIF_CMD_UPDP) { + } else if (ri_cmd_id == HOSTIF_CMD_PS || ri_cmd_id == HOSTIF_CMD_DBG || ri_cmd_id == HOSTIF_CMD_UPDP) { ; } else if (ri_cmd_id == HOSTIF_CMD_RESET_FLASH || ri_cmd_id == HOSTIF_CMD_RESET || ri_cmd_id == HOSTIF_CMD_PMTF || ri_cmd_id == HOSTIF_CMD_GPIO || ri_cmd_id == HOSTIF_CMD_WLEAVE || ri_cmd_id == HOSTIF_CMD_WSCAN || @@ -8616,12 +8779,12 @@ int ri_format_func(s16 ri_cmd_id, u8 set_opt, u8 update_flash, union HOSTIF_CMDR if (cmdrsp->cntparam_bssid_en.bssid_enable) { *res_len = sizeof(struct tls_hostif_cmd_hdr) + EIGHT + cmdrsp->cntparam_bssid_en.key_len; } else { - *res_len = sizeof(struct tls_hostif_cmd_hdr) + THREE + cmdrsp->cntparam_bssid_dis.ssid_len + cmdrsp->cntparam_bssid_dis.key_len; + *res_len = sizeof(struct tls_hostif_cmd_hdr) + THREE + cmdrsp->cntparam_bssid_dis.ssid_len + + cmdrsp->cntparam_bssid_dis.key_len; } } - } #if TLS_CONFIG_SOCKET_RAW || TLS_CONFIG_SOCKET_STD - else if (ri_cmd_id == HOSTIF_CMD_SKCT) { + } else if (ri_cmd_id == HOSTIF_CMD_SKCT) { struct tls_hostif_cmdrsp *cmd_rsp = (struct tls_hostif_cmdrsp *)res_resp; cmd_rsp->cmd_hdr.ext = 0x01; *res_len = sizeof(struct tls_hostif_cmd_hdr) + 1; @@ -8647,19 +8810,16 @@ int ri_format_func(s16 ri_cmd_id, u8 set_opt, u8 update_flash, union HOSTIF_CMDR struct tls_hostif_cmdrsp *cmd_rsp = (struct tls_hostif_cmdrsp *)res_resp; cmd_rsp->cmd_hdr.ext = 0x01; *res_len = sizeof(struct tls_hostif_cmd_hdr) + FOUR; - } #endif #if TLS_CONFIG_HTTP_CLIENT_TASK - else if(ri_cmd_id == HOSTIF_CMD_HTTPC) { + } else if(ri_cmd_id == HOSTIF_CMD_HTTPC) { ; - } - else if(ri_cmd_id == HOSTIF_CMD_FWUP) { + } else if(ri_cmd_id == HOSTIF_CMD_FWUP) { ; - } #endif #endif - else if (ri_cmd_id == HOSTIF_CMD_UPDM || ri_cmd_id == HOSTIF_CMD_UPDD || + } else if (ri_cmd_id == HOSTIF_CMD_UPDM || ri_cmd_id == HOSTIF_CMD_UPDD || ri_cmd_id == HOSTIF_CMD_REGW || ri_cmd_id == HOSTIF_CMD_RFW || ri_cmd_id == HOSTIF_CMD_FLSW) { struct tls_hostif_cmdrsp *cmd_rsp = (struct tls_hostif_cmdrsp *)res_resp; @@ -8682,28 +8842,25 @@ int ri_format_func(s16 ri_cmd_id, u8 set_opt, u8 update_flash, union HOSTIF_CMDR if (!set_opt) { *res_len = sizeof(struct tls_hostif_cmd_hdr) + 1 + cmdrsp->custdata.length; } - } #if TLS_CONFIG_WPS - else if(ri_cmd_id == HOSTIF_CMD_WPS) { + } else if(ri_cmd_id == HOSTIF_CMD_WPS) { if (cmdrsp->wps.result == 1) { struct tls_hostif_cmdrsp *cmd_rsp = (struct tls_hostif_cmdrsp *)res_resp; cmd_rsp->cmd_hdr.ext = 0x01; memcpy((u8 *)&cmdrsp->wps.result, (u8 *)&cmdrsp->wps.pin_len, cmdrsp->wps.pin_len + 1); *res_len = sizeof(struct tls_hostif_cmd_hdr) + TWO + cmdrsp->custdata.length; } - } #endif #if TLS_CONFIG_AP - else if(ri_cmd_id == HOSTIF_CMD_STA_LIST) { + } else if(ri_cmd_id == HOSTIF_CMD_STA_LIST) { if (0 == cmdrsp->stalist.sta_num) { *res_len = sizeof(struct tls_hostif_cmd_hdr) + 1 + cmdrsp->stalist.sta_num; } else { *res_len = sizeof(struct tls_hostif_cmd_hdr) + cmdrsp->stalist.sta_num + strlen((char *)cmdrsp->stalist.data); } - } #endif - else if (ri_cmd_id == HOSTIF_CMD_TEM) { + } else if (ri_cmd_id == HOSTIF_CMD_TEM) { *res_len = sizeof(struct tls_hostif_cmd_hdr) + strlen((char *)cmdrsp->mac.addr); } else { return CMD_ERR_UNSUPP; @@ -8737,7 +8894,8 @@ int atcmd_nop_proc(struct tls_atcmd_token_t *tok, char *res_resp, u32 *res_len) return 0; } -static int hostif_check_atcmd_opt(u8 op, u8 arg_found, u8 opt_flag, u8 arg_len, u8 *set_opt, u8 *update_flash) { +static int hostif_check_atcmd_opt(u8 op, u8 arg_found, u8 opt_flag, u8 arg_len, + u8 *set_opt, u8 *update_flash) { u8 r = opt_flag&op; if (r == 0) { return -CMD_ERR_UNSUPP; @@ -8910,7 +9068,8 @@ int tls_hostif_atcmd_exec(struct tls_atcmd_token_t *tok, goto err; } - err = hostif_check_atcmd_opt(tok->op, tok->arg_found, match->op_flag, match->at_arg_len, &set_opt, &update_flash); + err = hostif_check_atcmd_opt(tok->op, tok->arg_found, match->op_flag, + match->at_arg_len, &set_opt, &update_flash); if (err) { goto err; } @@ -8960,7 +9119,8 @@ int ricmd_default_proc(char *buf, u32 length, int err, struct tls_hostif_cmd *cmd = (struct tls_hostif_cmd *)buf; /* if cmd is not suppost, return this cmd and err code */ - tls_hostif_fill_cmdrsp_hdr(cmdrsp, cmd->cmd_hdr.code, err, ((err || (cmd->cmd_hdr.ext & 0x1)) ? 0 : 1)); + tls_hostif_fill_cmdrsp_hdr(cmdrsp, cmd->cmd_hdr.code, err, + ((err || (cmd->cmd_hdr.ext & 0x1)) ? 0 : 1)); *cmdrsp_size = sizeof(struct tls_hostif_cmd_hdr); #endif return 0; diff --git a/wm800/board/src/network/api2.0.3/tls_netconn.c b/wm800/board/src/network/api2.0.3/tls_netconn.c index 26b6420..24b7725 100755 --- a/wm800/board/src/network/api2.0.3/tls_netconn.c +++ b/wm800/board/src/network/api2.0.3/tls_netconn.c @@ -59,7 +59,7 @@ struct tls_netconn *get_server_conn(struct tls_netconn *conn) do { server_conn = dl_list_first(&conn->list, struct tls_netconn, list); conn = server_conn; - } while((server_conn != NULL) && server_conn->client); + } while ((server_conn != NULL) && server_conn->client); return server_conn; } @@ -70,8 +70,7 @@ static struct tls_netconn *net_alloc_socket(struct tls_netconn *conn) u32 cpu_sr; struct tls_netconn *conn_t = NULL; - for (i = 0; i < TLS_MAX_NETCONN_NUM; i++) - { + for (i = 0; i < TLS_MAX_NETCONN_NUM; i++) { if (p_net_conn[i] == NULL) { sock = i; break; @@ -98,7 +97,7 @@ static struct tls_netconn *net_alloc_socket(struct tls_netconn *conn) cpu_sr = tls_os_set_critical(); conn_t = tls_mem_alloc(sizeof(struct tls_netconn)); tls_os_release_critical(cpu_sr); - if (NULL != conn_t) { + if (conn_t != NULL) { p_net_conn[sock] = conn_t; memset(conn_t, 0, sizeof(struct tls_netconn)); conn_t->used = true; @@ -200,11 +199,11 @@ static void net_tcp_err_cb(void *arg, err_t err) tcp_accept(pcb, NULL); } if (err == ERR_OK) { - tcp_close(pcb); + tcp_close(pcb); } if (conn->state != NETCONN_STATE_NONE) { - conn->state = NETCONN_STATE_NONE; - event = NET_EVENT_TCP_DISCONNECT; + conn->state = NETCONN_STATE_NONE; + event = NET_EVENT_TCP_DISCONNECT; } net_send_event_to_hostif (conn, event); @@ -236,7 +235,7 @@ static void raw_sk_free_pbuf_custom_fn(struct pbuf *p) if (p != NULL) { if (TRUE == ((struct tls_netconn *)pcr->conn)->used && - pcr->pcb == ((struct tls_netconn *)pcr->conn)->pcb.tcp) { + pcr->pcb == ((struct tls_netconn *)pcr->conn)->pcb.tcp) { tcp_recved((struct tcp_pcb *)pcr->pcb, p->tot_len); } @@ -279,7 +278,7 @@ static err_t net_tcp_connect_cb(void *arg, struct tcp_pcb *pcb, err_t err) net_send_event_to_hostif(conn, NET_EVENT_TCP_CONNECTED); } else { TLS_DBGPRT_INFO("the err is =%d\n", err); - } + } if (conn->skd != NULL && conn->skd->connf != NULL) { err_ret = conn->skd->connf(conn->skt_num, err); @@ -315,7 +314,7 @@ static void net_udp_recv_cb(void *arg, struct udp_pcb *pcb, LWIP_ASSERT("recv_udp must have an argument", arg < 0); socketno = (int)arg; conn = tls_net_get_socket(socketno); - if (conn == NULL || conn->used != TRUE || NULL == pcb) { + if (conn == NULL || conn->used != TRUE || pcb == NULL) { TLS_DBGPRT_ERR("\nconn=%x,used=%d\n", (u32)conn, conn->used); if (p != NULL) { pbuf_free(p); @@ -325,8 +324,9 @@ static void net_udp_recv_cb(void *arg, struct udp_pcb *pcb, LWIP_ASSERT("recv_udp: recv for wrong pcb!", conn->pcb.udp == pcb); if (conn->skd->recvf != NULL) { datalen = p->tot_len; - /*if Address is broadcast, update source IP according to source address and source port according to sender*/ - if ((ip_addr_get_ip4_u32(&conn->addr) == IPADDR_BROADCAST) || ((ip_addr_get_ip4_u32(&conn->addr) & 0xFF) == 0xFF)) { + /* if Address is broadcast, update source IP according to source address and source port according to sender */ + if ((ip_addr_get_ip4_u32(&conn->addr) == IPADDR_BROADCAST) || + ((ip_addr_get_ip4_u32(&conn->addr) & 0xFF) == 0xFF)) { tls_net_set_sourceip(ip_addr_get_ip4_u32(srcaddr)); conn->port = port; } else { @@ -389,7 +389,7 @@ static err_t net_skt_tcp_send(struct tls_net_msg *net_msg) } /** - * Send data on a UDP pcb + * Send data on a UDP pcb */ static void net_do_send(void *ctx) { @@ -522,7 +522,7 @@ static void do_create_connect(void *ctx) net_free_socket(socketno); } else { conn->state = NETCONN_STATE_CONNECTED; - net_send_event_to_hostif (conn, NET_EVENT_UDP_START); + net_send_event_to_hostif (conn, NET_EVENT_UDP_START); } break; case TLS_NETCONN_TCP: @@ -580,8 +580,7 @@ static void do_close_connect(void *ctx) } } - while(i-->0) - { + while(i-- > 0) { net_tcp_close_connect(sktNums[i]); } } @@ -652,7 +651,6 @@ int tls_socket_udp_sendto(u16 localport, u8 *ip_addr, u16 port, void *pdata, u1 return; } - int tls_socket_send(u8 skt_num, void *pdata, u16 len) { return;