diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-01 11:43:35 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-01 11:43:35 +0200 |
| commit | 76e47c3135631d5d4a45d9e1246659a9cc3e44ec (patch) | |
| tree | a5eacba5ef03a51347cb6b2a736b106a28dd7b6b /src/modules/dataman/dataman.h | |
| parent | bfb2b8f8a0dc8749af6dc2f8256aab7973f24424 (diff) | |
| parent | c904f875d9ecee0d0efcb0ea198a460702826062 (diff) | |
| download | px4-firmware-76e47c3135631d5d4a45d9e1246659a9cc3e44ec.tar.gz px4-firmware-76e47c3135631d5d4a45d9e1246659a9cc3e44ec.tar.bz2 px4-firmware-76e47c3135631d5d4a45d9e1246659a9cc3e44ec.zip | |
Merge remote-tracking branch 'upstream/master' into mtecs
Diffstat (limited to 'src/modules/dataman/dataman.h')
| -rw-r--r-- | src/modules/dataman/dataman.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/dataman/dataman.h b/src/modules/dataman/dataman.h index 33c9fcd15..4382baeb5 100644 --- a/src/modules/dataman/dataman.h +++ b/src/modules/dataman/dataman.h @@ -75,7 +75,8 @@ extern "C" { /* The reason for the last reset */ typedef enum { DM_INIT_REASON_POWER_ON = 0, /* Data survives resets */ - DM_INIT_REASON_IN_FLIGHT /* Data survives in-flight resets only */ + DM_INIT_REASON_IN_FLIGHT, /* Data survives in-flight resets only */ + DM_INIT_REASON_VOLATILE /* Data does not survive reset */ } dm_reset_reason; /* Maximum size in bytes of a single item instance */ @@ -100,7 +101,7 @@ extern "C" { size_t buflen /* Length in bytes of data to retrieve */ ); - /* Retrieve from the data manager store */ + /* Erase all items of this type */ __EXPORT int dm_clear( dm_item_t item /* The item type to clear */ |