Преглед изворни кода

【修复】MDK 编译警告

Signed-off-by: chenyong <1521761801@qq.com>
chenyong пре 7 година
родитељ
комит
ea24ad6124
3 измењених фајлова са 11 додато и 7 уклоњено
  1. 4 2
      ioLibrary/Ethernet/W5500/w5500.h
  2. 4 4
      ioLibrary/Ethernet/wizchip_socket.c
  3. 3 1
      src/wiz_ping.c

+ 4 - 2
ioLibrary/Ethernet/W5500/w5500.h

@@ -917,13 +917,15 @@ extern "C" {
 /**
  * @brief For Berkeley Socket API
  */
+#ifndef SOCK_STREAM
 #define SOCK_STREAM                  Sn_MR_TCP
-
+#endif
 /**
  * @brief For Berkeley Socket API
  */
+#ifndef SOCK_DGRAM
 #define SOCK_DGRAM                   Sn_MR_UDP
-
+#endif
 
 /* Sn_CR values */
 /**

+ 4 - 4
ioLibrary/Ethernet/wizchip_socket.c

@@ -709,8 +709,8 @@ int32_t wizchip_recvfrom(uint8_t sn, uint8_t * buf, uint16_t len, uint8_t * addr
 			#endif
    			if(sock_remained_size[sn] > 1514) 
    			{
-   			   close(sn);
-   			   return SOCKFATAL_PACKLEN;
+   			    wizchip_close(sn);
+   			    return SOCKFATAL_PACKLEN;
    			}
    			sock_pack_info[sn] = PACK_FIRST;
    	   }
@@ -853,8 +853,8 @@ int8_t  wizchip_setsockopt(uint8_t sn, sockopt_type sotype, void* arg)
          		//if ((tmp = getSn_IR(sn)) & Sn_IR_TIMEOUT)
                if (getSn_IR(sn) & Sn_IR_TIMEOUT)
          		{
-         			setSn_IR(sn, Sn_IR_TIMEOUT);
-                  return SOCKERR_TIMEOUT;
+         		    setSn_IR(sn, Sn_IR_TIMEOUT);
+                    return SOCKERR_TIMEOUT;
          		}
             }
          break;

+ 3 - 1
src/wiz_ping.c

@@ -11,8 +11,10 @@
 #include <stdlib.h>
 #include <rtthread.h>
 
-#include <W5500/w5500.h>
+#include <sys/time.h>
+
 #include <wiz_socket.h>
+#include <W5500/w5500.h>
 
 #define Sn_PROTO(ch)         (0x001408 + (ch<<5))