aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_BoardConfig: start mtd driver

Browse Source
This commit is contained in:
Lucas De Marchi 2017-02-22 11:40:03 -08:00 committed by Andrew Tridgell
parent da68612f4b
commit 2349909033
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/AP_HAL_PX4/Storage.cpp
View File

@ -11,6 +11,8 @@
#include <ctype.h>
#include <nuttx/progmem.h>
#include <AP_BoardConfig/AP_BoardConfig.h>
#include "Storage.h"
using namespace PX4;
@ -27,6 +29,8 @@ using namespace PX4;
extern const AP_HAL::HAL& hal;
extern "C" int mtd_main(int, char **);
PX4Storage::PX4Storage(void) :
_perf_storage(perf_alloc(PC_ELAPSED, "APM_storage")),
_perf_errors(perf_alloc(PC_COUNT, "APM_storage_errors"))
@ -193,6 +197,17 @@ void PX4Storage::_mtd_write(uint16_t line)
*/
void PX4Storage::_mtd_load(void)
{
if (AP_BoardConfig::px4_start_driver(mtd_main, "mtd", "start " MTD_PARAMS_FILE)) {
printf("mtd: started OK\n");
if (AP_BoardConfig::px4_start_driver(mtd_main, "mtd", "readtest " MTD_PARAMS_FILE)) {
printf("mtd: readtest OK\n");
} else {
AP_BoardConfig::px4_sensor_error("mtd: failed readtest");
}
} else {
AP_BoardConfig::px4_sensor_error("mtd: failed start");
}
int fd = open(MTD_PARAMS_FILE, O_RDONLY);
if (fd == -1) {
AP_HAL::panic("Failed to open " MTD_PARAMS_FILE);

18
mk/PX4/ROMFS/init.d/rc.APM
View File

@ -82,24 +82,6 @@ then
mkblctrl -mkmode x -d /dev/pwm_output
fi
if mtd start /fs/mtd
then
echo "started mtd driver OK"
else
echo "failed to start mtd driver"
echo "failed to start mtd driver" >> $logfile
sh /etc/init.d/rc.error
fi
if mtd readtest /fs/mtd
then
echo "mtd readtest OK"
else
echo "failed to read mtd"
echo "failed to read mtd" >> $logfile
sh /etc/init.d/rc.error
fi
echo Starting ArduPilot
if ArduPilot start
then