From 5af4a915edf3e77705fa2625081200b61f8dda26 Mon Sep 17 00:00:00 2001 From: Paul Selkirk Date: Sun, 15 Oct 2017 21:34:00 -0400 Subject: Cleanup: All drivers return HAL_StatusTypeDef rather than magic values. Note: This affects libhal/ks_token.c, which uses the keystore driver directly. --- stm-keystore.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'stm-keystore.c') diff --git a/stm-keystore.c b/stm-keystore.c index 2596373..7683f40 100644 --- a/stm-keystore.c +++ b/stm-keystore.c @@ -62,46 +62,32 @@ void keystore_init(void) HAL_SPI_Init(&hspi_keystore); } -int keystore_check_id(void) +HAL_StatusTypeDef keystore_check_id(void) { return n25q128_check_id(&keystore_ctx); } -int keystore_read_data(uint32_t offset, uint8_t *buf, const uint32_t len) +HAL_StatusTypeDef keystore_read_data(uint32_t offset, uint8_t *buf, const uint32_t len) { return n25q128_read_data(&keystore_ctx, offset, buf, len); } -int keystore_write_data(uint32_t offset, const uint8_t *buf, const uint32_t len) +HAL_StatusTypeDef keystore_write_data(uint32_t offset, const uint8_t *buf, const uint32_t len) { return n25q128_write_data(&keystore_ctx, offset, buf, len); } -int keystore_erase_subsector(uint32_t subsector_offset) +HAL_StatusTypeDef keystore_erase_subsector(uint32_t subsector_offset) { return n25q128_erase_subsector(&keystore_ctx, subsector_offset); } -int keystore_erase_sector(uint32_t sector_offset) +HAL_StatusTypeDef keystore_erase_sector(uint32_t sector_offset) { return n25q128_erase_sector(&keystore_ctx, sector_offset); } -int keystore_erase_bulk(void) +HAL_StatusTypeDef keystore_erase_bulk(void) { return n25q128_erase_bulk(&keystore_ctx); } - -/* - * Deprecated, will be removed when we fix libhal/ks_flash.c to use the - * new function. I love inter-dependent repos. - */ - -int keystore_erase_subsectors(uint32_t start, uint32_t stop) -{ - for (uint32_t i = start; i <= stop; ++i) { - if (keystore_erase_subsector(i) != 1) - return 0; - } - return 1; -} -- cgit v1.2.3