dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

param style fix

This commit is contained in:
Lorenz Meier 2015-06-03 22:51:02 +02:00
parent 03bdf1e5f2
commit 3dbd48fbad
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/modules/systemlib/param/param.c
View File

@ -120,7 +120,7 @@ get_param_info_count(void)
* API by returning PARAM_INVALID * API by returning PARAM_INVALID
*/ */
if (param_changed_storage == NULL) { if (param_changed_storage == NULL) {
return 0; return 0;
} }
} }
@ -173,7 +173,7 @@ param_assert_locked(void)
static bool static bool
handle_in_range(param_t param) handle_in_range(param_t param)
{ {
int count = get_param_info_count(); int count = get_param_info_count();
return (count && param < count); return (count && param < count);
} }
@ -254,19 +254,19 @@ param_find_internal(const char *name, bool notification)
{ {
param_t param; param_t param;
/* perform a linear search of the known parameters */ /* perform a linear search of the known parameters */
for (param = 0; handle_in_range(param); param++) { for (param = 0; handle_in_range(param); param++) {
if (!strcmp(param_info_base[param].name, name)) { if (!strcmp(param_info_base[param].name, name)) {
if (notification) { if (notification) {
param_set_used_internal(param); param_set_used_internal(param);
} }
return param; return param;
} }
} }
/* not found */ /* not found */
return PARAM_INVALID; return PARAM_INVALID;
} }
@ -291,37 +291,41 @@ param_count(void)
unsigned unsigned
param_count_used(void) param_count_used(void)
{ {
unsigned count = 0; unsigned count = 0;
// ensure the allocation has been done // ensure the allocation has been done
if (get_param_info_count()) { if (get_param_info_count()) {
for (unsigned i = 0; i < size_param_changed_storage_bytes; i++) { for (unsigned i = 0; i < size_param_changed_storage_bytes; i++) {
for (unsigned j = 0; j < bits_per_allocation_unit; j++) { for (unsigned j = 0; j < bits_per_allocation_unit; j++) {
if (param_changed_storage[i] & (1 << j)) { if (param_changed_storage[i] & (1 << j)) {
count++; count++;
} }
} }
} }
} }
return count;
return count;
} }
param_t param_t
param_for_index(unsigned index) param_for_index(unsigned index)
{ {
unsigned count = get_param_info_count(); unsigned count = get_param_info_count();
if (count && index < count) { if (count && index < count) {
return (param_t)index; return (param_t)index;
} }
return PARAM_INVALID; return PARAM_INVALID;
} }
param_t param_t
param_for_used_index(unsigned index) param_for_used_index(unsigned index)
{ {
int count = get_param_info_count(); int count = get_param_info_count();
if (count && index < count) {
if (count && index < count) {
/* walk all params and count */ /* walk all params and count */
for (unsigned i = 0; i < (unsigned)size_param_changed_storage_bytes; i++) { for (unsigned i = 0; i < (unsigned)size_param_changed_storage_bytes; i++) {