From c03fe772bb0be0e33df79b8ed854b37fd3a2c381 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Tue, 15 Aug 2017 14:47:52 +0200 Subject: [PATCH] stm32-f4discovery-cc256x: extracted hal_flash_sector_stm32.[ch] --- .../src/hal_flash_sector_stm32.c | 110 ++++++++++++++++++ .../src/hal_flash_sector_stm32.h | 72 ++++++++++++ port/stm32-f4discovery-cc256x/src/port.c | 80 +------------ 3 files changed, 185 insertions(+), 77 deletions(-) create mode 100644 port/stm32-f4discovery-cc256x/src/hal_flash_sector_stm32.c create mode 100644 port/stm32-f4discovery-cc256x/src/hal_flash_sector_stm32.h diff --git a/port/stm32-f4discovery-cc256x/src/hal_flash_sector_stm32.c b/port/stm32-f4discovery-cc256x/src/hal_flash_sector_stm32.c new file mode 100644 index 000000000..acc9ee2ba --- /dev/null +++ b/port/stm32-f4discovery-cc256x/src/hal_flash_sector_stm32.c @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2017 BlueKitchen GmbH + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY MATTHIAS RINGWALD AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MATTHIAS + * RINGWALD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +/* + * hal_flash_sector_stm32.c + * + * HAL abstraction for Flash memory that can be written anywhere + * after being erased + */ + +#include +#include // memcpy + +#include "hal_flash_sector_stm32.h" +#include "stm32f4xx_hal.h" + +static uint32_t hal_flash_sector_stm32_get_size(void * context){ + hal_flash_sector_stm32_t * self = (hal_flash_sector_stm32_t *) context; + return self->sector_size; +} + +static uint32_t hal_flash_sector_memory_get_alignment(void * context){ + UNUSED(context); + return 1; +} + +static void hal_flash_sector_stm32_erase(void * context, int bank){ + hal_flash_sector_stm32_t * self = (hal_flash_sector_stm32_t *) context; + if (bank > 1) return; + FLASH_EraseInitTypeDef eraseInit; + eraseInit.TypeErase = FLASH_TYPEERASE_SECTORS; + eraseInit.Sector = self->sectors[bank]; + eraseInit.NbSectors = 1; + eraseInit.VoltageRange = FLASH_VOLTAGE_RANGE_1; // safe value + uint32_t sectorError; + HAL_FLASH_Unlock(); + HAL_FLASHEx_Erase(&eraseInit, §orError); + HAL_FLASH_Lock(); +} + +static void hal_flash_sector_stm32_read(void * context, int bank, uint32_t offset, uint8_t * buffer, uint32_t size){ + hal_flash_sector_stm32_t * self = (hal_flash_sector_stm32_t *) context; + + if (bank > 1) return; + if (offset > self->sector_size) return; + if ((offset + size) > self->sector_size) return; + + memcpy(buffer, ((uint8_t *) self->banks[bank]) + offset, size); +} + +static void hal_flash_sector_stm32_write(void * context, int bank, uint32_t offset, const uint8_t * data, uint32_t size){ + hal_flash_sector_stm32_t * self = (hal_flash_sector_stm32_t *) context; + + if (bank > 1) return; + if (offset > self->sector_size) return; + if ((offset + size) > self->sector_size) return; + + unsigned int i; + HAL_FLASH_Unlock(); + for (i=0;ibanks[bank] + offset +i, data[i]); + } + HAL_FLASH_Lock(); +} + +static const hal_flash_sector_t hal_flash_sector_stm32_impl = { + /* uint32_t (*get_size)() */ &hal_flash_sector_stm32_get_size, + /* uint32_t (*get_alignment)(..); */ &hal_flash_sector_memory_get_alignment, + /* void (*erase)(..); */ &hal_flash_sector_stm32_erase, + /* void (*read)(..); */ &hal_flash_sector_stm32_read, + /* void (*write)(..); */ &hal_flash_sector_stm32_write, +}; + +const hal_flash_sector_t * hal_flash_sector_stm32_init_instance(hal_flash_sector_stm32_t * context, uint32_t sector_size, + uint32_t bank_0_sector, uint32_t bank_1_sector, uintptr_t bank_0_addr, uintptr_t bank_1_addr){ + context->sector_size = sector_size; + context->sectors[0] = bank_0_sector; + context->sectors[1] = bank_1_sector; + context->banks[0] = bank_0_addr; + context->banks[1] = bank_1_addr; + return &hal_flash_sector_stm32_impl; +} diff --git a/port/stm32-f4discovery-cc256x/src/hal_flash_sector_stm32.h b/port/stm32-f4discovery-cc256x/src/hal_flash_sector_stm32.h new file mode 100644 index 000000000..a7db17901 --- /dev/null +++ b/port/stm32-f4discovery-cc256x/src/hal_flash_sector_stm32.h @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2017 BlueKitchen GmbH + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY MATTHIAS RINGWALD AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MATTHIAS + * RINGWALD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +/* + * hal_flash_sector_stm32.h + * + * HAL abstraction for Flash memory that can be written anywhere + * after being erased + */ + +#ifndef __HAL_FLASH_SECTOR_STM32_H +#define __HAL_FLASH_SECTOR_STM32_H + +#include +#include "hal_flash_sector.h" + +#if defined __cplusplus +extern "C" { +#endif + +typedef struct { + uint32_t sector_size; + uint32_t sectors[2]; + uintptr_t banks[2]; +} hal_flash_sector_stm32_t; + +/** + * Configure STM32 HAL Flash Implementation + * + * @param context of hal_flash_sector_stm32_t + * @param sector_size + * @param bank_0_sector id + * @param bank_1_sector id + * @param bank_0_addr + * @param bank_1_addr + * @return + */ +const hal_flash_sector_t * hal_flash_sector_stm32_init_instance(hal_flash_sector_stm32_t * context, uint32_t sector_size, + uint32_t bank_0_sector, uint32_t bank_1_sector, uintptr_t bank_0_addr, uintptr_t bank_1_addr); + +#if defined __cplusplus +} +#endif +#endif diff --git a/port/stm32-f4discovery-cc256x/src/port.c b/port/stm32-f4discovery-cc256x/src/port.c index 241170413..a9a193651 100644 --- a/port/stm32-f4discovery-cc256x/src/port.c +++ b/port/stm32-f4discovery-cc256x/src/port.c @@ -1,3 +1,5 @@ +#define __BTSTACK_FILE__ "port.c" + #include "port.h" #include "btstack.h" #include "btstack_debug.h" @@ -8,11 +10,9 @@ #include "ble/le_device_db_tlv.h" #include "classic/btstack_link_key_db_static.h" #include "classic/btstack_link_key_db_tlv.h" -#include "hal_flash_sector.h" +#include "hal_flash_sector_stm32.h" #include "stm32f4xx_hal.h" -#define __BTSTACK_FILE__ "port.c" - // extern UART_HandleTypeDef huart2; extern UART_HandleTypeDef huart3; @@ -283,80 +283,6 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack } } -// hal_flash_sector.h -typedef struct { - uint32_t sector_size; - uint32_t sectors[2]; - uintptr_t banks[2]; - -} hal_flash_sector_stm32_t; - -static uint32_t hal_flash_sector_stm32_get_size(void * context){ - hal_flash_sector_stm32_t * self = (hal_flash_sector_stm32_t *) context; - return self->sector_size; -} - -static uint32_t hal_flash_sector_memory_get_alignment(void * context){ - UNUSED(context); - return 1; -} - -static void hal_flash_sector_stm32_erase(void * context, int bank){ - hal_flash_sector_stm32_t * self = (hal_flash_sector_stm32_t *) context; - if (bank > 1) return; - FLASH_EraseInitTypeDef eraseInit; - eraseInit.TypeErase = FLASH_TYPEERASE_SECTORS; - eraseInit.Sector = self->sectors[bank]; - eraseInit.NbSectors = 1; - eraseInit.VoltageRange = FLASH_VOLTAGE_RANGE_1; // safe value - uint32_t sectorError; - HAL_FLASH_Unlock(); - HAL_FLASHEx_Erase(&eraseInit, §orError); - HAL_FLASH_Lock(); -} - -static void hal_flash_sector_stm32_read(void * context, int bank, uint32_t offset, uint8_t * buffer, uint32_t size){ - hal_flash_sector_stm32_t * self = (hal_flash_sector_stm32_t *) context; - - if (bank > 1) return; - if (offset > self->sector_size) return; - if ((offset + size) > self->sector_size) return; - - memcpy(buffer, ((uint8_t *) self->banks[bank]) + offset, size); -} - -static void hal_flash_sector_stm32_write(void * context, int bank, uint32_t offset, const uint8_t * data, uint32_t size){ - hal_flash_sector_stm32_t * self = (hal_flash_sector_stm32_t *) context; - - if (bank > 1) return; - if (offset > self->sector_size) return; - if ((offset + size) > self->sector_size) return; - - unsigned int i; - HAL_FLASH_Unlock(); - for (i=0;ibanks[bank] + offset +i, data[i]); - } - HAL_FLASH_Lock(); -} - -static const hal_flash_sector_t hal_flash_sector_stm32_impl = { - /* uint32_t (*get_size)() */ &hal_flash_sector_stm32_get_size, - /* uint32_t (*get_alignment)(..); */ &hal_flash_sector_memory_get_alignment, - /* void (*erase)(..); */ &hal_flash_sector_stm32_erase, - /* void (*read)(..); */ &hal_flash_sector_stm32_read, - /* void (*write)(..); */ &hal_flash_sector_stm32_write, -}; - -static const hal_flash_sector_t * hal_flash_sector_stm32_init_instance(hal_flash_sector_stm32_t * context, uint32_t sector_size, - uint32_t bank_0_sector, uint32_t bank_1_sector, uintptr_t bank_0_addr, uintptr_t bank_1_addr){ - context->sector_size = sector_size; - context->sectors[0] = bank_0_sector; - context->sectors[1] = bank_1_sector; - context->banks[0] = bank_0_addr; - context->banks[1] = bank_1_addr; - return &hal_flash_sector_stm32_impl; -} static btstack_tlv_flash_sector_t btstack_tlv_flash_sector_context; static hal_flash_sector_stm32_t hal_flash_sector_context;