aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HAL_ChibiOS: fixed build with our old compiler

Browse Source 
gcc 4.9 doesn't like static_assert() in C code
This commit is contained in:
Andrew Tridgell 2020-06-07 12:24:15 +10:00
parent bde8ed37c3
commit 6c1be255bd
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL_ChibiOS/hwdef/common/flash.c
View File

@ -127,10 +127,12 @@ static const uint32_t flash_memmap[STM32_FLASH_NPAGES] = { KB(32), KB(32), KB(32
#error "Unsupported processor for flash.c" #error "Unsupported processor for flash.c"
#endif #endif
#if defined(__GNUC__) && __GNUC__ >= 6
#ifdef STORAGE_FLASH_PAGE #ifdef STORAGE_FLASH_PAGE
static_assert(STORAGE_FLASH_PAGE < STM32_FLASH_NPAGES, static_assert(STORAGE_FLASH_PAGE < STM32_FLASH_NPAGES,
"STORAGE_FLASH_PAGE out of range"); "STORAGE_FLASH_PAGE out of range");
#endif #endif
#endif
// keep a cache of the page addresses // keep a cache of the page addresses
#ifndef STM32_FLASH_FIXED_PAGE_SIZE #ifndef STM32_FLASH_FIXED_PAGE_SIZE