Build: replace scons with makefile (#235)

* Build: transform scons into Makefile * Build: add Makefile dependencies * Build: remove some tabs from Makefile * Build: Make builds out of source, move wait for event to kernel port * Test: update the full test to print status messages * Build: replace lpthread with pthread Co-authored-by: Alfred Gedeon <[email protected]>
FreeRTOS · Sep 5, 2020 · 6b502b5 · 6b502b5
1 parent c1b0604
commit 6b502b5
Show file tree

Hide file tree

Showing 9 changed files with 114 additions and 299 deletions.
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/portable/NetworkInterface/linux/NetworkInterface.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/portable/NetworkInterface/linux/NetworkInterface.c
@@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <pcap.h>
 
 /* ========================== Local includes =================================*/
-#include "utils/wait_for_event.h"
+#include <utils/wait_for_event.h>
 
 /* ======================== Macro Definitions =============================== */
 #if ( ipconfigETHERNET_DRIVER_FILTERS_FRAME_TYPES == 0 )

diff --git a/FreeRTOS/Demo/Posix_GCC/Makefile b/FreeRTOS/Demo/Posix_GCC/Makefile
@@ -0,0 +1,107 @@
+CC := gcc
+BIN := posix_demo
+
+BUILD_DIR := build
+
+FREERTOS_DIR_REL := ../../../FreeRTOS
+FREERTOS_DIR := $(abspath $(FREERTOS_DIR_REL))
+
+FREERTOS_PLUS_DIR_REL := ../../../FreeRTOS-Plus
+FREERTOS_PLUS_DIR := $(abspath $(FREERTOS_PLUS_DIR_REL))
+
+INCLUDE_DIRS := -I.
+INCLUDE_DIRS += -I${FREERTOS_DIR}/Source/include
+INCLUDE_DIRS += -I${FREERTOS_DIR}/Source/portable/ThirdParty/GCC/Posix
+INCLUDE_DIRS += -I${FREERTOS_DIR}/Source/portable/ThirdParty/GCC/Posix/utils
+INCLUDE_DIRS += -I${FREERTOS_DIR}/Demo/Common/include
+INCLUDE_DIRS += -I${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-Trace/Include
+INCLUDE_DIRS += -I${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-TCP/portable/NetworkInterface/linux/
+INCLUDE_DIRS += -I${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-TCP/include/
+INCLUDE_DIRS += -I${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-TCP/portable/Compiler/GCC/
+
+SOURCE_FILES := $(wildcard *.c)
+SOURCE_FILES += $(wildcard ${FREERTOS_DIR}/Source/*.c)
+# Memory manager (use malloc() / free() )
+SOURCE_FILES += ${FREERTOS_DIR}/Source/portable/MemMang/heap_3.c
+# posix port
+SOURCE_FILES += ${FREERTOS_DIR}/Source/portable/ThirdParty/GCC/Posix/utils/wait_for_event.c
+SOURCE_FILES += ${FREERTOS_DIR}/Source/portable/ThirdParty/GCC/Posix/port.c
+
+# FreeRTOS TCP
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-TCP/FreeRTOS_DNS.c
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-TCP/FreeRTOS_DHCP.c
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-TCP/FreeRTOS_ARP.c
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-TCP/FreeRTOS_TCP_WIN.c
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-TCP/FreeRTOS_Stream_Buffer.c
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-TCP/portable/BufferManagement/BufferAllocation_2.c
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-TCP/FreeRTOS_IP.c
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-TCP/FreeRTOS_TCP_IP.c
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-TCP/FreeRTOS_UDP_IP.c
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-TCP/FreeRTOS_Sockets.c
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-TCP/portable/NetworkInterface/linux/NetworkInterface.c
+
+# Demo library.
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/AbortDelay.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/BlockQ.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/blocktim.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/countsem.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/death.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/dynamic.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/EventGroupsDemo.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/flop.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/GenQTest.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/integer.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/IntSemTest.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/MessageBufferAMP.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/MessageBufferDemo.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/PollQ.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/QPeek.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/QueueOverwrite.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/QueueSet.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/QueueSetPolling.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/recmutex.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/semtest.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/StaticAllocation.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/StreamBufferDemo.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/StreamBufferInterrupt.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/TaskNotify.c
+SOURCE_FILES += ${FREERTOS_DIR}/Demo/Common/Minimal/TimerDemo.c
+
+# Trace library.
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-Trace/trcKernelPort.c
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-Trace/trcSnapshotRecorder.c
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-Trace/trcStreamingRecorder.c
+SOURCE_FILES += ${FREERTOS_PLUS_DIR}/Source/FreeRTOS-Plus-Trace/streamports/File/trcStreamingPort.c
+
+
+CFLAGS := -ggdb3 -Og -DprojCOVERAGE_TEST=0
+LDFLAGS := -ggdb3 -Og -pthread -lpcap
+
+OBJ_FILES = $(SOURCE_FILES:%.c=$(BUILD_DIR)/%.o)
+
+DEP_FILE = $(OBJ_FILES:%.o=%.d)
+
+${BIN} : $(BUILD_DIR)/$(BIN)
+
+${BUILD_DIR}/${BIN} : ${OBJ_FILES}
+	-mkdir -p ${@D}
+	$(CC) $(CFLAGS) $(INCLUDE_DIRS) ${LDFLAGS} $^ -o $@
+
+
+-include ${DEP_FILE}
+
+${BUILD_DIR}/%.o : %.c
+	-mkdir -p $(@D)
+	$(CC) $(CFLAGS) ${INCLUDE_DIRS} -MMD -c $< -o $@
+
+.PHONY: clean
+
+clean:
+	-rm -rf $(BUILD_DIR)
+
+
+
+
+
+
+
diff --git a/FreeRTOS/Demo/Posix_GCC/SConscript b/FreeRTOS/Demo/Posix_GCC/SConscript
diff --git a/FreeRTOS/Demo/Posix_GCC/SConstruct b/FreeRTOS/Demo/Posix_GCC/SConstruct
diff --git a/FreeRTOS/Demo/Posix_GCC/main.c b/FreeRTOS/Demo/Posix_GCC/main.c
@@ -83,7 +83,7 @@ is implemented in main_networking.c. */
 #endif
 
 #ifndef mainCREATE_TCP_ECHO_TASKS_SINGLE
-	#define mainCREATE_TCP_ECHO_TASKS_SINGLE    1
+	#define mainCREATE_TCP_ECHO_TASKS_SINGLE    0
 #endif
 
 /* This demo uses heap_3.c (the libc provided malloc() and free()). */

diff --git a/FreeRTOS/Demo/Posix_GCC/main_blinky.c b/FreeRTOS/Demo/Posix_GCC/main_blinky.c
@@ -246,7 +246,7 @@ uint32_t ulReceivedValue;
 		is it an expected value?  Normally calling printf() from a task is not
 		a good idea.  Here there is lots of stack space and only one task is
 		using console IO so it is ok.  However, note the comments at the top of
-		this file about the risks of making Windows system calls (such as 
+		this file about the risks of making Windows system calls (such as
 		console output) from a FreeRTOS task. */
 		if( ulReceivedValue == mainVALUE_SENT_FROM_TASK )
 		{

diff --git a/FreeRTOS/Demo/Posix_GCC/main_full.c b/FreeRTOS/Demo/Posix_GCC/main_full.c
@@ -106,6 +106,7 @@
 #include "StreamBufferDemo.h"
 #include "StreamBufferInterrupt.h"
 #include "MessageBufferAMP.h"
+#include "console.h"
 
 /* Priorities at which the tasks are created. */
 #define mainCHECK_TASK_PRIORITY			( configMAX_PRIORITIES - 2 )
@@ -182,7 +183,7 @@ static void prvReloadModeTestTimerCallback( TimerHandle_t xTimer );
 /*-----------------------------------------------------------*/
 
 /* The variable into which error messages are latched. */
-static char *pcStatusMessage = "No errors";
+static char *pcStatusMessage = "OK: No errors";
 
 /* This semaphore is created purely to test using the vSemaphoreDelete() and
 semaphore tracing API functions.  It has no other purpose. */
@@ -383,6 +384,8 @@ const TickType_t xCycleFrequency = pdMS_TO_TICKS( 2500UL );
 				pcStatusMessage = "Error: Static allocation";
 			}
 		#endif /* configSUPPORT_STATIC_ALLOCATION */
+        console_print("TickCount %d, pcStatusMessage %s\n",
+                      xNextWakeTime, pcStatusMessage);
 	}
 }
 /*-----------------------------------------------------------*/