diff --git a/source/Core/BSP/Miniware/port.c b/source/Core/BSP/Miniware/port.c index 7ee68597..125b29f5 100644 --- a/source/Core/BSP/Miniware/port.c +++ b/source/Core/BSP/Miniware/port.c @@ -189,24 +189,27 @@ StackType_t *pxPortInitialiseStack(StackType_t *pxTopOfStack, TaskFunction_t pxC /*-----------------------------------------------------------*/ static void prvTaskExitError(void) { - volatile uint32_t ulDummy = 0UL; + // volatile uint32_t ulDummy = 0UL; - /* A function that implements a task must not exit or attempt to return to - its caller as there is nothing to return to. If a task wants to exit it - should instead call vTaskDelete( NULL ). + // /* A function that implements a task must not exit or attempt to return to + // its caller as there is nothing to return to. If a task wants to exit it + // should instead call vTaskDelete( NULL ). - Artificially force an assert() to be triggered if configASSERT() is - defined, then stop here so application writers can catch the error. */ - configASSERT(uxCriticalNesting == ~0UL); - portDISABLE_INTERRUPTS(); - while (ulDummy == 0) { - /* This file calls prvTaskExitError() after the scheduler has been - started to remove a compiler warning about the function being defined - but never called. ulDummy is used purely to quieten other warnings - about code appearing after this function is called - making ulDummy - volatile makes the compiler think the function could return and - therefore not output an 'unreachable code' warning for code that appears - after it. */ + // Artificially force an assert() to be triggered if configASSERT() is + // defined, then stop here so application writers can catch the error. */ + // configASSERT(uxCriticalNesting == ~0UL); + // portDISABLE_INTERRUPTS(); + // while (ulDummy == 0) { + // /* This file calls prvTaskExitError() after the scheduler has been + // started to remove a compiler warning about the function being defined + // but never called. ulDummy is used purely to quieten other warnings + // about code appearing after this function is called - making ulDummy + // volatile makes the compiler think the function could return and + // therefore not output an 'unreachable code' warning for code that appears + // after it. */ + // } + for(;;){ + } } /*-----------------------------------------------------------*/ diff --git a/source/Makefile b/source/Makefile index 3f0064e7..ccfc9017 100644 --- a/source/Makefile +++ b/source/Makefile @@ -152,7 +152,7 @@ S_SRCS := $(shell find $(MINIWARE_STARTUP_DIR) -type f -name '*.S') LDSCRIPT=$(MINIWARE_LD_FILE) DEV_GLOBAL_DEFS= -D STM32F103T8Ux -D STM32F1 -D STM32 -D USE_HAL_DRIVER -D STM32F103xB -D USE_RTOS_SYSTICK -D GCC_ARMCM3 \ -D ARM_MATH_CM3 \ - -D STM32F10X_MD + -D STM32F10X_MD -finline-limit=9999999 DEV_LDFLAGS= -Wl,--wrap=printf -Wl,--no-wchar-size-warning DEV_AFLAGS= DEV_CFLAGS= -D VECT_TAB_OFFSET=$(bootldr_size)U