riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11314 from fjmolinas/pr_stm32l1_eeprom_null

Browse Source 
cpu/stm32l1: fix issue when  writing NULL bytes to eeprom
This commit is contained in:
Alexandre Abadie 2019-07-04 18:36:30 +02:00 committed by GitHub
commit 3f141e9184
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
cpu/stm32_common/periph/eeprom.c
View File

@ -16,6 +16,7 @@
* *
* @author Alexandre Abadie <alexandre.abadie@inria.fr> * @author Alexandre Abadie <alexandre.abadie@inria.fr>
* @author Oleg Artamonov <oleg@unwds.com> * @author Oleg Artamonov <oleg@unwds.com>
* @author Francisco Molina <francois-xavier.molina@inria.fr>
* *
* @} * @}
*/ */
@ -36,6 +37,54 @@ extern void _wait_for_pending_operations(void);
#error "periph/eeprom: EEPROM_START_ADDR is not defined" #error "periph/eeprom: EEPROM_START_ADDR is not defined"
#endif #endif
#if defined(CPU_MODEL_STM32L151CB)
#define ALIGN_MASK (0x00000003)
#define BYTE_MASK (0xFF)
#define BYTE_BITS (0x08)
static void _erase_word(uint32_t addr)
{
/* Wait for last operation to be completed */
_wait_for_pending_operations();
/* Write "00000000h" to valid address in the data memory" */
*(__IO uint32_t *)addr = 0x00000000;
}
static void _write_word(uint32_t addr, uint32_t data)
{
/* Wait for last operation to be completed */
_wait_for_pending_operations();
*(__IO uint32_t *)addr = data;
}
#endif
static void _write_byte(uint32_t addr, uint8_t data)
{
/* Wait for last operation to be completed */
_wait_for_pending_operations();
#if defined(CPU_MODEL_STM32L151CB)
/* stm32l1xxx cat 1 can't write NULL bytes RefManual p79*/
uint32_t tmp = 0;
uint32_t data_mask = 0;
if (data != (uint8_t)0x00) {
*(__IO uint8_t *)addr = data;
}
else {
tmp = *(__IO uint32_t *)(addr & (~ALIGN_MASK));
data_mask = BYTE_MASK << ((uint32_t)(BYTE_BITS * (addr & ALIGN_MASK)));
tmp &= ~data_mask;
_erase_word(addr & (~ALIGN_MASK));
_write_word((addr & (~ALIGN_MASK)), tmp);
}
#else
*(__IO uint8_t *)addr = data;
#endif
}
size_t eeprom_read(uint32_t pos, uint8_t *data, size_t len) size_t eeprom_read(uint32_t pos, uint8_t *data, size_t len)
{ {
assert(pos + len <= EEPROM_SIZE); assert(pos + len <= EEPROM_SIZE);
@ -45,7 +94,7 @@ size_t eeprom_read(uint32_t pos, uint8_t *data, size_t len)
DEBUG("Reading data from EEPROM at pos %" PRIu32 ": ", pos); DEBUG("Reading data from EEPROM at pos %" PRIu32 ": ", pos);
for (size_t i = 0; i < len; i++) { for (size_t i = 0; i < len; i++) {
_wait_for_pending_operations(); _wait_for_pending_operations();
*p++ = *(uint8_t *)(EEPROM_START_ADDR + pos++); *p++ = *(__IO uint8_t *)(EEPROM_START_ADDR + pos++);
DEBUG("0x%02X ", *p); DEBUG("0x%02X ", *p);
} }
DEBUG("\n"); DEBUG("\n");
@ -62,8 +111,7 @@ size_t eeprom_write(uint32_t pos, const uint8_t *data, size_t len)
_unlock(); _unlock();
for (size_t i = 0; i < len; i++) { for (size_t i = 0; i < len; i++) {
_wait_for_pending_operations(); _write_byte((EEPROM_START_ADDR + pos++), *p++);
*(uint8_t *)(EEPROM_START_ADDR + pos++) = *p++;
} }
_lock(); _lock();