From cd0c5d4b931e1150c48ffac0a9421d4fc79a433e Mon Sep 17 00:00:00 2001 From: Takashi Kojo Date: Sun, 31 Dec 2017 05:50:08 +0900 Subject: [PATCH] refactor WOLFSSL_DMK_ARM and WOLFSSL_KEIL_TCP_NET in wolfio.h --- wolfssl/wolfio.h | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h index 59afd029b..69c3d072b 100644 --- a/wolfssl/wolfio.h +++ b/wolfssl/wolfio.h @@ -62,15 +62,12 @@ #include #elif defined(FREESCALE_KSDK_MQX) #include - #elif defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET) - #if !defined(WOLFSSL_MDK_ARM) - #include "cmsis_os.h" - #include "rl_net.h" - #else - #include - #endif + #elif (defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET))&& defined(WOLFSSL_CMSIS_RTOS) + #include "cmsis_os.h" + #include "rl_net.h" #include "errno.h" - #define SOCKET_T int + #elif defined(WOLFSSL_CMSIS_RTOS) + #include "cmsis_os.h" #elif defined(WOLFSSL_TIRTOS) #include #elif defined(FREERTOS_TCP) @@ -176,7 +173,6 @@ #define SOCKET_ECONNABORTED NIO_ECONNABORTED #endif #elif defined(WOLFSSL_MDK_ARM)|| defined(WOLFSSL_KEIL_TCP_NET) - #if !defined(WOLFSSL_MDK_ARM) #define SOCKET_EWOULDBLOCK BSD_ERROR_WOULDBLOCK #define SOCKET_EAGAIN BSD_ERROR_LOCKED #define SOCKET_ECONNRESET BSD_ERROR_CLOSED @@ -184,15 +180,6 @@ #define SOCKET_EPIPE BSD_ERROR #define SOCKET_ECONNREFUSED BSD_ERROR #define SOCKET_ECONNABORTED BSD_ERROR - #else - #define SOCKET_EWOULDBLOCK SCK_EWOULDBLOCK - #define SOCKET_EAGAIN SCK_ELOCKED - #define SOCKET_ECONNRESET SCK_ECLOSED - #define SOCKET_EINTR SCK_ERROR - #define SOCKET_EPIPE SCK_ERROR - #define SOCKET_ECONNREFUSED SCK_ERROR - #define SOCKET_ECONNABORTED SCK_ERROR - #endif #elif defined(WOLFSSL_PICOTCP) #define SOCKET_EWOULDBLOCK PICO_ERR_EAGAIN #define SOCKET_EAGAIN PICO_ERR_EAGAIN