From 215f31ee3dd27f461540384cdba04b58b481fadc Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 8 Jul 2018 14:30:31 +1000 Subject: Added type gDelay to replace V2.x delaytime_t Added type gTicks to replace V2.x systemticks_t Added type gThreadreturn to replace V2.x threadreturn_t Added type gThreadpriority to replace V2.x threadpriority_t --- boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_ugfx.c | 4 ++-- boards/base/STM32F469i-Discovery/stm32f469i_raw32_ugfx.c | 4 ++-- boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c | 2 +- boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'boards') diff --git a/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_ugfx.c b/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_ugfx.c index fd2dbdef..975f5401 100644 --- a/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_ugfx.c +++ b/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_ugfx.c @@ -13,12 +13,12 @@ { } - systemticks_t gfxSystemTicks(void) + gTicks gfxSystemTicks(void) { return HAL_GetTick(); } - systemticks_t gfxMillisecondsToTicks(delaytime_t ms) + gTicks gfxMillisecondsToTicks(gDelay ms) { return ms; } diff --git a/boards/base/STM32F469i-Discovery/stm32f469i_raw32_ugfx.c b/boards/base/STM32F469i-Discovery/stm32f469i_raw32_ugfx.c index 35b7a5e3..4c1940ec 100644 --- a/boards/base/STM32F469i-Discovery/stm32f469i_raw32_ugfx.c +++ b/boards/base/STM32F469i-Discovery/stm32f469i_raw32_ugfx.c @@ -8,12 +8,12 @@ #include "stm32f4xx_hal.h" #if !GFX_USE_OS_CHIBIOS - systemticks_t gfxSystemTicks(void) + gTicks gfxSystemTicks(void) { return HAL_GetTick(); } - systemticks_t gfxMillisecondsToTicks(delaytime_t ms) + gTicks gfxMillisecondsToTicks(gDelay ms) { return ms; } diff --git a/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c b/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c index a973a0b6..35a60a97 100644 --- a/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c +++ b/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c @@ -259,7 +259,7 @@ static HAL_StatusTypeDef _HAL_SDRAM_SendCommand(SDRAM_HandleTypeDef *hsdram, FMC static HAL_StatusTypeDef _FMC_SDRAM_SendCommand(FMC_SDRAM_TypeDef *Device, FMC_SDRAM_CommandTypeDef *Command, uint32_t Timeout) { __IO uint32_t tmpr = 0; - systemticks_t tickstart = 0; + gTicks tickstart = 0; /* Set command register */ tmpr = (uint32_t)((Command->CommandMode) |\ diff --git a/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c b/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c index f521b865..77183b8a 100644 --- a/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c +++ b/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c @@ -9,12 +9,12 @@ #if GFX_USE_OS_CHIBIOS #define HAL_GPIO_Init(port, ptr) palSetGroupMode(port, (ptr)->Pin, 0, (ptr)->Mode|((ptr)->Speed<<3)|((ptr)->Pull<<5)|((ptr)->Alternate<<7)) #else - systemticks_t gfxSystemTicks(void) + gTicks gfxSystemTicks(void) { return HAL_GetTick(); } - systemticks_t gfxMillisecondsToTicks(delaytime_t ms) + gTicks gfxMillisecondsToTicks(gDelay ms) { return ms; } -- cgit v1.2.3