From ee185c03783038c2b1b1d3e78f91c1600211ddd8 Mon Sep 17 00:00:00 2001 From: cinsights Date: Wed, 22 Apr 2020 02:52:44 +0000 Subject: [PATCH] Fix bug #1084 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13550 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- os/hal/ports/STM32/STM32F4xx/hal_efl_lld.c | 56 +++++++++++----------- readme.txt | 1 + 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/os/hal/ports/STM32/STM32F4xx/hal_efl_lld.c b/os/hal/ports/STM32/STM32F4xx/hal_efl_lld.c index f3089ff0f..9008dc46d 100644 --- a/os/hal/ports/STM32/STM32F4xx/hal_efl_lld.c +++ b/os/hal/ports/STM32/STM32F4xx/hal_efl_lld.c @@ -60,38 +60,38 @@ EFlashDriver EFLD1; #if defined(STM32F413xx) || defined(STM32F412xx) || defined(__DOXYGEN__) /* Sector table for 1.5M device. */ static const flash_sector_descriptor_t efl_lld_sect1[STM32_FLASH1_SECTORS_TOTAL] = { - { 0, 16134}, /* Sector 0. */ - { 1 * 16134, 16134}, /* Sector 1. */ - { 2 * 16134, 16134}, /* Sector 2. */ - { 3 * 16134, 16134}, /* Sector 3. */ - { 4 * 16134, 65536}, /* Sector 4. */ - { 4 * 16134 + 65536, 131072}, /* Sector 5. */ - { 4 * 16134 + 65536 + 1 * 131072, 131072}, /* Sector 6. */ - { 4 * 16134 + 65536 + 2 * 131072, 131072}, /* Sector 7. */ - { 4 * 16134 + 65536 + 3 * 131072, 131072}, /* Sector 8. */ - { 4 * 16134 + 65536 + 4 * 131072, 131072}, /* Sector 9. */ - { 4 * 16134 + 65536 + 5 * 131072, 131072}, /* Sector 10. */ - { 4 * 16134 + 65536 + 6 * 131072, 131072}, /* Sector 11. */ - { 4 * 16134 + 65536 + 7 * 131072, 131072}, /* Sector 12. */ - { 4 * 16134 + 65536 + 8 * 131072, 131072}, /* Sector 13. */ - { 4 * 16134 + 65536 + 9 * 131072, 131072}, /* Sector 14. */ - { 4 * 16134 + 65536 + 10 * 131072, 131072} /* Sector 15. */ + { 0, 16834}, /* Sector 0. */ + { 1 * 16834, 16834}, /* Sector 1. */ + { 2 * 16834, 16834}, /* Sector 2. */ + { 3 * 16834, 16834}, /* Sector 3. */ + { 4 * 16834, 65536}, /* Sector 4. */ + { 4 * 16834 + 65536, 131072}, /* Sector 5. */ + { 4 * 16834 + 65536 + 1 * 131072, 131072}, /* Sector 6. */ + { 4 * 16834 + 65536 + 2 * 131072, 131072}, /* Sector 7. */ + { 4 * 16834 + 65536 + 3 * 131072, 131072}, /* Sector 8. */ + { 4 * 16834 + 65536 + 4 * 131072, 131072}, /* Sector 9. */ + { 4 * 16834 + 65536 + 5 * 131072, 131072}, /* Sector 10. */ + { 4 * 16834 + 65536 + 6 * 131072, 131072}, /* Sector 11. */ + { 4 * 16834 + 65536 + 7 * 131072, 131072}, /* Sector 12. */ + { 4 * 16834 + 65536 + 8 * 131072, 131072}, /* Sector 13. */ + { 4 * 16834 + 65536 + 9 * 131072, 131072}, /* Sector 14. */ + { 4 * 16834 + 65536 + 10 * 131072, 131072} /* Sector 15. */ }; /* Sector table for 1M device. */ static const flash_sector_descriptor_t efl_lld_sect2[STM32_FLASH2_SECTORS_TOTAL] = { - { 0, 16134}, /* Sector 0. */ - { 1 * 16134, 16134}, /* Sector 1. */ - { 2 * 16134, 16134}, /* Sector 2. */ - { 3 * 16134, 16134}, /* Sector 3. */ - { 4 * 16134, 65536}, /* Sector 4. */ - { 4 * 16134 + 65536, 131072}, /* Sector 5. */ - { 4 * 16134 + 65536 + 1 * 131072, 131072}, /* Sector 6. */ - { 4 * 16134 + 65536 + 2 * 131072, 131072}, /* Sector 7. */ - { 4 * 16134 + 65536 + 3 * 131072, 131072}, /* Sector 8. */ - { 4 * 16134 + 65536 + 4 * 131072, 131072}, /* Sector 9. */ - { 4 * 16134 + 65536 + 5 * 131072, 131072}, /* Sector 10. */ - { 4 * 16134 + 65536 + 6 * 131072, 131072} /* Sector 11. */ + { 0, 16834}, /* Sector 0. */ + { 1 * 16834, 16834}, /* Sector 1. */ + { 2 * 16834, 16834}, /* Sector 2. */ + { 3 * 16834, 16834}, /* Sector 3. */ + { 4 * 16834, 65536}, /* Sector 4. */ + { 4 * 16834 + 65536, 131072}, /* Sector 5. */ + { 4 * 16834 + 65536 + 1 * 131072, 131072}, /* Sector 6. */ + { 4 * 16834 + 65536 + 2 * 131072, 131072}, /* Sector 7. */ + { 4 * 16834 + 65536 + 3 * 131072, 131072}, /* Sector 8. */ + { 4 * 16834 + 65536 + 4 * 131072, 131072}, /* Sector 9. */ + { 4 * 16834 + 65536 + 5 * 131072, 131072}, /* Sector 10. */ + { 4 * 16834 + 65536 + 6 * 131072, 131072} /* Sector 11. */ }; /* The descriptors for 1.5M device. */ diff --git a/readme.txt b/readme.txt index 6dc398668..9c98fae99 100644 --- a/readme.txt +++ b/readme.txt @@ -74,6 +74,7 @@ ***************************************************************************** *** Next *** +- FIX: Sector size incorrect in STM32F413 EFL driver (bug #1084). - NEW: Mail Queues test implementation in CMSIS RTOS wrapper. - NEW: Added dynamic reconfiguration API to lwIP bindings. - FIX: Corrected I2C4 BDMA #define conditional in I2Cv3 (bug #1082)