rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-06 21:54:15 +01:00
Code Issues Releases Activity

OP-881 fixed for stile compliance, added test and assertions on flash init for revolution and CC targets

Browse Source 
+review OPReview-423
This commit is contained in:
Alessio Morale 2013-03-29 00:30:28 +01:00
parent e68aeb0c8e
commit 46e9e60e76
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flight/PiOS/Common/pios_flash_jedec.c
View File

@ -124,11 +124,11 @@ int32_t PIOS_Flash_Jedec_Init(uintptr_t * flash_id, uint32_t spi_id, uint32_t sl
flash_dev->spi_id = spi_id; flash_dev->spi_id = spi_id;
flash_dev->slave_num = slave_num; flash_dev->slave_num = slave_num;
flash_dev->cfg = 0; flash_dev->cfg = NULL;
(void) PIOS_Flash_Jedec_ReadID(flash_dev); (void) PIOS_Flash_Jedec_ReadID(flash_dev);
uint32_t i = 0; uint32_t i = 0;
while(i < pios_flash_jedec_catalog_size) while ((i < pios_flash_jedec_catalog_size) && !flash_dev->cfg)
{ {
const struct pios_flash_jedec_cfg flash_jedec_entry = pios_flash_jedec_catalog[i]; const struct pios_flash_jedec_cfg flash_jedec_entry = pios_flash_jedec_catalog[i];
@ -141,8 +141,10 @@ int32_t PIOS_Flash_Jedec_Init(uintptr_t * flash_id, uint32_t spi_id, uint32_t sl
i++; i++;
} }
if(flash_dev->cfg == 0) if(!flash_dev->cfg)
{
return -1; return -1;
}
/* Give back a handle to this flash device */ /* Give back a handle to this flash device */
*flash_id = (uintptr_t) flash_dev; *flash_id = (uintptr_t) flash_dev;