rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Fix a typo

Browse Source
This commit is contained in:
James Cotton 2011-07-15 15:30:10 -05:00
parent 72e80d407c
commit 01b62cf98f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flight/PiOS/Common/pios_flashfs_objlist.c
View File

@ -33,7 +33,7 @@
#include "uavobjectmanager.h" #include "uavobjectmanager.h"
// Private functions // Private functions
static int32_t PIOS_FLASHFS_CleabObjectTableHeader(); static int32_t PIOS_FLASHFS_ClearObjectTableHeader();
static int32_t PIOS_FLASHFS_GetObjAddress(uint32_t objId, uint16_t instId); static int32_t PIOS_FLASHFS_GetObjAddress(uint32_t objId, uint16_t instId);
static int32_t PIOS_FLASHFS_GetNewAddress(uint32_t objId, uint16_t instId); static int32_t PIOS_FLASHFS_GetNewAddress(uint32_t objId, uint16_t instId);
@ -73,16 +73,16 @@ int32_t PIOS_FLASHFS_Init()
// Check for valid object table or create one // Check for valid object table or create one
uint32_t object_table_magic; uint32_t object_table_magic;
uint8_t magic_fail_count = 0; uint8_t magic_fail_count = 0;
bool magic_good = 0; bool magic_good = false;
while(!magic_good) { while(!magic_good) {
if (PIOS_Flash_W25X_ReadData(0, (uint8_t *)&object_table_magic, sizeof(object_table_magic)) != 0) if (PIOS_Flash_W25X_ReadData(0, (uint8_t *)&object_table_magic, sizeof(object_table_magic)) != 0)
return -1; return -1;
if(object_table_magic != OBJECT_TABLE_MAGIC) { if(object_table_magic != OBJECT_TABLE_MAGIC) {
if(magic_fail_count++ > MAX_BADMAGIC) { if(magic_fail_count++ > MAX_BADMAGIC) {
if(PIOS_FLASHFS_CleabObjectTableHeader() < 0) magic_fail_count = 0;
return -1; PIOS_FLASHFS_ClearObjectTableHeader();
magic_good = true; PIOS_DELAY_WaituS(100);
} else { } else {
PIOS_DELAY_WaituS(100); PIOS_DELAY_WaituS(100);
} }
@ -119,7 +119,7 @@ int32_t PIOS_FLASHFS_Init()
* @brief Erase the headers for all objects in the flash chip * @brief Erase the headers for all objects in the flash chip
* @return 0 if successful, -1 if not * @return 0 if successful, -1 if not
*/ */
static int32_t PIOS_FLASHFS_CleabObjectTableHeader() static int32_t PIOS_FLASHFS_ClearObjectTableHeader()
{ {
if(PIOS_Flash_W25X_EraseSector(0) != 0) if(PIOS_Flash_W25X_EraseSector(0) != 0)
return -1; return -1;