Mercurial > public > ostc4
view Small_CPU/Src/tm_stm32f4_otp.c @ 238:a9d798e8c11f div-fixes-5
cleanup, bugfix: do not mask I2C_SystemStatus with local variable
This commit is partly cleanup, and partly possible bugfix. Masking
the global I2C_SystemStatus with a local variable is (very) bad practice,
but more importantly, dangerous, as other code uses this I2C_SystemStatus
to base decisions on. So, this is definitely non-trivial, as it can
possibly change the flow of control. This said, its tested and seems to
have no negative effects (but also no positive, as I sort of hoped for),
so that is why I mark it cleanup as well. Constructs like this shall
be heavily documented in the code, when there is a reason to do things
like this.
Further, remove a 2nd rather useless construct. There is no reason
to & 0x03 the output of I2C_SystemStatus. This is the only location
in the entire code base where this is done, so, its not only useless
but also inconsistent and confusing the true intentions here.
Finally, littered to code with todo's that I will take care of in
next commits.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author | Jan Mulder <jlmulder@xs4all.nl> |
---|---|
date | Mon, 08 Apr 2019 10:16:17 +0200 |
parents | 5f11787b4f42 |
children |
line wrap: on
line source
/** * |---------------------------------------------------------------------- * | Copyright (C) Tilen Majerle, 2014 * | * | This program is free software: you can redistribute it and/or modify * | it under the terms of the GNU General Public License as published by * | the Free Software Foundation, either version 3 of the License, or * | any later version. * | * | This program is distributed in the hope that it will be useful, * | but WITHOUT ANY WARRANTY; without even the implied warranty of * | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | GNU General Public License for more details. * | * | You should have received a copy of the GNU General Public License * | along with this program. If not, see <http://www.gnu.org/licenses/>. * |---------------------------------------------------------------------- */ #include "tm_stm32f4_otp.h" HAL_StatusTypeDef TM_OTP_Write(uint8_t block, uint8_t byte, uint8_t data) { HAL_StatusTypeDef answer; /* Check input parameters */ if ( block >= OTP_BLOCKS || byte >= OTP_BYTES_IN_BLOCK ) { /* Invalid parameters */ return HAL_ERROR; } if(*(uint8_t *)(OTP_START_ADDR + block * OTP_BYTES_IN_BLOCK + byte) != 0xFF) return HAL_ERROR; /* Unlock FLASH */ HAL_FLASH_Unlock(); answer = HAL_FLASH_Program(FLASH_TYPEPROGRAM_BYTE, (OTP_START_ADDR + block * OTP_BYTES_IN_BLOCK + byte), data); /* Lock FLASH */ HAL_FLASH_Lock(); return answer; } uint8_t TM_OTP_Read(uint8_t block, uint8_t byte) { uint8_t data; /* Check input parameters */ if ( block >= OTP_BLOCKS || byte >= OTP_BYTES_IN_BLOCK ) { /* Invalid parameters */ return HAL_ERROR; } /* Get value */ data = *(__IO uint8_t *)(OTP_START_ADDR + block * OTP_BYTES_IN_BLOCK + byte); /* Return data */ return data; }