Detron updates

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

3 files changed, 237 insertions, 0 deletions

diff --git a/nuttx/configs/detron/include/board.h b/nuttx/configs/detron/include/board.h
index 544fada1c..0b8df9e5d 100755
--- a/nuttx/configs/detron/include/board.h
+++ b/nuttx/configs/detron/include/board.h
@@ -44,6 +44,8 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
+#include <arch/irq.h>          //GPIO IRQ
+#include <arch/lpc17xx/irq.h>
 
 /************************************************************************************
  * Definitions
@@ -125,6 +127,13 @@
 #define CONFIG_LP17_FLASH          1
 #define BOARD_FLASHCFG_VALUE       0x0000303a
 
+
+/* Button definitions ***************************************************************/
+
+#define panel_pulse_up                   1 /* Bit 0: painel_pulsada_up */
+#define panel_pulse_down                 2 /* Bit 1: painel_pulsada_down */
+#define panel_center                     4 /* Bit 2: painel_pulsada_centro */
+
 /************************************************************************************
  * Public Types
  ************************************************************************************/
@@ -158,6 +167,37 @@ extern "C" {
 
 EXTERN void lpc17_boardinitialize(void);
 
+
+EXTERN void up_buttoninit(void);
+
+/************************************************************************************
+ * Name: up_buttons
+ *
+ * Description:
+ *   After up_buttoninit() has been called, up_buttons() may be called to collect
+ *   the state of all buttons.  up_buttons() returns an 8-bit bit set with each bit
+ *   associated with a button.  See the BUTTON* definitions above for the meaning of
+ *   each bit in the returned value.
+ *
+ ************************************************************************************/
+
+EXTERN uint8_t up_buttons(void);
+
+/************************************************************************************
+ * Name: up_up_irq_pin_panel_pulse_up/down/center
+ *
+ * Description:
+ *   These functions may be called to register an interrupt handler that will be
+ *   called when BUTTON UP/DOWN/CENTER is depressed.  The previous interrupt handler value is
+ *   returned (so that it may restored, if so desired).
+ *
+ ************************************************************************************/
+
+
+EXTERN xcpt_t up_irq_pin_panel_pulse_up(xcpt_t irqhandler);
+EXTERN xcpt_t up_irq_pin_panel_pulse_down(xcpt_t irqhandler);
+EXTERN xcpt_t up_irq_pin_panel_center(xcpt_t irqhandler);
+
 #undef EXTERN
 #if defined(__cplusplus)
 }
diff --git a/nuttx/configs/detron/src/detron_internal.h b/nuttx/configs/detron/src/detron_internal.h
index 4b00c8032..10ffc0076 100755
--- a/nuttx/configs/detron/src/detron_internal.h
+++ b/nuttx/configs/detron/src/detron_internal.h
@@ -64,6 +64,12 @@
  * 60	P0(18)	si

  * 61	P0(17)	so

  *

+ * Botoes do painel

+ *

+ * 85	Chave pulsada 1  		P4(29)

+ * 87	Chave Pulsada 2 	 	P1(16)

+ * 88   Chave pulsada centro	P1(15)

+ *

  * USB

  *

  * Pin	Port	Function

@@ -80,6 +86,7 @@
 

 #include <nuttx/config.h>

 #include <nuttx/compiler.h>

+#include <arch/lpc17xx/irq.h>

 

 /************************************************************************************

  * Definitions

@@ -123,6 +130,16 @@
 #define pin_vs1003_si       (GPIO_OUTPUT | GPIO_VALUE_ZERO | GPIO_PORT0 | GPIO_PIN18)

 #define pin_vs1003_so       (GPIO_INPUT  | GPIO_VALUE_ZERO | GPIO_PORT0 | GPIO_PIN17)

 

+/* Pinos do painel  */

+

+#define pin_panel_center		  		(GPIO_INPUT | GPIO_VALUE_ZERO | GPIO_PORT2 | GPIO_PIN3)

+#define pin_panel_pulse_up   			(GPIO_INPUT | GPIO_VALUE_ZERO | GPIO_PORT2 | GPIO_PIN4)

+#define pin_panel_pulse_down	   		(GPIO_INPUT | GPIO_VALUE_ZERO | GPIO_PORT2 | GPIO_PIN5)

+

+#define IRQ_pin_panel_center 			LPC17_IRQ_P2p3

+#define IRQ_pin_panel_pulse_up   		LPC17_IRQ_P2p4

+#define IRQ_pin_panel_pulse_down   		LPC17_IRQ_P2p5

+

 /************************************************************************************

  * Public Types

  ************************************************************************************/

diff --git a/nuttx/configs/detron/src/up_buttons.c b/nuttx/configs/detron/src/up_buttons.c
new file mode 100644
index 000000000..66c1f5351
--- /dev/null
+++ b/nuttx/configs/detron/src/up_buttons.c
@@ -0,0 +1,180 @@
+/****************************************************************************
+ * configs/detron/src/up_buttons.c
+ *
+ *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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 <stdint.h>
+
+#include <nuttx/irq.h>
+
+#include <arch/irq.h>
+#include <arch/board/board.h>
+
+#include "lpc17_internal.h"
+#include "detron_internal.h"
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static xcpt_t g_irq_pin_panel_pulse_up;
+static xcpt_t g_irq_pin_panel_pulse_down;
+static xcpt_t g_irq_pin_panel_center;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: up_buttoninit
+ ****************************************************************************/
+
+void up_buttoninit(void)
+{
+	lpc17_configgpio(pin_panel_pulse_up);
+	lpc17_configgpio(pin_panel_pulse_down);
+	lpc17_configgpio(pin_panel_center);
+}
+
+/****************************************************************************
+ * Name: up_buttons
+ ****************************************************************************/
+
+uint8_t up_buttons(void)
+{
+  uint8_t retval;
+
+  retval  = lpc17_gpioread(pin_panel_pulse_up) ? 0 : pin_panel_pulse_up;
+  retval |= lpc17_gpioread(pin_panel_pulse_down) ? 0 : pin_panel_pulse_down;
+  retval |= lpc17_gpioread(pin_panel_center) ? 0 : pin_panel_center;
+  return retval;
+}
+
+/****************************************************************************
+ * Name: up_irq_pin_panel_pulse_up
+ ****************************************************************************/
+
+xcpt_t up_irq_pin_panel_pulse_up(xcpt_t irqhandler)
+{
+	xcpt_t oldhandler;
+	irqstate_t flags;
+
+	/* Get the old button interrupt handler and save the new one */
+
+	oldhandler   = g_irq_pin_panel_pulse_up;
+	g_irq_pin_panel_pulse_up = irqhandler;
+
+	/* Disable interrupts until we are done */
+
+	flags = irqsave();
+
+	/* Configure the interrupt */
+
+	(void)irq_attach(IRQ_pin_panel_pulse_up, irqhandler);
+	up_enable_irq(IRQ_pin_panel_pulse_up);
+
+	irqrestore(flags);
+
+	return oldhandler;
+}
+
+/****************************************************************************
+ * Name: up_irq_pin_panel_pulse_down
+ *  ****************************************************************************/
+
+xcpt_t up_irq_pin_panel_pulse_down(xcpt_t irqhandler)
+{
+	xcpt_t oldhandler;
+	irqstate_t flags;
+
+	/* Get the old button interrupt handler and save the new one */
+
+	oldhandler   = g_irq_pin_panel_pulse_down;
+	g_irq_pin_panel_pulse_down = irqhandler;
+
+	/* Disable interrupts until we are done */
+
+	flags = irqsave();
+
+	/* Configure the interrupt */
+
+	(void)irq_attach(IRQ_pin_panel_pulse_down, irqhandler);
+	up_enable_irq(IRQ_pin_panel_pulse_down);
+
+	irqrestore(flags);
+
+	return oldhandler;
+}
+
+/****************************************************************************
+ * Name: up_irq_pin_panel_center
+ *  ****************************************************************************/
+
+xcpt_t up_irq_pin_panel_center(xcpt_t irqhandler)
+{
+	xcpt_t oldhandler;
+	irqstate_t flags;
+
+	/* Get the old button interrupt handler and save the new one */
+
+	oldhandler   = g_irq_pin_panel_center;
+	g_irq_pin_panel_center = irqhandler;
+
+	/* Disable interrupts until we are done */
+
+	flags = irqsave();
+
+	/* Configure the interrupt */
+
+    (void)irq_attach(IRQ_pin_panel_center, irqhandler);
+	up_enable_irq(IRQ_pin_panel_center);
+
+	irqrestore(flags);
+
+	return oldhandler;
+}
+