diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-07-16 19:02:59 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-07-16 19:02:59 +1000 |
| commit | c1d239bbdaef9ae08948ad2b61510ac1cd240947 (patch) | |
| tree | e7fbe4bc48b618f1f54227ae9dc46d6172a384b1 /boards/base | |
| parent | b3028a78d15a325eee1ec9563047637908cab8f5 (diff) | |
| download | uGFX-c1d239bbdaef9ae08948ad2b61510ac1cd240947.tar.gz uGFX-c1d239bbdaef9ae08948ad2b61510ac1cd240947.tar.bz2 uGFX-c1d239bbdaef9ae08948ad2b61510ac1cd240947.zip | |
Significant improvements in alternative scheduler.
Isolate the generic thread and heap code
Tidyup's.
Generic threading now working for x86, cortex-m0->m7.
Diffstat (limited to 'boards/base')
| -rw-r--r-- | boards/base/STM32F746-Discovery/board.mk | 2 | ||||
| -rw-r--r-- | boards/base/STM32F746-Discovery/example_raw32/Makefile | 2 | ||||
| -rw-r--r-- | boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c | 1 | ||||
| -rw-r--r-- | boards/base/Win32/board.mk | 4 |
4 files changed, 6 insertions, 3 deletions
diff --git a/boards/base/STM32F746-Discovery/board.mk b/boards/base/STM32F746-Discovery/board.mk index dd1f8441..35e62757 100644 --- a/boards/base/STM32F746-Discovery/board.mk +++ b/boards/base/STM32F746-Discovery/board.mk @@ -19,7 +19,7 @@ ifeq ($(OPT_OS),raw32) $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c \ $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_system.c \ $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_interrupts.c - GFXDEFS += GFX_OS_EXTRA_INIT_FUNCTION=Raw32OSInit + GFXDEFS += GFX_OS_EXTRA_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=TRUE SRCFLAGS+= -std=c99 GFXINC += $(CMSIS)/Device/ST/STM32F7xx/Include \ $(CMSIS)/Include \ diff --git a/boards/base/STM32F746-Discovery/example_raw32/Makefile b/boards/base/STM32F746-Discovery/example_raw32/Makefile index 298d74bf..dee0f01a 100644 --- a/boards/base/STM32F746-Discovery/example_raw32/Makefile +++ b/boards/base/STM32F746-Discovery/example_raw32/Makefile @@ -55,7 +55,7 @@ LDFLAGS = SRC = OBJS = -DEFS = GOS_RAW_HEAP_SIZE=40960 +DEFS = GFX_OS_HEAP_SIZE=40960 LIBS = INCPATH = diff --git a/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c b/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c index 3d493e5c..5fde982e 100644 --- a/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c +++ b/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c @@ -13,7 +13,6 @@ systemticks_t gfxMillisecondsToTicks(delaytime_t ms) static void SystemClock_Config(void); static void CPU_CACHE_Enable(void); -static void LCD_Config(void); void Raw32OSInit(void) { RCC_PeriphCLKInitTypeDef PeriphClkInitStruct; diff --git a/boards/base/Win32/board.mk b/boards/base/Win32/board.mk index adcbaeaf..b4577927 100644 --- a/boards/base/Win32/board.mk +++ b/boards/base/Win32/board.mk @@ -3,3 +3,7 @@ GFXSRC += GFXLIBS += include $(GFXLIB)/drivers/multiple/Win32/driver.mk include $(GFXLIB)/drivers/gaudio/Win32/driver.mk + +ifeq ($(OPT_OS),win32.raw32) + GFXDEFS += GFX_OS_INIT_NO_WARNING=TRUE +endif |