diff options
author | px4dev <px4@purgatory.org> | 2012-08-27 19:42:40 -0700 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2012-08-27 19:42:40 -0700 |
commit | e6f6a81d5bc6403e5207a7bf1f3c6a1eba6c7fe3 (patch) | |
tree | d5c2e33d20fd565099b4780aa4e498a2a26373fb /apps/systemcmds | |
parent | 36a8b00ab13e3185c1f968735fe028dc8626b642 (diff) | |
download | px4-firmware-e6f6a81d5bc6403e5207a7bf1f3c6a1eba6c7fe3.tar.gz px4-firmware-e6f6a81d5bc6403e5207a7bf1f3c6a1eba6c7fe3.tar.bz2 px4-firmware-e6f6a81d5bc6403e5207a7bf1f3c6a1eba6c7fe3.zip |
Allow the EEPROM driver to consider itself started even if NXFFS fails to mount.
Diffstat (limited to 'apps/systemcmds')
-rw-r--r-- | apps/systemcmds/eeprom/24xxxx_mtd.c | 3 | ||||
-rw-r--r-- | apps/systemcmds/eeprom/eeprom.c | 13 |
2 files changed, 7 insertions, 9 deletions
diff --git a/apps/systemcmds/eeprom/24xxxx_mtd.c b/apps/systemcmds/eeprom/24xxxx_mtd.c index 5424094a6..b5144512b 100644 --- a/apps/systemcmds/eeprom/24xxxx_mtd.c +++ b/apps/systemcmds/eeprom/24xxxx_mtd.c @@ -151,8 +151,6 @@ static ssize_t at24c_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks, FAR uint8_t *buf); static ssize_t at24c_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks, FAR const uint8_t *buf); -static ssize_t at24c_read(FAR struct mtd_dev_s *dev, off_t offset, - size_t nbytes,FAR uint8_t *buffer); static int at24c_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg); /************************************************************************************ @@ -172,7 +170,6 @@ static struct at24c_dev_s g_at24c; static int at24c_eraseall(FAR struct at24c_dev_s *priv) { int startblock = 0; - int ret = OK; uint8_t buf[AT24XX_PAGESIZE + 2]; struct i2c_msg_s msgv[1] = diff --git a/apps/systemcmds/eeprom/eeprom.c b/apps/systemcmds/eeprom/eeprom.c index ed727cd33..4a641dd0a 100644 --- a/apps/systemcmds/eeprom/eeprom.c +++ b/apps/systemcmds/eeprom/eeprom.c @@ -126,20 +126,21 @@ eeprom_start(void) if (mtd == NULL) errx(1, "failed to initialize EEPROM driver"); + /* driver is started, even if NXFFS fails to mount */ + started = true; + /* start NXFFS */ ret = nxffs_initialize(mtd); if (ret < 0) - err(1, "failed to initialize NXFFS"); - + errx(1, "failed to initialize NXFFS - erase EEPROM to reformat"); + /* mount the EEPROM */ ret = mount(NULL, "/eeprom", "nxffs", 0, NULL); if (ret < 0) - err(1, "failed to mount EEPROM"); - - started = true; - + errx(1, "failed to mount /eeprom - erase EEPROM to reformat"); + errx(0, "mounted EEPROM at /eeprom"); } |