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

pios_flashfs_logfs: moved modified ARENA and SLOT enums to an F3 branch

Browse Source 
also added a detailed comment
This commit is contained in:
lilvinz 2012-12-13 13:54:08 +01:00 committed by Alessio Morale
parent b242f8b88c
commit d611207789
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
flight/PiOS/Common/pios_flashfs_logfs.c
View File

@ -79,10 +79,26 @@ static uintptr_t logfs_get_addr(uint8_t arena_id, uint16_t slot_id)
* of earlier ones in NOR flash without an erase cycle. * of earlier ones in NOR flash without an erase cycle.
*/ */
enum arena_state { enum arena_state {
#ifdef STM32F30X
/*
* The STM32F30X flash subsystem is only capable of
* writing words or halfwords. In this case we use halfwords.
* In addition to that it is only capable to write to erased
* cells (0xffff) or write a cell from anything to (0x0000).
* To cope with this, the F3 gets different enum values.
* For this to work the underlying flash driver has to
* check each halfword if it has changed before writing.
*/
ARENA_STATE_ERASED = 0xFFFFFFFF, ARENA_STATE_ERASED = 0xFFFFFFFF,
ARENA_STATE_RESERVED = 0x5555FFFF, ARENA_STATE_RESERVED = 0xE6E6FFFF,
ARENA_STATE_ACTIVE = 0x0000FFFF, ARENA_STATE_ACTIVE = 0xE6E66666,
ARENA_STATE_OBSOLETE = 0x00000000, ARENA_STATE_OBSOLETE = 0x00000000,
#else
ARENA_STATE_ERASED = 0xEEEEEEEE,
ARENA_STATE_RESERVED = 0xE6E6E6E6,
ARENA_STATE_ACTIVE = 0x66666666,
ARENA_STATE_OBSOLETE = 0x44444444,
#endif
}; };
struct arena_header { struct arena_header {
@ -304,10 +320,26 @@ static int32_t logfs_find_active_arena()
* of earlier ones in NOR flash without an erase cycle. * of earlier ones in NOR flash without an erase cycle.
*/ */
enum slot_state { enum slot_state {
#ifdef STM32F30X
/*
* The STM32F30X flash subsystem is only capable of
* writing words or halfwords. In this case we use halfwords.
* In addition to that it is only capable to write to erased
* cells (0xffff) or write a cell from anything to (0x0000).
* To cope with this, the F3 gets different enum values.
* For this to work the underlying flash driver has to
* check each halfword if it has changed before writing.
*/
SLOT_STATE_EMPTY = 0xFFFFFFFF, SLOT_STATE_EMPTY = 0xFFFFFFFF,
SLOT_STATE_RESERVED = 0xAAAAFFFF, SLOT_STATE_RESERVED = 0xFAFAFFFF,
SLOT_STATE_ACTIVE = 0x0000FFFF, SLOT_STATE_ACTIVE = 0xFAFAAAAA,
SLOT_STATE_OBSOLETE = 0x00000000, SLOT_STATE_OBSOLETE = 0x00000000,
#else
SLOT_STATE_EMPTY = 0xFFFFFFFF,
SLOT_STATE_RESERVED = 0xFAFAFAFA,
SLOT_STATE_ACTIVE = 0xAAAAAAAA,
SLOT_STATE_OBSOLETE = 0x88888888,
#endif
}; };
struct slot_header { struct slot_header {