Changes required by RTEMS port associated with socket API

Signed-off-by: Premysl Houdek <houdepre@fel.cvut.cz>

diff --git a/ports/os/lwipopts.h b/ports/os/lwipopts.h
index 1354f1c219bcaa17f18a3ac2db69adec4b0121bd..459828a414efc28e75a1211aeec2ed72af21b694 100644 (file)
--- a/ports/os/lwipopts.h
+++ b/ports/os/lwipopts.h
@@ -1083,6 +1083,7 @@
 
 /* DEFAULT VALUES if not defined in OMK and we want them different from lwip/opt.h */
 /* Prevent having to link sys_arch.c (we don't test the API layers in unit tests) */
+#define LWIP_TIMEVAL_PRIVATE 0
 #ifndef NO_SYS
   #define NO_SYS        1
 #endif
@@ -1103,4 +1104,44 @@
   #define MEM_ALIGNMENT   2
 #endif
 
+#define LWIP_DEBUG               0
+
+#define LWIP_DBG_TYPES_ON               LWIP_DBG_OFF
+
+#define ETHARP_DEBUG                    LWIP_DBG_ON
+#define NETIF_DEBUG                     LWIP_DBG_ON
+#define PBUF_DEBUG                      LWIP_DBG_ON
+#define API_LIB_DEBUG                   LWIP_DBG_ON
+#define API_MSG_DEBUG                   LWIP_DBG_ON
+#define SOCKETS_DEBUG                   LWIP_DBG_ON
+#define ICMP_DEBUG                      LWIP_DBG_ON
+#define IGMP_DEBUG                      LWIP_DBG_ON
+#define INET_DEBUG                      LWIP_DBG_ON
+#define IP_DEBUG                        LWIP_DBG_ON
+#define IP_REASS_DEBUG                  LWIP_DBG_ON
+#define RAW_DEBUG                       LWIP_DBG_ON
+#define MEM_DEBUG                       LWIP_DBG_ON
+#define MEMP_DEBUG                      LWIP_DBG_ON
+#define SYS_DEBUG                       LWIP_DBG_ON
+#define TIMERS_DEBUG                    LWIP_DBG_ON
+#define TCP_DEBUG                       LWIP_DBG_ON
+#define TCP_INPUT_DEBUG                 LWIP_DBG_ON
+#define TCP_FR_DEBUG                    LWIP_DBG_ON
+#define TCP_RTO_DEBUG                   LWIP_DBG_ON
+#define TCP_CWND_DEBUG                  LWIP_DBG_ON
+#define TCP_WND_DEBUG                   LWIP_DBG_ON
+#define TCP_OUTPUT_DEBUG                LWIP_DBG_ON
+#define TCP_RST_DEBUG                   LWIP_DBG_ON
+#define TCP_QLEN_DEBUG                  LWIP_DBG_ON
+#define UDP_DEBUG                       LWIP_DBG_ON
+#define TCPIP_DEBUG                     LWIP_DBG_ON
+#define PPP_DEBUG                       LWIP_DBG_ON
+#define SLIP_DEBUG                      LWIP_DBG_ON
+#define DHCP_DEBUG                      LWIP_DBG_ON
+#define AUTOIP_DEBUG                    LWIP_DBG_ON
+#define SNMP_MSG_DEBUG                  LWIP_DBG_ON
+#define SNMP_MIB_DEBUG                  LWIP_DBG_ON
+#define DNS_DEBUG                       LWIP_DBG_ON
+#define IP6_DEBUG                       LWIP_DBG_ON
+
 #endif /* LWIPOPTS_CONNECTION_TO_OMK_CONFIGURATION_HEADER_FILE */

diff --git a/ports/os/rtems/arch/cc.h b/ports/os/rtems/arch/cc.h
index 596409131d63777a7ed6cebe0f7482d9b8c59b94..e604d13c6e8cbdd684446d47e08c0d0f704b1f4e 100644 (file)
--- a/ports/os/rtems/arch/cc.h
+++ b/ports/os/rtems/arch/cc.h
@@ -43,6 +43,10 @@
 #include <rtems/malloc.h>  /*printk*/
 #include <inttypes.h>
 #include <malloc.h>
+#include <sys/time.h>
+#include <rtems.h>
+#include <sys/errno.h>
+
 
 /* This file must either include a system-local <errno.h> which defines
    the standard *nix error codes, or it should #define LWIP_PROVIDE_ERRNO

diff --git a/ports/os/rtems/arch/sys_arch.h b/ports/os/rtems/arch/sys_arch.h
index 087892b3ab1fca732cb589b8c03d45bef91ab21a..47a5e6fb2c06dcd71cb347d6fbcbce6fa3cb9451 100644 (file)
--- a/ports/os/rtems/arch/sys_arch.h
+++ b/ports/os/rtems/arch/sys_arch.h
@@ -42,6 +42,7 @@
 #include <rtems/rtems/sem.h>
 #include <rtems/rtems/intr.h>
 #include <bsp/irq-generic.h>
+#include "arch/eth_lwip_default.h"
 
 /* Typedefs for the various port-specific types. */
 #if defined(NO_SYS) && NO_SYS
@@ -114,4 +115,9 @@ sys_arch_unprotect(sys_prot_t pval)
   rtems_interrupt_enable(pval);
 }
 
+static inline void
+sys_arch_data_sync_barier(void){
+  _ARM_Data_synchronization_barrier();
+}
+
 #endif /* __ARCH_SYS_ARCH_H__ */