sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Space after comma

Browse Source
This commit is contained in:
Gregory Nutt 2016-05-21 09:42:53 -06:00
parent 6789eec9d8
commit 15fd860a2f
1 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
netutils/esp8266/esp8266.c
View File

@ -175,19 +175,19 @@ static lesp_socket_t *get_sock(int sockfd)
{ {
if (!g_lesp_state.is_initialized) if (!g_lesp_state.is_initialized)
{ {
syslog(LOG_DEBUG,"Esp8266 not initialized; can't list access points.\n"); syslog(LOG_DEBUG, "Esp8266 not initialized; can't list access points.\n");
return NULL; return NULL;
} }
if (((unsigned int)sockfd) >= SOCKET_NBR) if (((unsigned int)sockfd) >= SOCKET_NBR)
{ {
syslog(LOG_DEBUG,"Esp8266 invalid sockfd.\n",sockfd); syslog(LOG_DEBUG, "Esp8266 invalid sockfd.\n", sockfd);
return NULL; return NULL;
} }
if ((g_lesp_state.sockets[sockfd].flags & FLAGS_SOCK_USED) == 0) if ((g_lesp_state.sockets[sockfd].flags & FLAGS_SOCK_USED) == 0)
{ {
syslog(LOG_ERR,"Connection id %d not Created!\n",sockfd); syslog(LOG_ERR, "Connection id %d not Created!\n", sockfd);
return NULL; return NULL;
} }
@ -226,12 +226,12 @@ static int lesp_low_level_read(uint8_t* buf, int size)
{ {
int err = errno; int err = errno;
syslog(LOG_ERR, syslog(LOG_ERR,
"worker read Error %d (errno %d:%d)\n",ret, "worker read Error %d (errno %d:%d)\n", ret,
err,strerror(err)); err, strerror(err));
} }
else if ((fds[0].revents & POLLERR) && (fds[0].revents & POLLHUP)) else if ((fds[0].revents & POLLERR) && (fds[0].revents & POLLHUP))
{ {
syslog(LOG_ERR,"worker poll read Error %d\n",ret); syslog(LOG_ERR, "worker poll read Error %d\n", ret);
ret = -1; ret = -1;
} }
else if (fds[0].revents & POLLIN) else if (fds[0].revents & POLLIN)
@ -303,7 +303,7 @@ static inline int lesp_read_ipd(void)
return -1; return -1;
} }
syslog(LOG_DEBUG,"Read %d bytes for socket %d \n",len,sockfd); syslog(LOG_DEBUG, "Read %d bytes for socket %d \n", len, sockfd);
while(len) while(len)
{ {
@ -335,7 +335,7 @@ static inline int lesp_read_ipd(void)
} }
else else
{ {
syslog(LOG_DEBUG,"overflow socket 0x%02X\n", b); syslog(LOG_DEBUG, "overflow socket 0x%02X\n", b);
} }
} }
@ -373,11 +373,11 @@ int lesp_vsend_cmd(FAR const IPTR char *format, va_list ap)
if (ret >= BUF_CMD_LEN) if (ret >= BUF_CMD_LEN)
{ {
g_lesp_state.buf_cmd[BUF_CMD_LEN-1]='\0'; g_lesp_state.buf_cmd[BUF_CMD_LEN-1]='\0';
syslog(LOG_DEBUG,"Buffer too small for '%s'...\n", g_lesp_state.buf_cmd); syslog(LOG_DEBUG, "Buffer too small for '%s'...\n", g_lesp_state.buf_cmd);
ret = -1; ret = -1;
} }
syslog(LOG_DEBUG,"Write:%s\n",g_lesp_state.buf_cmd); syslog(LOG_DEBUG, "Write:%s\n", g_lesp_state.buf_cmd);
ret = write(g_lesp_state.fd,g_lesp_state.buf_cmd,ret); ret = write(g_lesp_state.fd,g_lesp_state.buf_cmd,ret);
if (ret < 0) if (ret < 0)
@ -439,7 +439,7 @@ static int lesp_read(int timeout_ms)
if (! g_lesp_state.is_initialized) if (! g_lesp_state.is_initialized)
{ {
syslog(LOG_DEBUG,"Esp8266 not initialized; can't list access points.\n"); syslog(LOG_DEBUG, "Esp8266 not initialized; can't list access points.\n");
return -1; return -1;
} }
@ -472,7 +472,7 @@ static int lesp_read(int timeout_ms)
} }
while (ret == 0); while (ret == 0);
syslog(LOG_DEBUG,"read %d=>%s\n",ret,g_lesp_state.buf_ans); syslog(LOG_DEBUG, "read %d=>%s\n", ret, g_lesp_state.buf_ans);
return ret; return ret;
} }
@ -721,11 +721,11 @@ static void *lesp_worker(void *args)
if (ret < 0) if (ret < 0)
{ {
syslog(LOG_ERR,"worker read data Error %d\n",ret); syslog(LOG_ERR, "worker read data Error %d\n", ret);
} }
else if (ret > 0) else if (ret > 0)
{ {
//syslog(LOG_DEBUG,"c:0x%02X (%c)\n",c); //syslog(LOG_DEBUG, "c:0x%02X (%c)\n", c);
pthread_mutex_lock(&g_lesp_state.mutex); pthread_mutex_lock(&g_lesp_state.mutex);
if (c == '\n') if (c == '\n')
@ -739,7 +739,7 @@ static void *lesp_worker(void *args)
{ {
p->buf[p->buf_size] = '\0'; p->buf[p->buf_size] = '\0';
memcpy(g_lesp_state.buf,p->buf,p->buf_size+1); memcpy(g_lesp_state.buf,p->buf,p->buf_size+1);
syslog(LOG_DEBUG,"Read data:%s\n",g_lesp_state.buf); syslog(LOG_DEBUG, "Read data:%s\n", g_lesp_state.buf);
sem_post(&g_lesp_state.sem); sem_post(&g_lesp_state.sem);
p->buf_size = 0; p->buf_size = 0;
} }
@ -750,7 +750,7 @@ static void *lesp_worker(void *args)
} }
else else
{ {
syslog(LOG_DEBUG,"Read char overflow:%c\n",c); syslog(LOG_DEBUG, "Read char overflow:%c\n", c);
} }
pthread_mutex_unlock(&g_lesp_state.mutex); pthread_mutex_unlock(&g_lesp_state.mutex);
@ -781,7 +781,7 @@ static inline int lesp_create_worker(int priority)
if (ret < 0) if (ret < 0)
{ {
syslog(LOG_ERR,"Cannot Set scheduler parameter thread (%d)\n",ret); syslog(LOG_ERR, "Cannot Set scheduler parameter thread (%d)\n", ret);
} }
else else
{ {
@ -793,7 +793,7 @@ static inline int lesp_create_worker(int priority)
} }
else else
{ {
syslog(LOG_ERR,"Cannot Get/Set scheduler parameter thread (%d)\n", syslog(LOG_ERR, "Cannot Get/Set scheduler parameter thread (%d)\n",
ret); ret);
} }
@ -803,13 +803,13 @@ static inline int lesp_create_worker(int priority)
(ret < 0)?NULL:&thread_attr, lesp_worker, NULL); (ret < 0)?NULL:&thread_attr, lesp_worker, NULL);
if (ret < 0) if (ret < 0)
{ {
syslog(LOG_ERR,"Cannot Create thread return (%d)\n",ret); syslog(LOG_ERR, "Cannot Create thread return (%d)\n", ret);
g_lesp_state.worker.running = false; g_lesp_state.worker.running = false;
} }
if (pthread_attr_destroy(&thread_attr) < 0) if (pthread_attr_destroy(&thread_attr) < 0)
{ {
syslog(LOG_ERR,"Cannot destroy thread attribute (%d)\n",ret); syslog(LOG_ERR, "Cannot destroy thread attribute (%d)\n", ret);
} }
} }
@ -828,18 +828,18 @@ int lesp_initialize(void)
if (g_lesp_state.is_initialized) if (g_lesp_state.is_initialized)
{ {
syslog(LOG_DEBUG,"Esp8266 already initialized.\n"); syslog(LOG_DEBUG, "Esp8266 already initialized.\n");
pthread_mutex_unlock(&g_lesp_state.mutex); pthread_mutex_unlock(&g_lesp_state.mutex);
return 0; return 0;
} }
syslog(LOG_DEBUG,"Initializing Esp8266...\n"); syslog(LOG_DEBUG, "Initializing Esp8266...\n");
memset(g_lesp_state.sockets, 0, SOCKET_NBR * sizeof(lesp_socket_t)); memset(g_lesp_state.sockets, 0, SOCKET_NBR * sizeof(lesp_socket_t));
if (sem_init(&g_lesp_state.sem, 0, 0) < 0) if (sem_init(&g_lesp_state.sem, 0, 0) < 0)
{ {
syslog(LOG_DEBUG,"Cannot create semaphore.\n"); syslog(LOG_DEBUG, "Cannot create semaphore.\n");
pthread_mutex_unlock(&g_lesp_state.mutex); pthread_mutex_unlock(&g_lesp_state.mutex);
return -1; return -1;
} }
@ -851,14 +851,14 @@ int lesp_initialize(void)
if (g_lesp_state.fd < 0) if (g_lesp_state.fd < 0)
{ {
syslog(LOG_ERR,"Cannot open %s.\n", CONFIG_NETUTILS_ESP8266_DEV_PATH); syslog(LOG_ERR, "Cannot open %s.\n", CONFIG_NETUTILS_ESP8266_DEV_PATH);
ret = -1; ret = -1;
} }
#if 0 // lesp_set_baudrate is not defined #if 0 // lesp_set_baudrate is not defined
if (ret >= 0 && lesp_set_baudrate(g_lesp_state.fd, CONFIG_NETUTILS_ESP8266_BAUDRATE) < 0) if (ret >= 0 && lesp_set_baudrate(g_lesp_state.fd, CONFIG_NETUTILS_ESP8266_BAUDRATE) < 0)
{ {
syslog(LOG_ERR,"Cannot set baud rate %d.\n", CONFIG_NETUTILS_ESP8266_BAUDRATE); syslog(LOG_ERR, "Cannot set baud rate %d.\n", CONFIG_NETUTILS_ESP8266_BAUDRATE);
ret = -1; ret = -1;
} }
#endif #endif
@ -870,7 +870,7 @@ int lesp_initialize(void)
pthread_mutex_unlock(&g_lesp_state.mutex); pthread_mutex_unlock(&g_lesp_state.mutex);
g_lesp_state.is_initialized = true; g_lesp_state.is_initialized = true;
syslog(LOG_DEBUG,"Esp8266 initialized.\n"); syslog(LOG_DEBUG, "Esp8266 initialized.\n");
return 0; return 0;
} }
@ -941,11 +941,11 @@ int lesp_ap_connect(const char* ssid_name, const char* ap_key, int timeout_s)
{ {
int ret = 0; int ret = 0;
syslog(LOG_DEBUG,"Starting manual connect...\n"); syslog(LOG_DEBUG, "Starting manual connect...\n");
if (! g_lesp_state.is_initialized) if (! g_lesp_state.is_initialized)
{ {
syslog(LOG_ERR,"ESP8266 not initialized; can't run manual connect.\n"); syslog(LOG_ERR, "ESP8266 not initialized; can't run manual connect.\n");
ret = -1; ret = -1;
} }
else else
@ -960,7 +960,7 @@ int lesp_ap_connect(const char* ssid_name, const char* ap_key, int timeout_s)
return -1; return -1;
} }
syslog(LOG_DEBUG,"Wifi connected.\n"); syslog(LOG_DEBUG, "Wifi connected.\n");
return 0; return 0;
} }
@ -1082,7 +1082,7 @@ int lesp_list_access_points(lesp_cb_t cb)
continue; continue;
} }
syslog(LOG_DEBUG,"Read:%s.\n",g_lesp_state.buf_ans); syslog(LOG_DEBUG, "Read:%s.\n", g_lesp_state.buf_ans);
if (strcmp(g_lesp_state.buf_ans,"OK") == 0) if (strcmp(g_lesp_state.buf_ans,"OK") == 0)
{ {
@ -1092,7 +1092,7 @@ int lesp_list_access_points(lesp_cb_t cb)
ret = lesp_parse_cwlap_ans_line(g_lesp_state.buf_ans,&ap); ret = lesp_parse_cwlap_ans_line(g_lesp_state.buf_ans,&ap);
if (ret < 0) if (ret < 0)
{ {
syslog(LOG_ERR,"Line badly formed."); syslog(LOG_ERR, "Line badly formed.");
} }
cb(&ap); cb(&ap);
@ -1104,7 +1104,7 @@ int lesp_list_access_points(lesp_cb_t cb)
return -1; return -1;
} }
syslog(LOG_DEBUG,"Access Point list finished with %d ap founds.\n",number); syslog(LOG_DEBUG, "Access Point list finished with %d ap founds.\n", number);
return number; return number;
} }
@ -1135,7 +1135,7 @@ int lesp_socket(int domain, int type, int protocol)
if ((domain != PF_INET) && (type != SOCK_STREAM) && (IPPROTO_TCP)) if ((domain != PF_INET) && (type != SOCK_STREAM) && (IPPROTO_TCP))
{ {
syslog(LOG_ERR,"Not Implemented!\n"); syslog(LOG_ERR, "Not Implemented!\n");
return -1; return -1;
} }
@ -1144,7 +1144,7 @@ int lesp_socket(int domain, int type, int protocol)
ret = -1; ret = -1;
if (!g_lesp_state.is_initialized) if (!g_lesp_state.is_initialized)
{ {
syslog(LOG_DEBUG,"Esp8266 not initialized; can't list access points.\n"); syslog(LOG_DEBUG, "Esp8266 not initialized; can't list access points.\n");
} }
else else
{ {
@ -1196,7 +1196,7 @@ int lesp_closesocket(int sockfd)
int lesp_bind(int sockfd, FAR const struct sockaddr *addr, socklen_t addrlen) int lesp_bind(int sockfd, FAR const struct sockaddr *addr, socklen_t addrlen)
{ {
syslog(LOG_ERR,"Not implemented %s\n",__func__); syslog(LOG_ERR, "Not implemented %s\n", __func__);
return -1; return -1;
} }
@ -1246,13 +1246,13 @@ int lesp_connect(int sockfd, FAR const struct sockaddr *addr, socklen_t addrlen)
int lesp_listen(int sockfd, int backlog) int lesp_listen(int sockfd, int backlog)
{ {
syslog(LOG_ERR,"Not implemented %s\n", __func__); syslog(LOG_ERR, "Not implemented %s\n", __func__);
return -1; return -1;
} }
int lesp_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) int lesp_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
{ {
syslog(LOG_ERR,"Not implemented %s\n", __func__); syslog(LOG_ERR, "Not implemented %s\n", __func__);
return -1; return -1;
} }
@ -1276,7 +1276,7 @@ ssize_t lesp_send(int sockfd, FAR const uint8_t *buf, size_t len, int flags)
if (ret >= 0) if (ret >= 0)
{ {
syslog(LOG_DEBUG,"Sending in socket %d, %d bytes.\n",sockfd,len); syslog(LOG_DEBUG, "Sending in socket %d, %d bytes.\n", sockfd,len);
ret = write(g_lesp_state.fd,buf,len); ret = write(g_lesp_state.fd,buf,len);
} }
@ -1304,12 +1304,12 @@ ssize_t lesp_send(int sockfd, FAR const uint8_t *buf, size_t len, int flags)
if (ret >= 0) if (ret >= 0)
{ {
syslog(LOG_DEBUG,"Sent.\n"); syslog(LOG_DEBUG, "Sent.\n");
} }
if (ret < 0) if (ret < 0)
{ {
syslog(LOG_ERR,"Cannot send in socket %d, %d bytes.\n",sockfd,len); syslog(LOG_ERR, "Cannot send in socket %d, %d bytes.\n", sockfd, len);
return -1; return -1;
} }
@ -1324,7 +1324,7 @@ ssize_t lesp_recv(int sockfd, FAR uint8_t *buf, size_t len, int flags)
if (sem_init(&sem, 0, 0) < 0) if (sem_init(&sem, 0, 0) < 0)
{ {
syslog(LOG_DEBUG,"Cannot create semaphore.\n"); syslog(LOG_DEBUG, "Cannot create semaphore.\n");
return -1; return -1;
} }
@ -1386,28 +1386,28 @@ ssize_t lesp_recv(int sockfd, FAR uint8_t *buf, size_t len, int flags)
int lesp_setsockopt(int sockfd, int level, int option, int lesp_setsockopt(int sockfd, int level, int option,
FAR const void *value, socklen_t value_len) FAR const void *value, socklen_t value_len)
{ {
syslog(LOG_ERR,"Not implemented %s\n", __func__); syslog(LOG_ERR, "Not implemented %s\n", __func__);
return -1; return -1;
} }
int lesp_getsockopt(int sockfd, int level, int option, FAR void *value, int lesp_getsockopt(int sockfd, int level, int option, FAR void *value,
FAR socklen_t *value_len) FAR socklen_t *value_len)
{ {
syslog(LOG_ERR,"Not implemented %s\n", __func__); syslog(LOG_ERR, "Not implemented %s\n", __func__);
return -1; return -1;
} }
int lesp_gethostbyname(char *hostname, uint16_t usNameLen, int lesp_gethostbyname(char *hostname, uint16_t usNameLen,
unsigned long *out_ip_addr) unsigned long *out_ip_addr)
{ {
syslog(LOG_ERR,"Not implemented %s\n", __func__); syslog(LOG_ERR, "Not implemented %s\n", __func__);
return -1; return -1;
} }
int lesp_mdnsadvertiser(uint16_t mdnsEnabled, char *deviceServiceName, int lesp_mdnsadvertiser(uint16_t mdnsEnabled, char *deviceServiceName,
uint16_t deviceServiceNameLength) uint16_t deviceServiceNameLength)
{ {
syslog(LOG_ERR,"Not implemented %s\n",__func__); syslog(LOG_ERR, "Not implemented %s\n",__func__);
return -1; return -1;
} }