DK-TM4C129X: Add support for buttons

4 files changed, 227 insertions, 8 deletions

diff --git a/nuttx/configs/dk-tm4c129x/include/board.h b/nuttx/configs/dk-tm4c129x/include/board.h
index 7905f18ea..d474a1348 100644
--- a/nuttx/configs/dk-tm4c129x/include/board.h
+++ b/nuttx/configs/dk-tm4c129x/include/board.h
@@ -152,18 +152,25 @@
 #define LED_PANIC         3     /* ON   OFF   OFF (flashing 2Hz) */
 
 /* Button definitions ***************************************************************/
-/* The TMC4C123G LaunchPad has a two buttons:
+/* There are three push buttons on the board.
  *
- *   BOARD_SW1    -- Connected to PF4
- *   BOARD_SW2    -- Connected to PF0
+ *   --- ------------ -----------------
+ *   Pin Pin Function Jumper
+ *   --- ------------ -----------------
+ *   PP1 Select SW4   J37 pins 1 and 2
+ *   PN3 Up SW2       J37 pins 3 and 4
+ *   PE5 Down SW3     J37 pins 5 and 6
+ *   --- ------------ -----------------
  */
 
-#define BUTTON_SW1        0
-#define BUTTON_SW2        1
-#define NUM_BUTTONS       2
+#define BUTTON_SW2        0
+#define BUTTON_SW3        1
+#define BUTTON_SW4        2
+#define NUM_BUTTONS       3
 
-#define BUTTON_SW1_BIT    (1 << BUTTON_SW1)
 #define BUTTON_SW2_BIT    (1 << BUTTON_SW2)
+#define BUTTON_SW3_BIT    (1 << BUTTON_SW3)
+#define BUTTON_SW4_BIT    (1 << BUTTON_SW4)
 
 /* Pin Multiplexing Disambiguation **************************************************/
 
diff --git a/nuttx/configs/dk-tm4c129x/src/Makefile b/nuttx/configs/dk-tm4c129x/src/Makefile
index c3e0184df..d3365f77b 100644
--- a/nuttx/configs/dk-tm4c129x/src/Makefile
+++ b/nuttx/configs/dk-tm4c129x/src/Makefile
@@ -47,6 +47,10 @@ else
 CSRCS += tm4c_userleds.c
 endif
 
+ifeq ($(CONFIG_ARCH_BUTTONS),y)
+CSRCS += tm4c_buttons.c
+endif
+
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS += tm4c_nsh.c
 endif
diff --git a/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h b/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h
index b105d9e7b..f034b8284 100644
--- a/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h
+++ b/nuttx/configs/dk-tm4c129x/src/dk-tm4c129x.h
@@ -82,7 +82,24 @@
 #define GPIO_LED_B   (GPIO_FUNC_OUTPUT | GPIO_VALUE_ONE | GPIO_PORTQ | GPIO_PIN_7)
 
 /* Button definitions ***************************************************************/
-/* Buttons -- To be provided */
+/* There are three push buttons on the board.
+ *
+ *   --- ------------ -----------------
+ *   Pin Pin Function Jumper
+ *   --- ------------ -----------------
+ *   PP1 Select SW4   J37 pins 1 and 2
+ *   PN3 Up SW2       J37 pins 3 and 4
+ *   PE5 Down SW3     J37 pins 5 and 6
+ *   --- ------------ -----------------
+ *
+ * Interrupts are supported only on port P and Q so only SW4 interrupts are supported.
+ */
+
+#define GPIO_SW2   (GPIO_FUNC_INPUT | GPIO_PORTE | GPIO_PIN_5)
+#define GPIO_SW3   (GPIO_FUNC_INPUT | GPIO_PORTN | GPIO_PIN_3)
+#define GPIO_SW4   (GPIO_FUNC_INPUT | GPIO_INT_BOTHEDGES | GPIO_PORTP | GPIO_PIN_1)
+
+#define IRQ_SW4    TIVA_IRQ_GPIOP_1
 
 /************************************************************************************
  * Public Functions
diff --git a/nuttx/configs/dk-tm4c129x/src/tm4c_buttons.c b/nuttx/configs/dk-tm4c129x/src/tm4c_buttons.c
new file mode 100644
index 000000000..118dcc64b
--- /dev/null
+++ b/nuttx/configs/dk-tm4c129x/src/tm4c_buttons.c
@@ -0,0 +1,191 @@
+/****************************************************************************
+ * configs/dk-tm4c/src/tm4c_buttons.c
+ *
+ *   Copyright (C) 2014 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 <stdint.h>
+
+#include <nuttx/arch.h>
+
+#include <arch/irq.h>
+#include <arch/board/board.h>
+
+#include "dk-tm4c129x.h"
+
+#ifdef CONFIG_ARCH_BUTTONS
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+/* Pin configuration for each STM3210E-EVAL button.  This array is indexed by
+ * the BUTTON_* and JOYSTICK_* definitions in board.h
+ */
+
+static const uint32_t g_buttons[NUM_BUTTONS] =
+{
+  GPIO_SW2, GPIO_SW3, GPIO_SW4
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_button_initialize
+ *
+ * Description:
+ *   board_button_initialize() must be called to initialize button resources.
+ *   After that, board_buttons() may be called to collect the current state
+ *   of all buttons or board_button_irq() may be called to register button
+ *   interrupt handlers.
+ *
+ ****************************************************************************/
+
+void board_button_initialize(void)
+{
+  int i;
+
+  /* Configure the GPIO pins as inputs. */
+
+  for (i = 0; i < NUM_BUTTONS; i++)
+    {
+      tiva_configgpio(g_buttons[i]);
+    }
+}
+
+/****************************************************************************
+ * Name: board_buttons
+ ****************************************************************************/
+
+uint8_t board_buttons(void)
+{
+  uint8_t ret = 0;
+  int i;
+
+  /* Check that state of each key */
+
+  for (i = 0; i < NUM_BUTTONS; i++)
+    {
+      /* A LOW value means that the key is pressed. */
+
+      bool released = tiva_gpioread(g_buttons[i]);
+
+      /* Accumulate the set of depressed (not released) keys */
+
+      if (!released)
+        {
+          ret |= (1 << i);
+        }
+    }
+
+  return ret;
+}
+
+/************************************************************************************
+ * Button support.
+ *
+ * Description:
+ *   board_button_initialize() must be called to initialize button resources.  After
+ *   that, board_buttons() may be called to collect the current state of all
+ *   buttons or board_button_irq() may be called to register button interrupt
+ *   handlers.
+ *
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_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.
+ *
+ *   board_button_irq() 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) && !defined(CONFIG_TIVA_DISABLE_GPIOP_IRQS)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+{
+  static xcpt_t handler = NULL;
+  xcpt_t oldhandler = handler;
+  irqstate_t flags;
+  int ret;
+
+  /* Interrupts are supported only on ports P and Q and, hence, only on button SW4 */
+
+  if (id >= BUTTON_SW4)
+    {
+      /* The following should be atomic */
+
+      flags = irqsave();
+
+      /* Detach and disable the button interrupt */
+
+      up_disable_irq(IRQ_SW4);
+      irq_detach(IRQ_SW4);
+      handler = NULL;
+
+      /* Attach the new handler if so requested */
+
+      if (irqhandler)
+        {
+          ret = irq_attach(IRQ_SW4, irqhandler);
+          if (ret == OK)
+            {
+              handler = irqhandler;
+              up_enable_irq(IRQ_SW4);
+            }
+        }
+
+      irqrestore(flags);
+    }
+
+  return oldhandler;
+}
+#endif
+#endif /* CONFIG_ARCH_BUTTONS */