From 962e8a2546be500e8780f08a13c87f875b5df03f Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 5 Mar 2014 16:44:37 +0700 Subject: [PATCH] remove other heap 1-3 of freeRTOS ngx4330 work well with lpc/keil for non/freeRTOS --- demos/bsp/boards/ngx/board_ngx4330.c | 3 + demos/host/host_freertos/.cproject | 687 +++++++++++++- demos/host/host_freertos/host_freertos.uvopt | 208 ++++- demos/host/host_freertos/host_freertos.uvproj | 835 ++++++++++++++++++ vendor/freertos/FreeRTOSConfig.h | 2 +- .../freertos/Source/portable/MemMang/heap_1.c | 170 ---- .../freertos/Source/portable/MemMang/heap_2.c | 294 ------ .../freertos/Source/portable/MemMang/heap_3.c | 132 --- 8 files changed, 1720 insertions(+), 611 deletions(-) delete mode 100644 vendor/freertos/freertos/Source/portable/MemMang/heap_1.c delete mode 100644 vendor/freertos/freertos/Source/portable/MemMang/heap_2.c delete mode 100644 vendor/freertos/freertos/Source/portable/MemMang/heap_3.c diff --git a/demos/bsp/boards/ngx/board_ngx4330.c b/demos/bsp/boards/ngx/board_ngx4330.c index 4462eb2d4..a44f5de11 100644 --- a/demos/bsp/boards/ngx/board_ngx4330.c +++ b/demos/bsp/boards/ngx/board_ngx4330.c @@ -54,7 +54,10 @@ const static struct { void board_init(void) { CGU_Init(); + +#if TUSB_CFG_OS == TUSB_OS_NONE // TODO may move to main.c SysTick_Config( CGU_GetPCLKFrequency(CGU_PERIPHERAL_M4CORE)/CFG_TICKS_PER_SECOND ); /* 1 ms Timer */ +#endif //------------- USB Bus power HOST ONLY-------------// scu_pinmux(0x1, 7, MD_PUP | MD_EZI, FUNC4); // P1_7 USB0_PWR_EN, USB0 VBus function Xplorer diff --git a/demos/host/host_freertos/.cproject b/demos/host/host_freertos/.cproject index c734c75a4..47e3ae697 100644 --- a/demos/host/host_freertos/.cproject +++ b/demos/host/host_freertos/.cproject @@ -34,6 +34,7 @@