Fix C++ dependencies, cleaning, ..

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

2 files changed, 19 insertions, 4 deletions

diff --git a/nuttx/configs/sam3u-ek/src/up_touchscreen.c b/nuttx/configs/sam3u-ek/src/up_touchscreen.c
index 699c245b7..9b58f151c 100755
--- a/nuttx/configs/sam3u-ek/src/up_touchscreen.c
+++ b/nuttx/configs/sam3u-ek/src/up_touchscreen.c
@@ -200,14 +200,14 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_tcinitialize
+ * Name: arch_tcinitialize
  *
  * Description:
  *   Initialize the touchscreen device
  *
  ****************************************************************************/
 
-int up_tcinitialize(void)
+int arch_tcinitialize(void)
 {
   FAR struct spi_dev_s *dev;
   int ret;
@@ -244,4 +244,19 @@ int up_tcinitialize(void)
 
   return OK;
 }
-#endif /* CONFIG_INPUT_ADS7843E */
\ No newline at end of file
+
+/****************************************************************************
+ * Name: arch_tcuninitialize
+ *
+ * Description:
+ *   Un-initialize the touchscreen device
+ *
+ ****************************************************************************/
+
+void arch_tcuninitialize(void)
+{
+  /* No support for un-initializing the touchscreen ADS7843E device yet */
+}
+
+#endif /* CONFIG_INPUT_ADS7843E */
+
diff --git a/nuttx/configs/sam3u-ek/touchscreen/defconfig b/nuttx/configs/sam3u-ek/touchscreen/defconfig
index f6eab150a..fb5868f58 100755
--- a/nuttx/configs/sam3u-ek/touchscreen/defconfig
+++ b/nuttx/configs/sam3u-ek/touchscreen/defconfig
@@ -1061,7 +1061,7 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n
 #   collected and the program terminates.  Default:  Samples are collected
 #   indefinitely.
 #
-CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN=n
+CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN=y
 CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25