fruchti/laurelin
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix warnings

Browse source
This commit is contained in:
fruchti 2020-09-19 19:57:34 +02:00
parent 99b3d6a36c
commit 5e4b80343f
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build-number.txt
View file

@ -1 +1 @@
445 447

18
src/nvs.c
View file

@ -11,7 +11,7 @@
#define NVS_VALID_BLOCK_MARKER 0xab34 #define NVS_VALID_BLOCK_MARKER 0xab34
typedef struct typedef struct
__attribute__((packed)) __attribute__((packed, aligned(2)))
{ {
// Actual block data // Actual block data
NVS_Data_t data; NVS_Data_t data;
@ -26,9 +26,9 @@ __attribute__((packed))
} NVS_Block_t; } NVS_Block_t;
__attribute__((used, section(".nvstore"))) __attribute__((used, section(".nvstore")))
volatile NVS_Block_t NVS_Area[NVS_BLOCK_COUNT]; NVS_Block_t NVS_Area[NVS_BLOCK_COUNT];
volatile NVS_Block_t *NVS_FlashData; NVS_Block_t *NVS_FlashData;
__attribute__((used)) __attribute__((used))
NVS_Block_t NVS_RAMData; NVS_Block_t NVS_RAMData;
@ -37,7 +37,7 @@ NVS_Data_t *const NVS_Data = &NVS_RAMData.data;
static uint32_t NVS_CalculateCRC(NVS_Data_t *data) static uint32_t NVS_CalculateCRC(NVS_Data_t *data)
{ {
CRC->CR = CRC_CR_RESET; CRC->CR = CRC_CR_RESET;
for(int i = 0; i < sizeof(NVS_Data_t); i++) for(unsigned int i = 0; i < sizeof(NVS_Data_t); i++)
{ {
CRC->DR = ((uint8_t*)(data))[i]; CRC->DR = ((uint8_t*)(data))[i];
} }
@ -47,7 +47,7 @@ static uint32_t NVS_CalculateCRC(NVS_Data_t *data)
static void NVS_ProgramHalfWord(uint16_t *dest, uint16_t value) static void NVS_ProgramHalfWord(uint16_t *dest, uint16_t value)
{ {
FLASH->CR |= FLASH_CR_PG; FLASH->CR |= FLASH_CR_PG;
*(volatile uint16_t*)dest = value; *(uint16_t*)dest = value;
while(FLASH->SR & FLASH_SR_BSY); while(FLASH->SR & FLASH_SR_BSY);
if(*dest != value) if(*dest != value)
{ {
@ -91,7 +91,7 @@ static void NVS_EraseArea(void)
static bool NVS_BlockEmpty(NVS_Block_t *block) static bool NVS_BlockEmpty(NVS_Block_t *block)
{ {
for(int i = 0; i < sizeof(NVS_Block_t) / 2; i++) for(unsigned int i = 0; i < sizeof(NVS_Block_t) / 2; i++)
{ {
if(*((uint16_t*)block + i) != 0xffff) if(*((uint16_t*)block + i) != 0xffff)
{ {
@ -111,10 +111,10 @@ bool NVS_Load(void)
{ {
RCC->AHBENR |= RCC_AHBENR_CRCEN; RCC->AHBENR |= RCC_AHBENR_CRCEN;
volatile NVS_Block_t *block = NULL; NVS_Block_t *block = NULL;
// Find valid block // Find valid block
for(int i = 0; i < NVS_BLOCK_COUNT; i++) for(unsigned int i = 0; i < NVS_BLOCK_COUNT; i++)
{ {
block = &NVS_Area[i]; block = &NVS_Area[i];
if(block->marker == NVS_VALID_BLOCK_MARKER) if(block->marker == NVS_VALID_BLOCK_MARKER)
@ -168,7 +168,7 @@ void NVS_Save(void)
NVS_RAMData.marker = NVS_VALID_BLOCK_MARKER; NVS_RAMData.marker = NVS_VALID_BLOCK_MARKER;
// The block length is guaranteed to be divisible by 2 // The block length is guaranteed to be divisible by 2
for(int i = 0; i < sizeof(NVS_Block_t) / 2; i++) for(unsigned int i = 0; i < sizeof(NVS_Block_t) / 2; i++)
{ {
NVS_ProgramHalfWord((uint16_t*)next_block + i, NVS_ProgramHalfWord((uint16_t*)next_block + i,
*((uint16_t*)&NVS_RAMData + i)); *((uint16_t*)&NVS_RAMData + i));

2
src/nvs.h
View file

@ -5,7 +5,7 @@
#include "stm32f030x6.h" #include "stm32f030x6.h"
typedef struct typedef struct
__attribute__((packed)) __attribute__((packed, aligned(2)))
{ {
unsigned int animation_step_bottom; unsigned int animation_step_bottom;
unsigned int animation_step_top; unsigned int animation_step_top;