Add button support for zkit-arm-1769 board

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

2 files changed, 218 insertions, 5 deletions

diff --git a/nuttx/configs/zkit-arm-1769/include/board.h b/nuttx/configs/zkit-arm-1769/include/board.h
index e6d486bf2..92ac58946 100644
--- a/nuttx/configs/zkit-arm-1769/include/board.h
+++ b/nuttx/configs/zkit-arm-1769/include/board.h
@@ -190,11 +190,11 @@
 #define BOARD_BUTTON_5             4
 #define BOARD_NUM_BUTTONS          5
 
-#define BOARD_BUTTON_BUTTON1_BIT   (1 << BOARD_BUTTON_1)
-#define BOARD_BUTTON_BUTTON2_BIT   (1 << BOARD_BUTTON_2)
-#define BOARD_BUTTON_BUTTON3_BIT   (1 << BOARD_BUTTON_3)
-#define BOARD_BUTTON_BUTTON4_BIT   (1 << BOARD_BUTTON_4)
-#define BOARD_BUTTON_BUTTON5_BIT   (1 << BOARD_BUTTON_5)
+#define BOARD_BUTTON1_BIT          (1 << BOARD_BUTTON_1)
+#define BOARD_BUTTON2_BIT          (1 << BOARD_BUTTON_2)
+#define BOARD_BUTTON3_BIT          (1 << BOARD_BUTTON_3)
+#define BOARD_BUTTON4_BIT          (1 << BOARD_BUTTON_4)
+#define BOARD_BUTTON5_BIT          (1 << BOARD_BUTTON_5)
 
 /* Alternate pin selections *********************************************************/
 /* Pin Description                      On Board       Connector
diff --git a/nuttx/configs/zkit-arm-1769/src/up_buttons.c b/nuttx/configs/zkit-arm-1769/src/up_buttons.c
new file mode 100644
index 000000000..2422f5080
--- /dev/null
+++ b/nuttx/configs/zkit-arm-1769/src/up_buttons.c
@@ -0,0 +1,213 @@
+/****************************************************************************
+ * configs/zkit-arm-1769/src/up_buttons.c
+ *  arch/arm/src/board/up_buttons.c
+ *
+ *   Copyright (C)  2011 Zilogic Systems. All rights reserved.
+ *   Author: Kannan <code@zilogic.com>
+ *
+ * Based on configs/stm3210e-eval/src/up_buttons.c
+ *
+ *   Copyright (C) 2009, 2011 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 <errno.h>
+#include <debug.h>
+#include <nuttx/irq.h>
+#include <nuttx/arch.h>
+#include <arch/irq.h>
+#include <arch/board/board.h>
+
+#include "up_arch.h"
+#include "up_internal.h"
+#include "lpc17_gpio.h"
+#include "zkitarm_internal.h"
+
+#ifdef CONFIG_ARCH_BUTTONS
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+/* Pin configuration for each zkit-arm-1769 button.  This array is indexed by
+ * BOARD_NUM_BUTTONS in board.h
+ */
+
+static const uint16_t g_buttons[BOARD_NUM_BUTTONS] =
+{
+  ZKITARM_KEY1, ZKITARM_KEY2, ZKITARM_KEY3, ZKITARM_KEY4, ZKITARM_KEY5
+};
+
+/* Old KEY5 interrupt handler */
+
+static xcpt_t g_oldhandler;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: up_buttoninit
+ *
+ * Description:
+ *   up_buttoninit() must be called to initialize button resources.  After
+ *   that, up_buttons() may be called to collect the current state of all
+ *   buttons or up_irqbutton() may be called to register button interrupt
+ *   handlers.
+ *
+ ****************************************************************************/
+
+void up_buttoninit(void)
+{
+  int i;
+
+  /* Configure the GPIO pins as inputs.  NOTE that EXTI interrupts are
+   * configured for some pins but NOT used in this file
+   */
+
+  for (i = 0; i < BOARD_NUM_BUTTONS; i++)
+    {
+      lpc17_configgpio(g_buttons[i]);
+    }
+}
+
+/****************************************************************************
+ * Name: up_buttons
+ ****************************************************************************/
+
+uint8_t up_buttons(void)
+{
+  uint8_t ret = 0;
+  bool released;
+  int i;
+
+  /* Check that state of each key */
+
+  for (i = 0; i < BOARD_NUM_BUTTONS; i++)
+    {
+      released = lpc17_gpioread(g_buttons[i]);
+
+       /* Accumulate set of depressed keys */
+
+      if (!released)
+        {
+          ret |= (1 << i);
+        }
+    }
+
+  return ret;
+}
+
+/************************************************************************************
+ * Button support.
+ *
+ * Description:
+ *   up_buttoninit() must be called to initialize button resources.  After
+ *   that, up_buttons() may be called to collect the current state of all
+ *   buttons or up_irqbutton() may be called to register button interrupt
+ *   handlers.
+ *
+ *   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_*_BIT and JOYSTICK_*_BIT
+ *   definitions in board.h for the meaning of each bit.
+ *
+ *   up_irqbutton() may be called to register an interrupt handler that will
+ *   be called when a button is depressed or released.  The ID value is a
+ *   button enumeration value that uniquely identifies a button resource. See the
+ *   BUTTON_* and JOYSTICK_* definitions in board.h for the meaning of enumeration
+ *   value.  The previous interrupt handler address is returned (so that it may
+ *   restored, if so desired).
+ *
+ ************************************************************************************/
+
+#if defined CONFIG_ARCH_IRQBUTTONS && CONFIG_GPIO_IRQ
+xcpt_t up_irqbutton(int id, xcpt_t irqhandler)
+{
+  xcpt_t rethandler = NULL;
+  irqstate_t flags;
+  int ret;
+
+  /* Interrupts are supported on KEY5 only */
+
+  if (id == BOARD_BUTTON_5)
+    {
+      /* Return the previous value of the interrupt handler */
+
+      flags = irqsave();
+      rethandler   = g_oldhandler;
+      g_oldhandler = irqhandler;
+
+      /* Attach or detach the interrupt handler for KEY5. */
+
+      if (irqhandler)
+        {
+          /* Configure KEY5 as an interrupting input */
+
+          lpc17_configgpio(ZKITARM_INT_ KEY5);
+
+          /* Attach the new interrupt handler and enable the interrupt */
+
+          ret = irq_attach(ZKITARM_KEY5_IRQ, irqhandler);
+          if (ret == OK)
+            {
+              up_enable_irq(ZKITARM_KEY5_IRQ);
+            }
+        }
+      else
+        {
+          /* Disable the interrupt and detach the handler */
+
+          up_disable_irq(ZKITARM_KEY5_IRQ);
+          (void)irq_detach(ZKITARM_KEY5_IRQ);
+
+          /* Configure KEY5 as a non-interrupting input */
+
+          lpc17_configgpio(ZKITARM_KEY5);
+
+        }
+
+      irqrestore(flags);
+    }
+
+  return rethandler;
+}
+
+#endif
+#endif /* CONFIG_ARCH_BUTTONS */