diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-12 09:58:55 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-12 09:58:55 +0200 |
| commit | 01a54390e9ac1daa3af8c51ae3c35e39bf99cec6 (patch) | |
| tree | 5bdb086ac86053baa69e9bb97f0472727d3e1e6d /src/modules/dataman/dataman.h | |
| parent | d1bd4b0a45ec0f6f081560fbadf675e21ce53d83 (diff) | |
| parent | 3f4c264050774e79add989cb85a80623038478c0 (diff) | |
| download | px4-firmware-01a54390e9ac1daa3af8c51ae3c35e39bf99cec6.tar.gz px4-firmware-01a54390e9ac1daa3af8c51ae3c35e39bf99cec6.tar.bz2 px4-firmware-01a54390e9ac1daa3af8c51ae3c35e39bf99cec6.zip | |
Merge remote-tracking branch 'upstream/master' into qu4d
Diffstat (limited to 'src/modules/dataman/dataman.h')
| -rw-r--r-- | src/modules/dataman/dataman.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/modules/dataman/dataman.h b/src/modules/dataman/dataman.h index a70638ccc..4382baeb5 100644 --- a/src/modules/dataman/dataman.h +++ b/src/modules/dataman/dataman.h @@ -75,11 +75,12 @@ 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 */ - #define DM_MAX_DATA_SIZE 126 + #define DM_MAX_DATA_SIZE 124 /* Retrieve from the data manager store */ __EXPORT ssize_t @@ -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 */ |