Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-12 02:48:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Param: fixed some build warnings

Browse Source
This commit is contained in:
Andrew Tridgell 2012-08-09 16:18:53 +10:00
parent d3c399c5d9
commit 73d70354a3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Common/AP_Param.cpp
View File

@ -71,9 +71,9 @@ void AP_Param::eeprom_write_check(const void *ptr, uint16_t ofs, uint8_t size)
{ {
const uint8_t *b = (const uint8_t *)ptr; const uint8_t *b = (const uint8_t *)ptr;
while (size--) { while (size--) {
uint8_t v = eeprom_read_byte((const uint8_t *)ofs); uint8_t v = eeprom_read_byte((const uint8_t *)(uintptr_t)ofs);
if (v != *b) { if (v != *b) {
eeprom_write_byte((uint8_t *)ofs, *b); eeprom_write_byte((uint8_t *)(uintptr_t)ofs, *b);
} }
b++; b++;
ofs++; ofs++;
@ -432,7 +432,7 @@ bool AP_Param::scan(const AP_Param::Param_header *target, uint16_t *pofs)
struct Param_header phdr; struct Param_header phdr;
uint16_t ofs = sizeof(AP_Param::EEPROM_header); uint16_t ofs = sizeof(AP_Param::EEPROM_header);
while (ofs < _eeprom_size) { while (ofs < _eeprom_size) {
eeprom_read_block(&phdr, (void *)ofs, sizeof(phdr)); eeprom_read_block(&phdr, (void *)(uintptr_t)ofs, sizeof(phdr));
if (phdr.type == target->type && if (phdr.type == target->type &&
phdr.key == target->key && phdr.key == target->key &&
phdr.group_element == target->group_element) { phdr.group_element == target->group_element) {
@ -775,7 +775,7 @@ bool AP_Param::load_all(void)
uint16_t ofs = sizeof(AP_Param::EEPROM_header); uint16_t ofs = sizeof(AP_Param::EEPROM_header);
while (ofs < _eeprom_size) { while (ofs < _eeprom_size) {
eeprom_read_block(&phdr, (void *)ofs, sizeof(phdr)); eeprom_read_block(&phdr, (void *)(uintptr_t)ofs, sizeof(phdr));
// note that this is an || not an && for robustness // note that this is an || not an && for robustness
// against power off while adding a variable // against power off while adding a variable
if (phdr.type == _sentinal_type || if (phdr.type == _sentinal_type ||

2
libraries/AP_Common/AP_Param.h
View File

@ -221,7 +221,7 @@ private:
static const uint8_t _group_bits = 18; static const uint8_t _group_bits = 18;
static const uint8_t _sentinal_key = 0xFF; static const uint8_t _sentinal_key = 0xFF;
static const uint8_t _sentinal_type = 0xFF; static const uint8_t _sentinal_type = 0x3F;
static const uint8_t _sentinal_group = 0xFF; static const uint8_t _sentinal_group = 0xFF;
static bool check_group_info(const struct GroupInfo *group_info, uint16_t *total_size, uint8_t max_bits); static bool check_group_info(const struct GroupInfo *group_info, uint16_t *total_size, uint8_t max_bits);