summaryrefslogtreecommitdiff
path: root/apps/vsn/sdcard
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-10-03 23:36:54 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-10-03 23:36:54 +0000
commita82d39f9a9a5e47ea25532c55a09fd481649a5b7 (patch)
treef0f5a2269133af96922976d7d733857228a0d91d /apps/vsn/sdcard
parent948e492aab34e89e3e372066be17eb6a0fbd7ea2 (diff)
downloadpx4-nuttx-a82d39f9a9a5e47ea25532c55a09fd481649a5b7.tar.gz
px4-nuttx-a82d39f9a9a5e47ea25532c55a09fd481649a5b7.tar.bz2
px4-nuttx-a82d39f9a9a5e47ea25532c55a09fd481649a5b7.zip
Delete the apps/vsn directory (moved commands to apps/system)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5208 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/vsn/sdcard')
-rw-r--r--apps/vsn/sdcard/Kconfig14
-rw-r--r--apps/vsn/sdcard/Makefile114
-rw-r--r--apps/vsn/sdcard/README.txt7
-rw-r--r--apps/vsn/sdcard/sdcard.c134
4 files changed, 0 insertions, 269 deletions
diff --git a/apps/vsn/sdcard/Kconfig b/apps/vsn/sdcard/Kconfig
deleted file mode 100644
index 8e6c13264..000000000
--- a/apps/vsn/sdcard/Kconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see misc/tools/kconfig-language.txt.
-#
-
-config VSN_SDCARD
- bool "NSH sdcard command"
- default n
- ---help---
- Enable support for the NSH sdcard command.
-
-if VSN_SDCARD
-endif
-
diff --git a/apps/vsn/sdcard/Makefile b/apps/vsn/sdcard/Makefile
deleted file mode 100644
index 213021b25..000000000
--- a/apps/vsn/sdcard/Makefile
+++ /dev/null
@@ -1,114 +0,0 @@
-############################################################################
-# Makefile
-#
-# Copyright (C) 2011 Uros Platise. All rights reserved.
-# Author: Uros Platise <uros.platise@isotel.eu>
-# 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.
-#
-############################################################################
-
-# TODO, this makefile should run make under the app dirs, instead of
-# sourcing the Make.defs!
-
--include $(TOPDIR)/.config
--include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
-
-ifeq ($(WINTOOL),y)
-INCDIROPT = -w
-endif
-
-# Hello Application
-# TODO: appname can be automatically extracted from the directory name
-
-APPNAME = sdcard
-PRIORITY = SCHED_PRIORITY_DEFAULT
-STACKSIZE = 1024
-
-ASRCS =
-CSRCS = sdcard.c
-
-AOBJS = $(ASRCS:.S=$(OBJEXT))
-COBJS = $(CSRCS:.c=$(OBJEXT))
-
-SRCS = $(ASRCS) $(CSRCS)
-OBJS = $(AOBJS) $(COBJS)
-
-ifeq ($(WINTOOL),y)
- BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}"
-else
- BIN = "$(APPDIR)/libapps$(LIBEXT)"
-endif
-
-ROOTDEPPATH = --dep-path .
-
-# Common build
-
-VPATH =
-
-all: .built
-.PHONY: context depend clean distclean
-
-$(AOBJS): %$(OBJEXT): %.S
- $(call ASSEMBLE, $<, $@)
-
-$(COBJS): %$(OBJEXT): %.c
- $(call COMPILE, $<, $@)
-
-.built: $(OBJS)
- @( for obj in $(OBJS) ; do \
- $(call ARCHIVE, $(BIN), $${obj}); \
- done ; )
- @touch .built
-
-# Register application
-
-.context:
- $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
- @touch $@
-
-context: .context
-
-# Create dependencies
-
-.depend: Makefile $(SRCS)
- @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
- @touch $@
-
-depend: .depend
-
-clean:
- @rm -f *.o *~ .*.swp .built
- $(call CLEAN)
-
-distclean: clean
- @rm -f .context Make.dep .depend
-
--include Make.dep
diff --git a/apps/vsn/sdcard/README.txt b/apps/vsn/sdcard/README.txt
deleted file mode 100644
index 332aa26cf..000000000
--- a/apps/vsn/sdcard/README.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-
-This application provides SDcard tool/lib to start, stop, eject or insert
-a memory card.
-
- Source: NuttX
- Author: Uros Platise
- Date: 18. March 2011
diff --git a/apps/vsn/sdcard/sdcard.c b/apps/vsn/sdcard/sdcard.c
deleted file mode 100644
index a81e8432a..000000000
--- a/apps/vsn/sdcard/sdcard.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/****************************************************************************
- * sdcard/sdcard.c
- *
- * Copyright (C) 2011 Uros Platise. All rights reserved.
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
- *
- * Authors: Uros Platise <uros.platise@isotel.eu>
- * 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 <nuttx/config.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#ifdef CONFIG_STM32_SDIO
-# include <nuttx/sdio.h>
-# include <nuttx/mmcsd.h>
-#endif
-
-FAR struct sdio_dev_s *sdio_initialize(int slotno);
-void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot);
-
-// TODO get the structure out from the slot number
-static FAR struct sdio_dev_s *sdio = NULL;
-
-/* Create device device for the SDIO-based MMC/SD block driver */
-
-int sdcard_start(int slotno)
-{
- int ret;
-
- /* First, get an instance of the SDIO interface */
-
- sdio = sdio_initialize(slotno);
- if (!sdio)
- {
- printf("SDIO: Failed to initialize slot %d\n", slotno);
- return -ENODEV;
- }
- printf("SDIO: Initialized slot %d\n", slotno);
-
- /* Now bind the SPI interface to the MMC/SD driver */
-
- ret = mmcsd_slotinitialize(slotno, sdio);
- if (ret != OK)
- {
- printf("SDIO: Failed to bind to the MMC/SD driver: %d\n", ret);
- return ret;
- }
- printf("SDIO: Successfully bound to the MMC/SD driver\n");
-
- /* Then let's guess and say that there is a card in the slot. I need to check to
- * see if the VSN board supports a GPIO to detect if there is a card in
- * the slot.
- */
- sdio_mediachange(sdio, true);
-
- return OK;
-}
-
-
-int sdcard_main(int argc, char *argv[])
-{
- int slotno = 0;
-
- if (argc >= 2) {
-
- /* The 3rd argument is expected to be a slot number, if given */
- if (argc==3)
- slotno = atoi(argv[2]);
-
- /* Commands */
-
- if (!strcmp(argv[1], "start")) {
- return sdcard_start(slotno);
- }
- else if (!strcmp(argv[1], "stop")) {
- fprintf(stderr, "Not implemented yet\n");
- }
- else if (!strcmp(argv[1], "insert")) {
- if (sdio) {
- sdio_mediachange(sdio, true);
- return OK;
- }
- }
- else if (!strcmp(argv[1], "eject")) {
- if (sdio) {
- sdio_mediachange(sdio, false);
- return OK;
- }
- }
- else if (!strcmp(argv[1], "status")) {
- printf("SDcard #%d Status:\n", slotno);
-#ifndef CONFIG_MMCSD_HAVECARDDETECT
- printf("\t - Without SDcard detect capability\n");
-#endif
- return 0;
- }
- }
-
- printf("%s: <start|stop|insert|eject|status> {slotno}\n", argv[0]);
- return -1;
-}