From ca0910370f9e64fa70d5d15a8b5105d24d62fc47 Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Fri, 29 Mar 2013 11:26:56 +0200 Subject: [PATCH] OP-881: flashfs: coding style fixes according to OPReview-423 +review OPReview-423 --- flight/PiOS/Common/pios_flash_jedec.c | 20 +++++++++---------- .../targets/CopterControl/System/pios_board.c | 16 +++++++++++---- flight/targets/RevoMini/System/pios_board.c | 7 ++++--- flight/targets/Revolution/System/pios_board.c | 12 ++++++++--- 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/flight/PiOS/Common/pios_flash_jedec.c b/flight/PiOS/Common/pios_flash_jedec.c index 864560dfa..06731f383 100644 --- a/flight/PiOS/Common/pios_flash_jedec.c +++ b/flight/PiOS/Common/pios_flash_jedec.c @@ -119,30 +119,28 @@ static int32_t PIOS_Flash_Jedec_Validate(struct jedec_flash_dev * flash_dev) { int32_t PIOS_Flash_Jedec_Init(uintptr_t * flash_id, uint32_t spi_id, uint32_t slave_num) { struct jedec_flash_dev * flash_dev = PIOS_Flash_Jedec_alloc(); - if (flash_dev == NULL) + if (!flash_dev) { return -1; + } flash_dev->spi_id = spi_id; flash_dev->slave_num = slave_num; flash_dev->cfg = NULL; (void) PIOS_Flash_Jedec_ReadID(flash_dev); - uint32_t i = 0; - while ((i < pios_flash_jedec_catalog_size) && !flash_dev->cfg) - { + + for (uint32_t i = 0; i < pios_flash_jedec_catalog_size; ++i) { const struct pios_flash_jedec_cfg flash_jedec_entry = pios_flash_jedec_catalog[i]; - if ((flash_dev->manufacturer == flash_jedec_entry.expect_manufacturer) && - (flash_dev->memorytype == flash_jedec_entry.expect_memorytype) && - (flash_dev->capacity == flash_jedec_entry.expect_capacity)) - { + if ((flash_dev->manufacturer == flash_jedec_entry.expect_manufacturer) + && (flash_dev->memorytype == flash_jedec_entry.expect_memorytype) + && (flash_dev->capacity == flash_jedec_entry.expect_capacity)) { flash_dev->cfg = &pios_flash_jedec_catalog[i]; + break; } - i++; } - if(!flash_dev->cfg) - { + if (!flash_dev->cfg) { return -1; } diff --git a/flight/targets/CopterControl/System/pios_board.c b/flight/targets/CopterControl/System/pios_board.c index c7ae0e494..86ee24309 100644 --- a/flight/targets/CopterControl/System/pios_board.c +++ b/flight/targets/CopterControl/System/pios_board.c @@ -169,12 +169,20 @@ void PIOS_Board_Init(void) { uintptr_t fs_id; switch(bdinfo->board_rev) { case BOARD_REVISION_CC: - PIOS_Flash_Jedec_Init(&flash_id, pios_spi_flash_accel_id, 1); - PIOS_FLASHFS_Logfs_Init(&fs_id, &flashfs_w25x_cfg, &pios_jedec_flash_driver, flash_id); + if (PIOS_Flash_Jedec_Init(&flash_id, pios_spi_flash_accel_id, 1)) { + PIOS_DEBUG_Assert(0); + } + if (PIOS_FLASHFS_Logfs_Init(&fs_id, &flashfs_w25x_cfg, &pios_jedec_flash_driver, flash_id)) { + PIOS_DEBUG_Assert(0); + } break; case BOARD_REVISION_CC3D: - PIOS_Flash_Jedec_Init(&flash_id, pios_spi_flash_accel_id, 0); - PIOS_FLASHFS_Logfs_Init(&fs_id, &flashfs_m25p_cfg, &pios_jedec_flash_driver, flash_id); + if (PIOS_Flash_Jedec_Init(&flash_id, pios_spi_flash_accel_id, 0)) { + PIOS_DEBUG_Assert(0); + } + if (PIOS_FLASHFS_Logfs_Init(&fs_id, &flashfs_m25p_cfg, &pios_jedec_flash_driver, flash_id)) { + PIOS_DEBUG_Assert(0); + } break; default: PIOS_DEBUG_Assert(0); diff --git a/flight/targets/RevoMini/System/pios_board.c b/flight/targets/RevoMini/System/pios_board.c index c15b459b6..43a8813f0 100644 --- a/flight/targets/RevoMini/System/pios_board.c +++ b/flight/targets/RevoMini/System/pios_board.c @@ -336,13 +336,14 @@ void PIOS_Board_Init(void) { #if defined(PIOS_INCLUDE_FLASH) /* Connect flash to the appropriate interface and configure it */ uintptr_t flash_id; - if (PIOS_Flash_Jedec_Init(&flash_id, pios_spi_telem_flash_id, 1)) + if (PIOS_Flash_Jedec_Init(&flash_id, pios_spi_telem_flash_id, 1)) { PIOS_DEBUG_Assert(0); + } uintptr_t fs_id; - - if (PIOS_FLASHFS_Logfs_Init(&fs_id, &flashfs_m25p_cfg, &pios_jedec_flash_driver, flash_id)) + if (PIOS_FLASHFS_Logfs_Init(&fs_id, &flashfs_m25p_cfg, &pios_jedec_flash_driver, flash_id)) { PIOS_DEBUG_Assert(0); + } #endif diff --git a/flight/targets/Revolution/System/pios_board.c b/flight/targets/Revolution/System/pios_board.c index 3d1bae3c2..f68118801 100644 --- a/flight/targets/Revolution/System/pios_board.c +++ b/flight/targets/Revolution/System/pios_board.c @@ -386,14 +386,20 @@ void PIOS_Board_Init(void) { } /* Connect flash to the appropriate interface and configure it */ uintptr_t flash_id; - PIOS_Flash_Jedec_Init(&flash_id, pios_spi_flash_id, 0); + if (PIOS_Flash_Jedec_Init(&flash_id, pios_spi_flash_id, 0)) { + PIOS_DEBUG_Assert(0); + } #else /* Connect flash to the appropriate interface and configure it */ uintptr_t flash_id; - PIOS_Flash_Jedec_Init(&flash_id, pios_spi_accel_id, 1); + if (PIOS_Flash_Jedec_Init(&flash_id, pios_spi_accel_id, 1)) { + PIOS_DEBUG_Assert(0); + } #endif uintptr_t fs_id; - PIOS_FLASHFS_Logfs_Init(&fs_id, &flashfs_m25p_cfg, &pios_jedec_flash_driver, flash_id); + if (PIOS_FLASHFS_Logfs_Init(&fs_id, &flashfs_m25p_cfg, &pios_jedec_flash_driver, flash_id)) { + PIOS_DEBUG_Assert(0); + } /* Initialize UAVObject libraries */ EventDispatcherInitialize();