From a86974e3e31c5956e77cd9dc4794e0ad44c3dc61 Mon Sep 17 00:00:00 2001 From: px4dev Date: Sat, 18 Aug 2012 22:06:48 -0700 Subject: [PATCH] Hand over control of the onboard EEPROM to the NuttX I2C EEPROM driver and NXFFS. --- apps/systemcmds/eeprom/Makefile | 42 +++++++++++ apps/systemcmds/eeprom/eeprom.c | 111 +++++++++++++++++++++++++++++ nuttx/configs/px4fmu/nsh/appconfig | 1 + nuttx/configs/px4fmu/nsh/defconfig | 13 +++- 4 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 apps/systemcmds/eeprom/Makefile create mode 100644 apps/systemcmds/eeprom/eeprom.c diff --git a/apps/systemcmds/eeprom/Makefile b/apps/systemcmds/eeprom/Makefile new file mode 100644 index 0000000000..63f28c349f --- /dev/null +++ b/apps/systemcmds/eeprom/Makefile @@ -0,0 +1,42 @@ +############################################################################ +# +# Copyright (C) 2012 PX4 Development Team. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name PX4 nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +# +# Build the eeprom tool. +# + +APPNAME = eeprom +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 + +include $(APPDIR)/mk/app.mk diff --git a/apps/systemcmds/eeprom/eeprom.c b/apps/systemcmds/eeprom/eeprom.c new file mode 100644 index 0000000000..fd99cc9a3d --- /dev/null +++ b/apps/systemcmds/eeprom/eeprom.c @@ -0,0 +1,111 @@ +/**************************************************************************** + * + * Copyright (C) 2012 PX4 Development Team. All rights reserved. + * Author: Lorenz Meier + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name PX4 nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/** + * @file eeprom.c + * + * EEPROM service and utility app. + */ + +#include + +#include +#include +#include + +#include + +#include +#include +#include + +#include + +#include "systemlib/systemlib.h" +#include "systemlib/err.h" + +#ifndef PX4_I2C_BUS_ONBOARD +# error PX4_I2C_BUS_ONBOARD not defined, cannot locate onboard EEPROM +#endif +#if !defined(CONFIG_MTD_AT24XX) || !CONFIG_MTD_AT24XX +# error CONFIG_MTD_AT24XX not defined, no supported EEPROM available +#endif + +__EXPORT int eeprom_main(int argc, char *argv[]); + +static void eeprom_start(void); + + +int eeprom_main(int argc, char *argv[]) +{ + if (argc >= 2) { + if (!strcmp(argv[1], "start")) + eeprom_start(); + } + + errx(1, "expected a command, try 'start'"); +} + + +static void +eeprom_start(void) +{ + static bool started = false; + int ret; + + if (started) + errx(1, "EEPROM service already started"); + + /* find the right I2C */ + struct i2c_s *i2c = up_i2cinitialize(PX4_I2C_BUS_ONBOARD); + if (i2c == NULL) + errx(1, "failed to locate I2C bus"); + + /* start the MTD driver */ + struct mtd_dev_s *mtd = at24c_initialize(i2c); + if (mtd == NULL) + errx(1, "failed to initialize EEPROM driver"); + + /* start NXFFS */ + ret = nxffs_initialize(mtd); + if (ret < 0) + err(1, "failed to initialize NXFFS"); + + /* mount the EEPROM */ + ret = mount(NULL, "/eeprom", "nxffs", 0, NULL); + if (ret < 0) + err(1, "failed to mount EEPROM"); + + errx(0, "mounted EEPROM at /eeprom"); +} diff --git a/nuttx/configs/px4fmu/nsh/appconfig b/nuttx/configs/px4fmu/nsh/appconfig index 4f0c5093f5..ddc607c439 100644 --- a/nuttx/configs/px4fmu/nsh/appconfig +++ b/nuttx/configs/px4fmu/nsh/appconfig @@ -50,6 +50,7 @@ CONFIGURED_APPS += systemcmds/perf CONFIGURED_APPS += systemcmds/top CONFIGURED_APPS += systemcmds/boardinfo CONFIGURED_APPS += systemcmds/mixer +CONFIGURED_APPS += systemcmds/eeprom #CONFIGURED_APPS += systemcmds/calibration # Tutorial code from diff --git a/nuttx/configs/px4fmu/nsh/defconfig b/nuttx/configs/px4fmu/nsh/defconfig index a87ce7ffac..283edf7dde 100755 --- a/nuttx/configs/px4fmu/nsh/defconfig +++ b/nuttx/configs/px4fmu/nsh/defconfig @@ -246,6 +246,14 @@ CONFIG_STM32_I2CTIMEOUS_PER_BYTE=200 CONFIG_STM32_I2CTIMEOUS_START_STOP=700 CONFIG_DEBUG_I2C=n +# +# Enable the MTD driver for the onboard I2C EEPROM +# +CONFIG_MTD_AT24XX=y +CONFIG_AT24XX_ADDR=0x50 +CONFIG_AT24XX_SIZE=128 +CONFIG_AT24XX_MTD_BLOCKSIZE=256 + # # STM32F40xxx specific serial device driver settings # @@ -699,7 +707,10 @@ CONFIG_FS_FAT=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FAT_MAXFNAME=32 -CONFIG_FS_NXFFS=n +CONFIG_FS_NXFFS=y +CONFIG_NXFFS_MAXNAMLEN=32 +CONFIG_NXFFS_TAILTHRESHOLD=2048 +CONFIG_NXFFS_PREALLOCATED=y CONFIG_FS_ROMFS=y #