apps/ update from Uros

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3392 42af7a65-404d-4744-a932-0658087f49c3

5 files changed, 9 insertions, 19 deletions

diff --git a/nuttx/configs/vsn/src/Makefile b/nuttx/configs/vsn/src/Makefile
index 1a2005d60..f12a8bcef 100644
--- a/nuttx/configs/vsn/src/Makefile
+++ b/nuttx/configs/vsn/src/Makefile
@@ -44,7 +44,7 @@ ASRCS		=
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 
 CSRCS		= sysclock.c boot.c leds.c buttons.c spi.c \
-			  usbdev.c sdcard.c ramtron.c power.c
+			  usbdev.c power.c
 
 ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
 CSRCS		+= nsh.c
diff --git a/nuttx/configs/vsn/src/README.txt b/nuttx/configs/vsn/src/README.txt
index f08e8fe06..bacf82c17 100644
--- a/nuttx/configs/vsn/src/README.txt
+++ b/nuttx/configs/vsn/src/README.txt
@@ -10,13 +10,3 @@ Execution starts in the following order:
  - boot, performs initial chip and board initialization
  - ...
  - nsh, as central application last.
- 
- 
-
-
-JTAG options:
-=============
-
-CONFIG_STM32_JTAG_FULL_ENABLE			// Complete parallel and serial
-CONFIG_STM32_JTAG_NOJNTRST_ENABLE		// no JNTRST pin
-CONFIG_STM32_JTAG_SW_ENABLE				// serial (dual pin) only (can coexist besides the FRAM on SPI3)
diff --git a/nuttx/configs/vsn/src/nsh.c b/nuttx/configs/vsn/src/nsh.c
index 96f9f3d4d..d29368833 100644
--- a/nuttx/configs/vsn/src/nsh.c
+++ b/nuttx/configs/vsn/src/nsh.c
@@ -82,8 +82,8 @@
 
 int nsh_archinitialize(void)
 {
-  up_ramtron();
-  up_sdcard();
+//  up_ramtron();
+//  up_sdcard();
    
   return OK;
 }
diff --git a/nuttx/configs/vsn/src/power.c b/nuttx/configs/vsn/src/power.c
index c7c73448a..2e5ed1d13 100644
--- a/nuttx/configs/vsn/src/power.c
+++ b/nuttx/configs/vsn/src/power.c
@@ -81,11 +81,11 @@ void board_power_off(void)
 
 	// \todo
 	
-	// stop backgorund processes
+	// stop background processes
 	irqsave();
 
 	// switch to internal HSI and get the PD0 and PD1 as GPIO
-	stm32_board_select_hsi();
+	sysclock_select_hsi();
 
 	// trigger shutdown with pull-up resistor (not push-pull!) and wait.
 	stm32_gpiowrite(GPIO_PCLR, true);
diff --git a/nuttx/configs/vsn/src/sysclock.c b/nuttx/configs/vsn/src/sysclock.c
index 79cc80ff2..928282b12 100644
--- a/nuttx/configs/vsn/src/sysclock.c
+++ b/nuttx/configs/vsn/src/sysclock.c
@@ -65,7 +65,7 @@
   * 
   * \return Nothing, operation is always successful.
   */
-void stm32_board_select_hsi(void)
+void sysclock_select_hsi(void)
 {
 	uint32_t regval;
 
@@ -144,7 +144,7 @@ void stm32_board_select_hsi(void)
   * \retval -1 External clock is not provided
   * \retval -2 Could not lock to external clock
   */
-int stm32_board_select_hse(void)
+int sysclock_select_hse(void)
 {
 	uint32_t regval;
 
@@ -168,7 +168,7 @@ int stm32_board_select_hse(void)
   *   so spawn a task for that... once cc1101 is restarted signal an event
   *   to restart clock.
   */
-void stm32_board_hse_lost(void)
+void sysclock_hse_lost(void)
 {
 }
 
@@ -181,5 +181,5 @@ void stm32_board_hse_lost(void)
   */
 void stm32_board_clockconfig(void)
 {
-	stm32_board_select_hsi();
+	sysclock_select_hsi();
 }