Move the delete_task defined to freertos-build

Author: JalonWong

freertos-cargo-build/Cargo.toml

@@ -6,7 +6,7 @@
     name = "freertos-build"
     readme = "README.md"
     repository = "https://github.com/mcu-rust/FreeRTOS"
-    version = "0.3.1"
+    version = "0.4.0"
 
 [lib]
 

freertos-cargo-build/src/lib.rs

@@ -309,6 +309,8 @@ impl Builder {
         add_build_files_with_rerun(&mut b, self.freertos_shim_files()); // Shim C file
         add_build_file_with_rerun(&mut b, self.heap_c_file()); // Heap C file
 
+        setup_all_define(&mut b);
+
         println!("cargo:rerun-if-env-changed={ENV_KEY_FREERTOS_SRC}");
         println!("cargo:rerun-if-env-changed={ENV_KEY_FREERTOS_CONFIG}");
         println!("cargo:rerun-if-env-changed={ENV_KEY_FREERTOS_SHIM}");
@@ -369,6 +371,18 @@ fn add_include_with_rerun<P: AsRef<Path>>(build: &mut Build, dir: P) {
         });
 }
 
+fn setup_all_define(cc: &mut cc::Build) {
+    sync_define(cc, "INCLUDE_vTaskDelete");
+    sync_define(cc, "INCLUDE_vTaskDelayUntil");
+    cc.define("INCLUDE_vTaskDelay", "1");
+}
+
+fn sync_define(cc: &mut cc::Build, def: &str) {
+    let v = "DEP_FREERTOS_".to_string() + def;
+    let v_string = env::var(v).unwrap_or("0".to_string());
+    cc.define(def, v_string.as_str());
+}
+
 #[test]
 fn test_paths() {
     unsafe { env::set_var("FREERTOS_SRC", "some/path") };

freertos-rust-examples/examples/linux/FreeRTOSConfig.h

@@ -53,7 +53,6 @@
     1 tab == 4 spaces!
 */
 
-
 #ifndef FREERTOS_CONFIG_H
 #define FREERTOS_CONFIG_H
 
@@ -71,79 +70,80 @@ extern "C" {
  * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
  *----------------------------------------------------------*/
 
-#define configUSE_PREEMPTION					1
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION	0
-#define configUSE_IDLE_HOOK						0
-#define configUSE_TICK_HOOK						0
-#define configTICK_RATE_HZ						( 1000 )
-#define configMINIMAL_STACK_SIZE				( ( unsigned short ) 50 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the win32 thread. */
-#define configTOTAL_HEAP_SIZE					( ( size_t ) ( 23 * 1024 ) )
-#define configMAX_TASK_NAME_LEN					( 12 )
-#define configUSE_TRACE_FACILITY				1
-#define configUSE_16_BIT_TICKS					0
-#define configIDLE_SHOULD_YIELD					1
-#define configUSE_MUTEXES						1
-#define configCHECK_FOR_STACK_OVERFLOW			0
-#define configUSE_RECURSIVE_MUTEXES				1
-#define configQUEUE_REGISTRY_SIZE				20
-#define configUSE_MALLOC_FAILED_HOOK			1
-#define configUSE_APPLICATION_TASK_TAG			1
-#define configUSE_COUNTING_SEMAPHORES			1
-#define configUSE_QUEUE_SETS					1
-#define configUSE_TASK_NOTIFICATIONS			1
+#define configUSE_PREEMPTION                    1
+#define configUSE_PORT_OPTIMISED_TASK_SELECTION 0
+#define configUSE_IDLE_HOOK                     0
+#define configUSE_TICK_HOOK                     0
+#define configTICK_RATE_HZ                      (1000)
+/* In this simulated case, the stack only has to hold one small structure as the real stack
+  is part of the thread. */
+#define configMINIMAL_STACK_SIZE       ((unsigned short)50)
+#define configTOTAL_HEAP_SIZE          ((size_t)(23 * 1024))
+#define configMAX_TASK_NAME_LEN        (12)
+#define configUSE_TRACE_FACILITY       1
+#define configUSE_16_BIT_TICKS         0
+#define configIDLE_SHOULD_YIELD        1
+#define configUSE_MUTEXES              1
+#define configCHECK_FOR_STACK_OVERFLOW 0
+#define configUSE_RECURSIVE_MUTEXES    1
+#define configQUEUE_REGISTRY_SIZE      20
+#define configUSE_MALLOC_FAILED_HOOK   1
+#define configUSE_APPLICATION_TASK_TAG 1
+#define configUSE_COUNTING_SEMAPHORES  1
+#define configUSE_QUEUE_SETS           1
+#define configUSE_TASK_NOTIFICATIONS   1
 
 /* Software timer related configuration options. */
-#define configUSE_TIMERS						1
-#define configTIMER_TASK_PRIORITY				( configMAX_PRIORITIES - 1 )
-#define configTIMER_QUEUE_LENGTH				20
-#define configTIMER_TASK_STACK_DEPTH			( configMINIMAL_STACK_SIZE * 2 )
+#define configUSE_TIMERS             1
+#define configTIMER_TASK_PRIORITY    (configMAX_PRIORITIES - 1)
+#define configTIMER_QUEUE_LENGTH     20
+#define configTIMER_TASK_STACK_DEPTH (configMINIMAL_STACK_SIZE * 2)
 
-#define configMAX_PRIORITIES					( 7 )
+#define configMAX_PRIORITIES (7)
 
 /* Run time stats gathering configuration options. */
-unsigned long ulGetRunTimeCounterValue( void ); /* Prototype of function that returns run time counter. */
-#define configGENERATE_RUN_TIME_STATS			1
+unsigned long ulGetRunTimeCounterValue(void); /* Prototype of function that returns run time counter. */
+#define configGENERATE_RUN_TIME_STATS 1
 /* Make use of times(man 2) to gather run-time statistics on the tasks. */
-extern void vPortFindTicksPerSecond( void );
-extern unsigned long ulPortGetTimerValue( void );
+extern void vPortFindTicksPerSecond(void);
+extern unsigned long ulPortGetTimerValue(void);
 
 /* Co-routine related configuration options. */
-#define configUSE_CO_ROUTINES 					1
-#define configMAX_CO_ROUTINE_PRIORITIES			( 2 )
+#define configUSE_CO_ROUTINES           1
+#define configMAX_CO_ROUTINE_PRIORITIES (2)
 
 /* This demo makes use of one or more example stats formatting functions.  These
 format the raw data provided by the uxTaskGetSystemState() function in to human
 readable ASCII form.  See the notes in the implementation of vTaskList() within
 FreeRTOS/Source/tasks.c for limitations. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS	1
+#define configUSE_STATS_FORMATTING_FUNCTIONS 1
 
 /* Set the following definitions to 1 to include the API function, or zero
 to exclude the API function.  In most cases the linker will remove unused
 functions anyway. */
-#define INCLUDE_vTaskPrioritySet				1
-#define INCLUDE_uxTaskPriorityGet				1
-#define INCLUDE_vTaskDelete						1
-#define INCLUDE_vTaskCleanUpResources			0
-#define INCLUDE_vTaskSuspend					1
-#define INCLUDE_vTaskDelayUntil					1
-#define INCLUDE_vTaskDelay						1
-#define INCLUDE_uxTaskGetStackHighWaterMark		1
-#define INCLUDE_xTaskGetSchedulerState			1
-#define INCLUDE_xTimerGetTimerDaemonTaskHandle	1
-#define INCLUDE_xTaskGetIdleTaskHandle			1
-#define INCLUDE_pcTaskGetTaskName				1
-#define INCLUDE_eTaskGetState					1
-#define INCLUDE_xSemaphoreGetMutexHolder		1
-#define INCLUDE_xTimerPendFunctionCall			1
+#define INCLUDE_vTaskPrioritySet               1
+#define INCLUDE_uxTaskPriorityGet              1
+#define INCLUDE_vTaskCleanUpResources          0
+#define INCLUDE_vTaskSuspend                   1
+#define INCLUDE_uxTaskGetStackHighWaterMark    1
+#define INCLUDE_xTaskGetSchedulerState         1
+#define INCLUDE_xTimerGetTimerDaemonTaskHandle 1
+#define INCLUDE_xTaskGetIdleTaskHandle         1
+#define INCLUDE_pcTaskGetTaskName              1
+#define INCLUDE_eTaskGetState                  1
+#define INCLUDE_xSemaphoreGetMutexHolder       1
+#define INCLUDE_xTimerPendFunctionCall         1
 
 /* It is a good idea to define configASSERT() while developing.  configASSERT()
 uses the same semantics as the standard C assert() macro. */
-extern void vAssertCalled( const char * const pcFileName, unsigned long ulLine );
-#define configASSERT( x ) if( ( x ) == 0 ) vAssertCalled( __FILE__, __LINE__ )
+extern void vAssertCalled(const char *const pcFileName, unsigned long ulLine);
+#define configASSERT(x) \
+    if ((x) == 0)       \
+    vAssertCalled(__FILE__, __LINE__)
 
 /* Include the FreeRTOS+Trace FreeRTOS trace macro definitions. */
 #define TRACE_ENTER_CRITICAL_SECTION() portENTER_CRITICAL()
-#define TRACE_EXIT_CRITICAL_SECTION() portEXIT_CRITICAL()
+#define TRACE_EXIT_CRITICAL_SECTION()  portEXIT_CRITICAL()
 /*#include "trcKernelPort.h" */
 
 long xPortIsInsideInterrupt();
@@ -152,5 +152,4 @@ long xPortIsInsideInterrupt();
 }
 #endif
 
-
 #endif /* FREERTOS_CONFIG_H */