浏览代码

Merge pull request #1898 from eddylin83/master

fix at socket issue
Bernard Xiong 6 年之前
父节点
当前提交
f763f8e728
共有 2 个文件被更改,包括 6 次插入2 次删除
  1. 5 1
      components/net/at/at_socket/at_socket.c
  2. 1 1
      components/net/at/at_socket/at_socket.h

+ 5 - 1
components/net/at/at_socket/at_socket.c

@@ -655,6 +655,10 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f
     {
     {
         timeout = RT_WAITING_FOREVER;
         timeout = RT_WAITING_FOREVER;
     }
     }
+    else
+    {
+        timeout = rt_tick_from_millisecond(timeout);
+    }
 
 
     while (1)
     while (1)
     {
     {
@@ -1161,7 +1165,7 @@ void at_freeaddrinfo(struct addrinfo *ai)
     }
     }
 }
 }
 
 
-void at_scoket_device_register(const struct at_device_ops *ops)
+void at_socket_device_register(const struct at_device_ops *ops)
 {
 {
     RT_ASSERT(ops);
     RT_ASSERT(ops);
     RT_ASSERT(ops->at_connect);
     RT_ASSERT(ops->at_connect);

+ 1 - 1
components/net/at/at_socket/at_socket.h

@@ -129,7 +129,7 @@ int at_getaddrinfo(const char *nodename, const char *servname, const struct addr
 void at_freeaddrinfo(struct addrinfo *ai);
 void at_freeaddrinfo(struct addrinfo *ai);
 
 
 struct at_socket *at_get_socket(int socket);
 struct at_socket *at_get_socket(int socket);
-void at_scoket_device_register(const struct at_device_ops *ops);
+void at_socket_device_register(const struct at_device_ops *ops);
 
 
 #ifndef RT_USING_SAL
 #ifndef RT_USING_SAL