diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2015-03-31 11:25:52 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2015-03-31 11:25:52 -0600 |
commit | 1650cb9619fc3dd23099fceaf8c41424788cd7a6 (patch) | |
tree | 0bd157c8e2bffc9676ffa863b196d9174b629688 /nuttx/configs | |
parent | e370b8f46c0a4b28c3ebf5fddca2c256a85227cc (diff) | |
download | px4-nuttx-1650cb9619fc3dd23099fceaf8c41424788cd7a6.tar.gz px4-nuttx-1650cb9619fc3dd23099fceaf8c41424788cd7a6.tar.bz2 px4-nuttx-1650cb9619fc3dd23099fceaf8c41424788cd7a6.zip |
boardctl(): Add a new non-standard OS interface. This is similar to a driver IOCTL call. But this is an IOCTL call directly on the board logic. This function will eventually replace all of the ad hoc OS interfaces that are current used to perform application specific intialiation and application driver test confifuration. It essentially formalizes and institutionalizes these rogue interface in to at least a single crazy call.
Diffstat (limited to 'nuttx/configs')
-rw-r--r-- | nuttx/configs/.gitignore | 10 | ||||
-rw-r--r-- | nuttx/configs/Makefile | 87 | ||||
-rwxr-xr-x | nuttx/configs/boardctl.c | 138 |
3 files changed, 235 insertions, 0 deletions
diff --git a/nuttx/configs/.gitignore b/nuttx/configs/.gitignore new file mode 100644 index 000000000..4b32ec6a3 --- /dev/null +++ b/nuttx/configs/.gitignore @@ -0,0 +1,10 @@ +/Make.dep +/.depend +/*.asm +/*.obj +/*.rel +/*.lst +/*.sym +/*.adb +/*.lib +/*.src diff --git a/nuttx/configs/Makefile b/nuttx/configs/Makefile new file mode 100644 index 000000000..4e96cc8df --- /dev/null +++ b/nuttx/configs/Makefile @@ -0,0 +1,87 @@ +############################################################################ +# configs/Makefile +# +# Copyright (C) 2015 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> +# +# 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 NuttX 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. +# +############################################################################ + +-include $(TOPDIR)/Make.defs + +# Basic + +CONFIG_ASRCS = +CONFIG_CSRCS = + +# boardctl support + +ifeq ($(CONFIG_LIB_BOARDCTL),y) +CONFIG_CSRCS += boardctl.c +endif + +ASRCS = $(CONFIG_ASRCS) +AOBJS = $(ASRCS:.S=$(OBJEXT)) + +CSRCS = $(CONFIG_CSRCS) +COBJS = $(CSRCS:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) + +BIN = libconfigs$(LIBEXT) + +all: $(BIN) + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +$(BIN): $(OBJS) + $(call ARCHIVE, $@, $(OBJS)) + +.depend: Makefile $(SRCS) +ifneq ($(SRCS),) + $(Q) $(MKDEP) --dep-path . "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep +endif + $(Q) touch $@ + +depend: .depend + +clean: + $(call DELFILE, $(BIN)) + $(call CLEAN) + +distclean: clean + $(call DELFILE, Make.dep) + $(call DELFILE, .depend) + +-include Make.dep
\ No newline at end of file diff --git a/nuttx/configs/boardctl.c b/nuttx/configs/boardctl.c new file mode 100755 index 000000000..a41c1d2e6 --- /dev/null +++ b/nuttx/configs/boardctl.c @@ -0,0 +1,138 @@ +/**************************************************************************** + * configs/boardctl.c + * + * Copyright (C) 2015 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> + * + * 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 NuttX 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <sys/types.h> +#include <sys/boardctl.h> +#include <stdint.h> +#include <errno.h> + +#include <nuttx/board.h> + +#ifdef CONFIG_LIB_BOARDCTL + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: boardctl + * + * Description: + * In a small embedded system, there will typically be a much greater + * interaction between application and low-level board features. The + * canonically correct to implement such interactions is by implementing a + * character driver and performing the interactions via low level ioctl + * calls. This, however, may not be practical in many cases and will lead + * to "correct" but awkward implementations. + * + * boardctl() is non-standard OS interface to alleviate the problem. It + * basically circumvents the normal device driver ioctl interlace and allows + * the application to perform direction IOCTL-like calls to the board-specific + * logic. In it is especially useful for setting up board operational and + * test configurations. + * + * Input Parameters: + * cmd - Identifies the board command to be executed + * arg - The argument that accompanies the command. The nature of the + * argument is determined by the specific command. + * + * Returned Value: + * On success zero (OK) is returned; -1 (ERROR) is returned on failure + * with the errno variable to to indicate the nature of the failure. + * + ****************************************************************************/ + +int boardctl(unsigned int cmd, uintptr_t arg) +{ + int ret; + + switch (cmd) + { + /* CMD: BOARDIOC_INIT + * DESCRIPTION: Perform one-time application initialization. + * ARG: None + * CONFIGURATION: CONFIG_LIB_BOARDCTL + * DEPENDENCIES: Board logic must provide board_app_initialization + */ + + case BOARDIOC_INIT: + ret = board_app_initialize(); + break; + +#ifdef CONFIG_BOARDCTL_TSCTEST + /* CMD: BOARDIOC_TSCTEST + * DESCRIPTION: Touchscreen controller test configuration + * ARG: 0: Setup touchscreen test, 1: Teardown touchscreen test + * CONFIGURATION: CONFIG_LIB_BOARDCTL && + * DEPENDENCIES: Board logic must provide board_tsc_setup() and + * board_tsc_teardown(). + */ + + case BOARDIOC_TSCTEST: + if (arg) + { + ret = board_tsc_setup(); + } + else + { + ret = board_tsc_teardown(); + } + + break; +#endif + + default: + ret = -ENOTTY; + break; + } + + /* Set the errno value on any errors */ + + if (ret < 0) + { + set_errno(-ret); + return ERROR; + } + + return OK; +} + +#endif /* CONFIG_LIB_BOARDCTL */ |