From f0e5893e57831967697d64568ed183aceee55e6d Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Mon, 24 Feb 2020 22:37:58 +0100 Subject: [PATCH] renesas-tb-s1ja: implement hal_flash_bank_synergy --- port/renesas-tb-s1ja-cc256x/README.md | 4 - .../template/btstack_example/src/hal_entry.c | 23 ++--- .../src/hal_flash_bank_synergy.c | 96 +++++++++++++++++++ .../src/hal_flash_bank_synergy.h | 69 +++++++++++++ 4 files changed, 174 insertions(+), 18 deletions(-) create mode 100644 port/renesas-tb-s1ja-cc256x/template/btstack_example/src/hal_flash_bank_synergy.c create mode 100644 port/renesas-tb-s1ja-cc256x/template/btstack_example/src/hal_flash_bank_synergy.h diff --git a/port/renesas-tb-s1ja-cc256x/README.md b/port/renesas-tb-s1ja-cc256x/README.md index d76a3cda9..4e03dc4ae 100644 --- a/port/renesas-tb-s1ja-cc256x/README.md +++ b/port/renesas-tb-s1ja-cc256x/README.md @@ -70,10 +70,6 @@ In BTstack, the GATT Database is defined via the .gatt file in the example folde Note: In theory, this can be integrated into the e2 Studio/Eclipse project. -## ToDo -- Implement hal_flash_bank_renesas_ssp - - ## Notes - HCI UART is set to 2 mbps. Using 3 or 4 mbps causes hang during startup diff --git a/port/renesas-tb-s1ja-cc256x/template/btstack_example/src/hal_entry.c b/port/renesas-tb-s1ja-cc256x/template/btstack_example/src/hal_entry.c index ec46699be..081055750 100644 --- a/port/renesas-tb-s1ja-cc256x/template/btstack_example/src/hal_entry.c +++ b/port/renesas-tb-s1ja-cc256x/template/btstack_example/src/hal_entry.c @@ -195,7 +195,6 @@ void hal_uart_dma_receive_block(uint8_t *data, uint16_t size){ #include "btstack_run_loop_embedded.h" #include "btstack_tlv.h" #include "btstack_tlv_flash_bank.h" -#include "hal_flash_bank_memory.h" #include "hci.h" #include "hci_cmd.h" #include "hci_dump.h" @@ -203,6 +202,7 @@ void hal_uart_dma_receive_block(uint8_t *data, uint16_t size){ #include "btstack_memory.h" #include "ble/le_device_db_tlv.h" #include "classic/btstack_link_key_db_tlv.h" +#include "hal_flash_bank_synergy.h" static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){ UNUSED(size); @@ -242,6 +242,11 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack static btstack_packet_callback_registration_t hci_event_callback_registration; static btstack_tlv_flash_bank_t btstack_tlv_flash_bank_context; +static hal_flash_bank_synergy_t hal_flash_bank_context; +#define HAL_FLASH_BANK_SIZE ( 10224 ) +#define HAL_FLASH_BANK_0_ADDR ( 0x40100000 ) +#define HAL_FLASH_BANK_1_ADDR ( 0x40100400 ) + static const hci_transport_config_uart_t config = { HCI_TRANSPORT_CONFIG_UART, 115200, @@ -256,11 +261,10 @@ void hal_entry(void) { // init hal g_hal_init(); - // open uart + // open uart, timer, flash g_uart0.p_api->open(g_uart0.p_ctrl, g_uart0.p_cfg); - - // open timer g_timer0.p_api->open(g_timer0.p_ctrl, g_timer0.p_cfg); + g_flash0.p_api->open(g_flash0.p_ctrl, g_flash0.p_cfg); // start with BTstack init - especially configure HCI Transport btstack_memory_init(); @@ -272,21 +276,12 @@ void hal_entry(void) { hci_init(hci_transport_h4_instance(btstack_uart_block_embedded_instance()), (void*) &config); hci_set_chipset(btstack_chipset_cc256x_instance()); -#if 0 // setup TLV Flash Sector implementation - const hal_flash_bank_t * hal_flash_bank_impl = hal_flash_bank_stm32_init_instance( + const hal_flash_bank_t * hal_flash_bank_impl = hal_flash_bank_synergy_init_instance( &hal_flash_bank_context, HAL_FLASH_BANK_SIZE, - HAL_FLASH_BANK_0_SECTOR, - HAL_FLASH_BANK_1_SECTOR, HAL_FLASH_BANK_0_ADDR, HAL_FLASH_BANK_1_ADDR); -#else - // setup dummy flash bank implementation - static hal_flash_bank_memory_t hal_flash_bank_context; - static uint8_t hal_flash_bank_storage[512]; - const hal_flash_bank_t * hal_flash_bank_impl = hal_flash_bank_memory_init_instance(&hal_flash_bank_context, hal_flash_bank_storage, sizeof(hal_flash_bank_storage)); -#endif const btstack_tlv_t * btstack_tlv_impl = btstack_tlv_flash_bank_init_instance( &btstack_tlv_flash_bank_context, diff --git a/port/renesas-tb-s1ja-cc256x/template/btstack_example/src/hal_flash_bank_synergy.c b/port/renesas-tb-s1ja-cc256x/template/btstack_example/src/hal_flash_bank_synergy.c new file mode 100644 index 000000000..2857d1f92 --- /dev/null +++ b/port/renesas-tb-s1ja-cc256x/template/btstack_example/src/hal_flash_bank_synergy.c @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2020 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. + * 4. Any redistribution, use, or modification is done solely for + * personal benefit and not for any commercial purpose or for + * monetary gain. + * + * THIS SOFTWARE IS PROVIDED BY BLUEKITCHEN GMBH 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. + * + * Please inquire about commercial licensing options at + * contact@bluekitchen-gmbh.com + * + */ + + +#include +#include // memcpy + +#include "hal_flash_bank_synergy.h" +#include "btstack_debug.h" +#include "hal_data.h" + +static uint32_t hal_flash_bank_synergy_get_size(void * context){ + hal_flash_bank_synergy_t * self = (hal_flash_bank_synergy_t *) context; + return self->page_size; +} + +static uint32_t hal_flash_bank_synergy_get_alignment(void * context){ + UNUSED(context); + return 1; +} + +static void hal_flash_bank_synergy_erase(void * context, int bank){ + hal_flash_bank_synergy_t * self = (hal_flash_bank_synergy_t *) context; + if (bank > 1) return; + g_flash0.p_api->erase(g_flash0.p_ctrl, self->page_start[bank], 1); +} + +static void hal_flash_bank_synergy_read(void * context, int bank, uint32_t offset, uint8_t * buffer, uint32_t size){ + hal_flash_bank_synergy_t * self = (hal_flash_bank_synergy_t *) context; + + if (bank > 1) return; + if (offset > self->page_size) return; + if ((offset + size) > self->page_size) return; + + memcpy(buffer, (uint8_t *) (self->page_start[bank] + offset), size); +} + +static void hal_flash_bank_synergy_write(void * context, int bank, uint32_t offset, const uint8_t * data, uint32_t size){ + hal_flash_bank_synergy_t * self = (hal_flash_bank_synergy_t *) context; + + if (bank > 1) return; + if (offset > self->page_size) return; + if ((offset + size) > self->page_size) return; + + g_flash0.p_api->write(g_flash0.p_ctrl, data, self->page_start[bank] + offset, size); +} + +static const hal_flash_bank_t hal_flash_bank_synergy_impl = { + /* uint32_t (*get_size)() */ &hal_flash_bank_synergy_get_size, + /* uint32_t (*get_alignment)(..); */ &hal_flash_bank_synergy_get_alignment, + /* void (*erase)(..); */ &hal_flash_bank_synergy_erase, + /* void (*read)(..); */ &hal_flash_bank_synergy_read, + /* void (*write)(..); */ &hal_flash_bank_synergy_write, +}; + +const hal_flash_bank_t * hal_flash_bank_synergy_init_instance(hal_flash_bank_synergy_t * context, uint32_t page_size, + uint32_t bank_0_addr, uint32_t bank_1_addr){ + context->page_size = page_size; + context->page_start[0] = bank_0_addr; + context->page_start[1] = bank_1_addr; + return &hal_flash_bank_synergy_impl; +} diff --git a/port/renesas-tb-s1ja-cc256x/template/btstack_example/src/hal_flash_bank_synergy.h b/port/renesas-tb-s1ja-cc256x/template/btstack_example/src/hal_flash_bank_synergy.h new file mode 100644 index 000000000..7438d3b63 --- /dev/null +++ b/port/renesas-tb-s1ja-cc256x/template/btstack_example/src/hal_flash_bank_synergy.h @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2020 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_bank_synery.h + * + * HAL abstraction for Flash memory that can be written anywhere + * after being erased + */ + +#ifndef __HAL_FLASH_BANK_SYNERGY_H +#define __HAL_FLASH_BANK_SYNERGY_H + +#include +#include "hal_flash_bank.h" + +#if defined __cplusplus +extern "C" { +#endif + +typedef struct { + uint32_t page_size; + uint32_t page_start[2]; +} hal_flash_bank_synergy_t; + +/** + * Configure STM32 HAL Flash Implementation + * + * @param context of hal_flash_bank_synergy_t + * @param page_size + * @param bank_0_page_id + * @param bank_1_page_id + * @return + */ +const hal_flash_bank_t * hal_flash_bank_stm32wb_init_instance(hal_flash_bank_synergy_t * context, uint32_t page_size, + uint32_t bank_0_addr, uint32_t bank_1_addr); + +#if defined __cplusplus +} +#endif +#endif