Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_Linux: rpi: use const var and fix formatting 

Use a const variable instead of a define so we don't polute the
environment with a define specific to this function.

Also remove tabs and replace with proper coding style.
This commit is contained in:
Lucas De Marchi 2018-02-12 08:46:36 -08:00
parent 05ebabbf6b
commit 90160a9c52
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libraries/AP_HAL_Linux/Util_RPI.cpp
View File

@ -28,32 +28,31 @@ UtilRPI::UtilRPI()
_check_rpi_version(); _check_rpi_version();
} }
#define MAX_SIZE_LINE 50
int UtilRPI::_check_rpi_version() int UtilRPI::_check_rpi_version()
{ {
const unsigned int MAX_SIZE_LINE = 50;
char buffer[MAX_SIZE_LINE];
int hw; int hw;
char buffer[MAX_SIZE_LINE] = { 0 }; FILE *f = fopen("/sys/firmware/devicetree/base/model", "r");
FILE* f = fopen("/sys/firmware/devicetree/base/model", "r");
if (f != nullptr && fgets(buffer, MAX_SIZE_LINE, f) != nullptr) { if (f != nullptr && fgets(buffer, MAX_SIZE_LINE, f) != nullptr) {
int ret = sscanf(buffer+12, "%d", &_rpi_version); int ret = sscanf(buffer + 12, "%d", &_rpi_version);
fclose(f); fclose(f);
if (ret != EOF) { if (ret != EOF) {
// Preserving old behavior. if (_rpi_version > 2) {
if (_rpi_version > 2) { // Preserving old behavior.
_rpi_version = 2; _rpi_version = 2;
} } else if (_rpi_version == 0) {
// RPi 1 doesn't have a number there, so sscanf() won't have read anything. // RPi 1 doesn't have a number there, so sscanf() won't have read anything.
else if (_rpi_version == 0) { _rpi_version = 1;
_rpi_version = 1; }
}
printf("%s. (intern: %d)\n", buffer, _rpi_version); printf("%s. (intern: %d)\n", buffer, _rpi_version);
return _rpi_version; return _rpi_version;
} }
} }
// Attempting old method if the version couldn't be read with the new one. // Attempting old method if the version couldn't be read with the new one.
hw = Util::from(hal.util)->get_hw_arm32(); hw = Util::from(hal.util)->get_hw_arm32();