slip working with int driven rx

bsp_z7/CMakeLists.txt

@@ -1,3 +1,4 @@
 add_subdirectory(freeRTOS)
+add_subdirectory(lwip)
 add_subdirectory(ps7_cortexa9_0)
 add_subdirectory(objects)

bsp_z7/lwip/CMakeLists.txt

@@ -0,0 +1 @@
+target_sources(lwip PRIVATE sys_arch_protect.c)

bsp_z7/lwip/arch/cc.h

@@ -20,4 +20,12 @@
 #define PACK_STRUCT_END
 
 #define LWIP_PLATFORM_ASSERT(x)
-#define LWIP_PLATFORM_DIAG(x) do { printf x; } while(0)
+#define LWIP_PLATFORM_DIAG(x) do { printf x; } while(0)
+
+
+//overwrite protection function, we need ISR aware one, which the default FreeRTOS port does not support
+#define SYS_ARCH_DECL_PROTECT(lev) uint32_t lev //caution, type is actually sys_prot_t, which is not available here.
+#define SYS_ARCH_PROTECT(lev) lev = sys_arch_protect_ca0()
+#define SYS_ARCH_UNPROTECT(lev) sys_arch_unprotect_ca0(lev)
+uint32_t sys_arch_protect_ca0(void); //caution, type is actually sys_prot_t, which is not available here.
+void sys_arch_unprotect_ca0(uint32_t pval); //caution, type is actually sys_prot_t, which is not available here.

bsp_z7/lwip/lwipopts.h

@@ -328,9 +328,17 @@ a lot of data that needs to be copied, this should be set high. */
 
 #endif /* LWIP_OPTTEST_FILE */
 
+// FreeRTOS defines
+#define LWIP_FREERTOS_CHECK_CORE_LOCKING 1
+
+// Disable slip task
+#define SLIP_USE_RX_THREAD 0
+#define SLIP_RX_FROM_ISR 1
+#define SLIP_RX_QUEUE 1
+
 /* The following defines must be done even in OPTTEST mode: */
 
-#define LWIP_FREERTOS_CHECK_CORE_LOCKING 1
+
 
 
 void sys_check_core_locking(void);
@@ -339,7 +347,6 @@ void sys_check_core_locking(void);
 void sys_mark_tcpip_thread(void);
 #define LWIP_MARK_TCPIP_THREAD()   sys_mark_tcpip_thread()
 
-// Disable slip task
-#define SLIP_USE_RX_THREAD 0
+
 
 #endif /* LWIP_LWIPOPTS_H */

bsp_z7/lwip/sys_arch_protect.c

@@ -0,0 +1,66 @@
+#include "lwip/sys.h"
+
+#include "FreeRTOS.h"
+#include "task.h"
+
+extern volatile uint32_t ulPortInterruptNesting;
+
+#if SYS_LIGHTWEIGHT_PROT
+
+sys_prot_t
+sys_arch_protect_ca0(void)
+{
+#if LWIP_FREERTOS_SYS_ARCH_PROTECT_USES_MUTEX
+  BaseType_t ret;
+  LWIP_ASSERT("sys_arch_protect_mutex != NULL", sys_arch_protect_mutex != NULL);
+
+  ret = xSemaphoreTakeRecursive(sys_arch_protect_mutex, portMAX_DELAY);
+  LWIP_ASSERT("sys_arch_protect failed to take the mutex", ret == pdTRUE);
+#else /* LWIP_FREERTOS_SYS_ARCH_PROTECT_USES_MUTEX */
+  if ( ulPortInterruptNesting == 0) {
+    taskENTER_CRITICAL(); 
+  } else {
+    taskENTER_CRITICAL_FROM_ISR(); 
+  }
+#endif /* LWIP_FREERTOS_SYS_ARCH_PROTECT_USES_MUTEX */
+#if LWIP_FREERTOS_SYS_ARCH_PROTECT_SANITY_CHECK
+  {
+    /* every nested call to sys_arch_protect() returns an increased number */
+    sys_prot_t ret = sys_arch_protect_nesting;
+    sys_arch_protect_nesting++;
+    LWIP_ASSERT("sys_arch_protect overflow", sys_arch_protect_nesting > ret);
+    return ret;
+  }
+#else
+  return 1;
+#endif
+}
+
+void
+sys_arch_unprotect_ca0(sys_prot_t pval)
+{
+#if LWIP_FREERTOS_SYS_ARCH_PROTECT_USES_MUTEX
+  BaseType_t ret;
+#endif
+#if LWIP_FREERTOS_SYS_ARCH_PROTECT_SANITY_CHECK
+  LWIP_ASSERT("unexpected sys_arch_protect_nesting", sys_arch_protect_nesting > 0);
+  sys_arch_protect_nesting--;
+  LWIP_ASSERT("unexpected sys_arch_protect_nesting", sys_arch_protect_nesting == pval);
+#endif
+
+#if LWIP_FREERTOS_SYS_ARCH_PROTECT_USES_MUTEX
+  LWIP_ASSERT("sys_arch_protect_mutex != NULL", sys_arch_protect_mutex != NULL);
+
+  ret = xSemaphoreGiveRecursive(sys_arch_protect_mutex);
+  LWIP_ASSERT("sys_arch_unprotect failed to give the mutex", ret == pdTRUE);
+#else /* LWIP_FREERTOS_SYS_ARCH_PROTECT_USES_MUTEX */
+  if ( ulPortInterruptNesting == 0) {
+    taskEXIT_CRITICAL();
+  } else {
+    taskEXIT_CRITICAL_FROM_ISR(0);
+  }
+#endif /* LWIP_FREERTOS_SYS_ARCH_PROTECT_USES_MUTEX */
+  LWIP_UNUSED_ARG(pval);
+}
+
+#endif /* SYS_LIGHTWEIGHT_PROT */

bsp_z7/ps7_cortexa9_0/libsrc/standalone/src/outbyte.c

@@ -15,5 +15,5 @@ void outbyte(char c);
 #endif 
 
 void outbyte(char c) {
-	 //XUartPs_SendByte(STDOUT_BASEADDRESS, c);
+	 XUartPs_SendByte(STDOUT_BASEADDRESS, c);
 }