summaryrefslogtreecommitdiff
path: root/nuttx/arch
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-02-25 23:05:37 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-02-25 23:05:37 +0000
commit11cdbe3e35d80775ba9887a995a1e3c124c7a063 (patch)
treef0a52c4be597206817b43cc3c53db56f5e1463af /nuttx/arch
parent0fc66dd545b21a2094f8d833955107d583bea953 (diff)
downloadpx4-nuttx-11cdbe3e35d80775ba9887a995a1e3c124c7a063.tar.gz
px4-nuttx-11cdbe3e35d80775ba9887a995a1e3c124c7a063.tar.bz2
px4-nuttx-11cdbe3e35d80775ba9887a995a1e3c124c7a063.zip
Add beginning of m9s12x GPIO support
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3317 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
-rwxr-xr-xnuttx/arch/arm/src/lpc17xx/lpc17_irq.c3
-rwxr-xr-xnuttx/arch/hc/src/m9s12/Make.defs12
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_dumpgpio.c84
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_gpio.c438
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_gpioirq.c108
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_internal.h213
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_irq.c14
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_pim.h1
8 files changed, 868 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_irq.c b/nuttx/arch/arm/src/lpc17xx/lpc17_irq.c
index 649db985f..dad1d1ca4 100755
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_irq.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_irq.c
@@ -326,8 +326,6 @@ void up_irqinitialize(void)
lpc17_dumpnvic("initial", LPC17_IRQ_NIRQS);
-#ifndef CONFIG_SUPPRESS_INTERRUPTS
-
/* Initialize FIQs */
#ifdef CONFIG_ARCH_FIQ
@@ -344,6 +342,7 @@ void up_irqinitialize(void)
/* And finally, enable interrupts */
+#ifndef CONFIG_SUPPRESS_INTERRUPTS
setbasepri(NVIC_SYSH_PRIORITY_MAX);
irqrestore(0);
#endif
diff --git a/nuttx/arch/hc/src/m9s12/Make.defs b/nuttx/arch/hc/src/m9s12/Make.defs
index 2c2c68a00..ea9d1934c 100755
--- a/nuttx/arch/hc/src/m9s12/Make.defs
+++ b/nuttx/arch/hc/src/m9s12/Make.defs
@@ -43,5 +43,13 @@ CMN_CSRCS = up_allocateheap.c up_blocktask.c up_copystate.c up_createstack.c \
up_udelay.c up_unblocktask.c up_usestack.c
CHIP_ASRCS = m9s12_start.S m9s12_lowputc.S m9s12_saveusercontext.S
-CHIP_CSRCS = m9s12_assert.c m9s12_serial.c m9s12_initialstate.c m9s12_irq.c \
- m9s12_timerisr.c
+CHIP_CSRCS = m9s12_assert.c m9s12_gpio.c m9s12_initialstate.c m9s12_irq.c \
+ m9s12_serial.c m9s12_timerisr.c
+
+ifeq ($(CONFIG_GPIO_IRQ),y)
+CHIP_CSRCS += m9s12_gpioint.c
+endif
+
+ifeq ($(CONFIG_DEBUG_GPIO),y)
+CHIP_CSRCS += m9s12_gpiodbg.c
+endif
diff --git a/nuttx/arch/hc/src/m9s12/m9s12_dumpgpio.c b/nuttx/arch/hc/src/m9s12/m9s12_dumpgpio.c
new file mode 100755
index 000000000..a10983a4d
--- /dev/null
+++ b/nuttx/arch/hc/src/m9s12/m9s12_dumpgpio.c
@@ -0,0 +1,84 @@
+/****************************************************************************
+ * arch/arm/src/m9s12/m9s12_dumpgpio.c
+ * arch/arm/src/chip/m9s12_dumpgpio.c
+ *
+ * Copyright (C) 2011 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 "m9s12_internal.h"
+
+#ifdef CONFIG_DEBUG_GPIO
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/************************************************************************************
+ * Function: hcs12_dumpgpio
+ *
+ * Description:
+ * Dump all GPIO registers associated with the base address of the provided pinset.
+ *
+ ************************************************************************************/
+
+int hcs12_dumpgpio(uint16_t pinset, const char *msg)
+{
+#warning "Not implemented"
+ return -ENOSYS;
+}
+
+#endif /* CONFIG_DEBUG_GPIO */
+
diff --git a/nuttx/arch/hc/src/m9s12/m9s12_gpio.c b/nuttx/arch/hc/src/m9s12/m9s12_gpio.c
new file mode 100755
index 000000000..58e61094d
--- /dev/null
+++ b/nuttx/arch/hc/src/m9s12/m9s12_gpio.c
@@ -0,0 +1,438 @@
+/****************************************************************************
+ * arch/arm/src/m9s12/m9s12_gpio.c
+ * arch/arm/src/chip/m9s12_gpio.c
+ *
+ * Copyright (C) 2011 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 <stdbool.h>
+#include <assert.h>
+#include <errno.h>
+
+#include "up_arch.h"
+#include "m9s12_internal.h"
+#include "m9s12_pim.h"
+#include "m9s12_mebi.h"
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+/* GPIO management macros:
+ *
+ * The GPIO configuration is represented by a 16-bit value encoded as follows:
+ *
+ * xxII OUUR DMGG GPPP
+ * || |||| ||| `-Pin number
+ * || |||| || `- Port number
+ * || |||| | `- PIM Ports
+ * || |||| `- Direction
+ * || |||`- Reduced drive
+ * || ||`- Polarity
+ * || |`- Pull up (or down)
+ * || `- Wired OR open drain
+ * |`- Interrupt or rising/falling (polarity)
+ * `- Interrupt
+ *
+ * NOTE: MEBI ports E and K can have special configurations as controlled by
+ * the PEAR and MODE registers. Those special configurations are not managed
+ * by the logic below; that logic is only intended to support general GPIO
+ * pin usage.
+ */
+
+/* PIM ports (T,S,G,H,J,L) */
+
+#define HCS12_PIM_NPORTS 6
+
+/* MEBI ports (A,B,E,K) */
+
+#define HCS12_MEBI_NPORTS 4
+
+/* Which ports have which registers? */
+
+#define HCS12_PORT_T (1 << 0)
+#define HCS12_PORT_S (1 << 1)
+#define HCS12_PORT_G (1 << 2)
+#define HCS12_PORT_H (1 << 3)
+#define HCS12_PORT_J (1 << 4)
+#define HCS12_PORT_L (1 << 5)
+#define HCS12_PORT_ALL 0x3f
+
+#define HCS12_IO_PORTS HCS12_PORT_ALL
+#define HCS12_INPUT_PORTS HCS12_PORT_ALL
+#define HCS12_DDR_PORTS HCS12_PORT_ALL
+#define HCS12_RDR_PORTS HCS12_PORT_ALL
+#define HCS12_PER_PORTS HCS12_PORT_ALL
+#define HCS12_PS_PORTS HCS12_PORT_ALL
+#define HCS12_WOM_PORTS (HCS12_PORT_S|HCS12_PORT_L)
+#define HCS12_IE_PORTS (HCS12_PORT_G|HCS12_PORT_H|HCS12_PORT_J)
+#define HCS12_IF_PORTS (HCS12_PORT_G|HCS12_PORT_H|HCS12_PORT_J)
+
+/* Decoding help macros */
+
+#define HCS12_PIN(cfg) (((cfg) & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT)
+#define HCS12_PORTNDX(cfg) (((cfg) >> GPIO_PORT_SHIFT) & 7)
+#define HCS12_PIMPORT(cfg) (((cfg) & GPIO_PORT_PIM) != 0)
+#define HCS12_MEBIPORT(cfg) (((cfg) & GPIO_PORT_PIM) == 0)
+
+#define HCS12_PULL(cfg) (((cfg) & GPIO_PULLUP_MASK) >> GPIO_PULLUP_SHIFT)
+# define HCS12_PULL_NONE 0
+# define HCS12_PULL_POLARITY 1
+# define HCS12_PULL_ENABLE 2
+# define HCS12_PULL_UP 2
+# define HCS12_PULL_DOWN 3
+
+#define HCS12_INTERRUPT(cfg) (((cfg) & GPIO_INT_MASK) >> GPIO_INT_SHIFT)
+# define HCS12_INT_NONE 0
+# define HCS12_INT_POLARITY 1
+# define HCS12_INT_ENABLE 2
+# define HCS12_INT_FALLING 2
+# define HCS12_INT_RISING 3
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct mebi_portaddr_s
+{
+ uint16_t data; /* Data register */
+ uint16_t ddr; /* Direction register */
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+static const struct mebi_portaddr_s mebi_portaddr[HCS12_MEBI_NPORTS] =
+{
+ {HCS12_MEBI_PORTA, HCS12_MEBI_DDRA}, /* Port A */
+ {HCS12_MEBI_PORTB, HCS12_MEBI_DDRB}, /* Port B */
+ {HCS12_MEBI_PORTE, HCS12_MEBI_DDRE}, /* Port E */
+ {HCS12_MEBI_PORTK, HCS12_MEBI_DDRK} /* Port K */
+};
+
+static uint8_t mebi_bits[HCS12_MEBI_NPORTS] =
+{
+ (1 << 0), (1 << 1), (1 << 4), (1 << 7)
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Misc. Low-Level, Inline Helper Functions
+ ****************************************************************************/
+
+static inline void gpio_writebit(uint16_t regaddr, uint8_t pin, bool set)
+{
+ uint8_t regval = getreg8(regaddr);
+ if (set)
+ {
+ regval |= (1 << pin);
+ }
+ else
+ {
+ regval &= ~(1 << pin);
+ }
+ putreg8(regval, regaddr);
+}
+
+static inline bool gpio_readbit(uint16_t regaddr, uint8_t pin)
+{
+ uint8_t regval = getreg8(regaddr);
+ return ((regval & (1 << pin)) != 0);
+}
+
+static inline void pim_direction(uint8_t portndx, uint8_t pin, bool output)
+{
+ gpio_writebit(HCS12_PIM_PORT_DDR(portndx), pin, output);
+}
+
+static inline void mebi_direction(uint8_t portndx, uint8_t pin, bool output)
+{
+ gpio_writebit(mebi_portaddr[portndx].ddr, pin, output);
+}
+
+static inline void pim_opendrain(uint8_t portndx, uint8_t pin, bool opendrain)
+{
+ DEBUGASSERT(!opendrain || (HCS12_WOM_PORTS & (1 << pin)) != 0);
+ gpio_writebit(HCS12_PIM_PORT_WOM(portndx), pin, opendrain);
+}
+
+static inline void pim_pullpin(uint8_t portndx, uint8_t pin, uint8_t pull)
+{
+ bool enable = false;
+ bool polarity = false;
+
+ if ((pull & HCS12_PULL_ENABLE) != 0)
+ {
+ enable = true;
+ if ((pull & HCS12_PULL_POLARITY) != 0)
+ {
+ polarity = true;
+ }
+ }
+
+ gpio_writebit(HCS12_PIM_PORT_PER(portndx), pin, enable);
+ gpio_writebit(HCS12_PIM_PORT_PS(portndx), pin, polarity);
+}
+
+static inline void mebi_pullport(uint8_t portndx, uint8_t pull)
+{
+ uint8_t regval = getreg8(HCS12_MEBI_PUCR);
+ if (pull == HCS12_PULL_UP)
+ {
+ regval |= mebi_bits[portndx];
+ }
+ else
+ {
+ regval &= ~mebi_bits[portndx];
+ }
+ putreg8(regval, HCS12_MEBI_PUCR);
+}
+
+static inline void pim_rdpin(uint8_t portndx, uint8_t pin, bool rdenable)
+{
+ gpio_writebit(HCS12_PIM_PORT_RDR(portndx), pin, rdenable);
+}
+
+static inline void mebi_rdport(uint8_t portndx, bool rdenable)
+{
+ uint8_t regval = getreg8(HCS12_MEBI_RDRIV);
+ if (rdenable)
+ {
+ regval |= mebi_bits[portndx];
+ }
+ else
+ {
+ regval &= ~mebi_bits[portndx];
+ }
+ putreg8(regval, HCS12_MEBI_RDRIV);
+}
+
+static inline void pim_interrupt(uint8_t portndx, unsigned pin, uint8_t type)
+{
+ if (type != HCS12_INT_NONE)
+ {
+ DEBUGASSERT((HCS12_IE_PORTS & (1 << pin)) != 0);
+ gpio_writebit(HCS12_PIM_PORT_IE(portndx), pin, false);
+ gpio_writebit(HCS12_PIM_PORT_PS(portndx), pin, ((type & GPIO_INT_POLARITY) != 0));
+ }
+ else if ((HCS12_IE_PORTS & (1 << pin)) != 0)
+ {
+ gpio_writebit(HCS12_PIM_PORT_IE(portndx), pin, false);
+ }
+}
+
+/****************************************************************************
+ * Name: pim_configgpio
+ *
+ * Description:
+ * Configure a GPIO pin based on bit-encoded description of the pin.
+ *
+ ****************************************************************************/
+
+static inline void pim_configgpio(uint16_t cfgset, uint8_t portndx, uint8_t pin)
+{
+ /* Sanity checking -- Check if the pin will be enabled as an interrupt
+ * (later)
+ */
+
+ DEBUGASSERT(portndx < HCS12_PIM_NPORTS);
+
+#ifdef CONFIG_DEBUG
+ if ((cfgset) & GPIO_INT_ENABLE) != 0)
+ {
+ /* Yes.. then it must not be tagged as an output */
+
+ ASSERT(((cfgset) & GPIO_DIRECTION) != GPIO_OUTPUT);
+
+ /* If the pull-driver is also enabled, it must be enabled with a
+ * compatible priority.
+ */
+
+ if ((cfgset) & GPIO_PULL_ENABLE) != 0)
+ {
+ if ((cfgset) & GPIO_INT_POLARITY) != 0)
+ {
+ ASSERT(((cfgset) & GPIO_PULL_POLARITY) != 0);
+ }
+ else
+ {
+ ASSERT(((cfgset) & GPIO_PULL_POLARITY) = 0);
+ }
+ }
+ }
+#endif
+
+ pim_direction(portndx, pin, (((cfgset) & GPIO_DIRECTION) == GPIO_OUTPUT));
+ pim_opendrain(portndx, pin, (((cfgset) & GPIO_OPENDRAN) != 0));
+ pim_pullpin(portndx, pin, HCS12_PULL(cfgset));
+ pim_rdpin(portndx, pin, (((cfgset) & GPIO_REDUCED) != 0));
+ pim_interrupt(portndx, pin, HCS12_INTERRUPT(cfgset));
+}
+
+/****************************************************************************
+ * Name: mebi_configgpio
+ *
+ * Description:
+ * Configure a GPIO pin based on bit-encoded description of the pin.
+ *
+ ****************************************************************************/
+
+static inline void mebi_configgpio(uint16_t cfgset, uint8_t portndx, uint8_t pin)
+{
+ DEBUGASSERT(portndx < HCS12_MEBI_NPORTS);
+ mebi_direction(portndx, pin, (((cfgset) & GPIO_DIRECTION) == GPIO_OUTPUT));
+ mebi_pullport(portndx, HCS12_PULL(cfgset));
+ mebi_rdport(portndx, (((cfgset) & GPIO_REDUCED) != 0));
+}
+
+/****************************************************************************
+ * Read/Write Helpers
+ ****************************************************************************/
+
+static inline void pim_gpiowrite(uint8_t portndx, uint8_t pin, bool value)
+{
+ uint16_t regaddr = HCS12_PIM_PORT_IO(portndx)
+ DEBUGASSERT(portndx < HCS12_PIM_NPORTS);
+ gpio_writebit(regaddr, pin, value);
+}
+
+static inline void mebi_gpiowrite(uint8_t portndx, uint8_t pin, bool value)
+{
+ uint16_t regaddr;
+ DEBUGASSERT(portndx < HCS12_MEBI_NPORTS);
+ regaddr = mebi_portaddr[portndx].data;
+ gpio_writebit(regaddr, pin, value);
+}
+
+static inline bool pim_gpioread(uint8_t portndx, uint8_t pin)
+{
+ uint16_t regaddr = HCS12_PIM_PORT_INPUT(portndx)
+ DEBUGASSERT(portndx < HCS12_PIM_NPORTS);
+ return gpio_readbit(regaddr, pin);
+}
+
+static inline bool mebi_gpioread(uint8_t portndx, uint8_t pin)
+{
+ uint16_t regaddr;
+ DEBUGASSERT(portndx < HCS12_MEBI_NPORTS);
+ regaddr = mebi_portaddr[portndx].data;
+ return gpio_readbit(regaddr, pin);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: hcs12_configgpio
+ *
+ * Description:
+ * Configure a GPIO pin based on bit-encoded description of the pin.
+ *
+ ****************************************************************************/
+
+int hcs12_configgpio(uint16_t cfgset)
+{
+ uint8_t portndx = HCS12_PORTNDX(cfgset);
+ uint8_t pin = HCS12_PIN(cfgset);
+
+ if (HCS12_PIMPORT(cfgset))
+ {
+ pim_configgpio(cfgset, portndx, pin);
+ }
+ else
+ {
+ mebi_configgpio(cfgset, portndx, pin);
+ }
+ return OK;
+}
+
+/****************************************************************************
+ * Name: hcs12_gpiowrite
+ *
+ * Description:
+ * Write one or zero to the selected GPIO pin
+ *
+ ****************************************************************************/
+
+void hcs12_gpiowrite(uint16_t pinset, bool value)
+{
+ uint8_t portndx = HCS12_PORTNDX(pinset);
+ uint8_t pin = HCS12_PIN(pinset);
+
+ DEBUGASSERT((pinset & GPIO_DIRECTION) == GPIO_OUTPUT);
+ if (HCS12_PIMPORT(pinset))
+ {
+ pim_gpiowrite(portndx, pin, value);
+ }
+ else
+ {
+ mebi_gpiowrite(portndx, pin, value);
+ }
+}
+
+/****************************************************************************
+ * Name: hcs12_gpioread
+ *
+ * Description:
+ * Read one or zero from the selected GPIO pin
+ *
+ ****************************************************************************/
+
+bool hcs12_gpioread(uint16_t pinset)
+{
+ uint8_t portndx = HCS12_PORTNDX(pinset);
+ uint8_t pin = HCS12_PIN(pinset);
+
+ if (HCS12_PIMPORT(pinset))
+ {
+ return pim_gpioread(portndx, pin);
+ }
+ else
+ {
+ return mebi_gpioread(portndx, pin);
+ }
+}
diff --git a/nuttx/arch/hc/src/m9s12/m9s12_gpioirq.c b/nuttx/arch/hc/src/m9s12/m9s12_gpioirq.c
new file mode 100755
index 000000000..cc45426e1
--- /dev/null
+++ b/nuttx/arch/hc/src/m9s12/m9s12_gpioirq.c
@@ -0,0 +1,108 @@
+/****************************************************************************
+ * arch/arm/src/m9s12/m9s12_gpioirq.c
+ * arch/arm/src/chip/m9s12_gpioirq.c
+ *
+ * Copyright (C) 2011 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 "m9s12_internal.h"
+
+#ifdef CONFIG_GPIO_IRQ
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: hcs12_gpioirqinitialize
+ *
+ * Description:
+ * Initialize logic to support a second level of interrupt decoding for
+ * GPIO pins.
+ *
+ ****************************************************************************/
+
+void hcs12_gpioirqinitialize(void)
+{
+#warning "Not implemented"
+}
+
+/****************************************************************************
+ * Name: hcs12_gpioirqenable
+ *
+ * Description:
+ * Enable the interrupt for specified GPIO IRQ
+ *
+ ****************************************************************************/
+
+void hcs12_gpioirqenable(int irq)
+{
+#warning "Not implemented"
+}
+
+/****************************************************************************
+ * Name: hcs12_gpioirqdisable
+ *
+ * Description:
+ * Disable the interrupt for specified GPIO IRQ
+ *
+ ****************************************************************************/
+
+void hcs12_gpioirqdisable(int irq)
+{
+#warning "Not implemented"
+}
+
+#endif /* CONFIG_GPIO_IRQ */
+
diff --git a/nuttx/arch/hc/src/m9s12/m9s12_internal.h b/nuttx/arch/hc/src/m9s12/m9s12_internal.h
index 43d4188f2..643627f30 100755
--- a/nuttx/arch/hc/src/m9s12/m9s12_internal.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_internal.h
@@ -55,7 +55,132 @@
* Definitions
************************************************************************************/
-/* Configuration ********************************************************************/
+/* GPIO management macros:
+ *
+ * The GPIO configuration is represented by a 16-bit value encoded as follows:
+ *
+ * xxII OUUR DMGG GPPP
+ * || |||| ||| `-Pin number
+ * || |||| || `- Port number
+ * || |||| | `- PIM Ports
+ * || |||| `- Direction
+ * || |||`- Reduced drive
+ * || ||`- Polarity
+ * || |`- Pull up (or down)
+ * || `- Wired OR open drain
+ * |`- Interrupt or rising/falling (polarity)
+ * `- Interrupt
+ *
+ * NOTE: MEBI ports E and K can have special configurations as controlled by
+ * the PEAR and MODE registers. Those special configurations are not managed
+ * by the logic below; that logic is only intended to support general GPIO
+ * pin usage.
+ */
+
+/* Interrupts:
+ *
+ * xxII xxxx xxxx xxxx
+ *
+ * For PIM ports G, H, and J. NOTE: If pull up/down is also selected, then
+ * it must be consistent with the selected interrupt edge (because both are
+ * controlled by the same polarity register):
+ *
+ * Rising edge <-> Pull down
+ * Falling Edge <-> Pull up
+ *
+ * Selecting input also selects direction == input (it is unless to specify
+ * GPIO_INPUT and an error if GPIO_OUTPUT is also specified)
+ */
+
+#define GPIO_INT_SHIFT (12)
+#define GPIO_INT_MASK (3 << GPIO_PULLUP_SHIFT)
+# define GPIO_INT_POLARITY (1 << GPIO_PULLUP_SHIFT)
+# define GPIO_INT_ENABLE (2 << GPIO_PULLUP_SHIFT)
+# define GPIO_INT_FALLING (2 << GPIO_PULLUP_SHIFT)
+# define GPIO_INT_RISING (3 << GPIO_PULLUP_SHIFT)
+
+/* Wired OR open-drain:
+ *
+ * xxxx Oxxx xxxx xxxx
+ *
+ * Only PIM ports S and L
+ */
+
+#define GPIO_OPENDRAN (1 << 11)
+
+/* Pull up (or down):
+ *
+ * xxxx xUUx xxxx xxxx
+ *
+ * For PIM ports (T,S,G,H,J,L), selection is per-pin
+ * For MEBI ports (A,B,E,K), selection is per-port, polarity is ignored
+ */
+
+#define GPIO_PULLUP_SHIFT (9)
+#define GPIO_PULLUP_MASK (3 << GPIO_PULLUP_SHIFT)
+# define GPIO_PULL_POLARITY (1 << GPIO_PULLUP_SHIFT)
+# define GPIO_PULL_ENABLE (2 << GPIO_PULLUP_SHIFT)
+# define GPIO_PULLUP (2 << GPIO_PULLUP_SHIFT)
+# define GPIO_PULLDOWN (3 << GPIO_PULLUP_SHIFT)
+
+/* Reduced drive:
+ *
+ * xxxx xxxR xxxx xxxx
+ *
+ * For PIM ports (T,S,G,H,J,L), selection is per-pin
+ * For MEBI ports (A,B,E,K), selection is per-port
+ */
+
+#define GPIO_REDUCED (1 << 8)
+
+/* Data direction (All ports -- A,B,E,K,T,S,G,H,J,L)
+ *
+ * xxxx xxxx Dxxx xxxx
+ *
+ */
+
+#define GPIO_DIRECTION (1 << 7)
+# define GPIO_INPUT (0)
+# define GPIO_OUTPUT GPIO_DIRECTION
+
+/* Port selection
+ *
+ * xxxx xxxx xGGG Gxxx
+ *
+ * Ports A, B, E, and K reside in the MEBI block
+ * Ports T,S,G,H,J, and L reside in the PIM block.
+ */
+
+#define GPIO_PORT_SHIFT 3
+#define GPIO_PORT_MASK (15 << GPIO_PORT_SHIFT)
+# define GPIO_PORT_A (0 << GPIO_PORT_SHIFT)
+# define GPIO_PORT_B (1 << GPIO_PORT_SHIFT)
+# define GPIO_PORT_E (2 << GPIO_PORT_SHIFT)
+# define GPIO_PORT_K (3 << GPIO_PORT_SHIFT)
+
+# define GPIO_PORT_PIM (8 << GPIO_PORT_SHIFT)
+# define GPIO_PORT_T (8 << GPIO_PORT_SHIFT)
+# define GPIO_PORT_S (9 << GPIO_PORT_SHIFT
+# define GPIO_PORT_G (10 << GPIO_PORT_SHIFT)
+# define GPIO_PORT_H (11 << GPIO_PORT_SHIFT)
+# define GPIO_PORT_J (12 << GPIO_PORT_SHIFT)
+# define GPIO_PORT_L (13 << GPIO_PORT_SHIFT)
+
+/* Pin numbers
+ *
+ * xxxx xxxx xxxx xPPP
+ */
+
+#define GPIO_PIN_SHIFT (0)
+#define GPIO_PIN_MASK (7 << GPIO_PORT_SHIFT)
+# define GPIO_PIN_0 (0 << GPIO_PORT_SHIFT)
+# define GPIO_PIN_1 (1 << GPIO_PORT_SHIFT)
+# define GPIO_PIN_2 (2 << GPIO_PORT_SHIFT)
+# define GPIO_PIN_3 (3 << GPIO_PORT_SHIFT)
+# define GPIO_PIN_4 (4 << GPIO_PORT_SHIFT)
+# define GPIO_PIN_5 (5 << GPIO_PORT_SHIFT)
+# define GPIO_PIN_6 (6 << GPIO_PORT_SHIFT)
+# define GPIO_PIN_7 (7 << GPIO_PORT_SHIFT)
/************************************************************************************
* Inline Functions
@@ -80,6 +205,92 @@ extern "C" {
************************************************************************************/
/************************************************************************************
+ * Name: hcs12_gpioirqinitialize
+ *
+ * Description:
+ * Initialize logic to support a second level of interrupt decoding for GPIO pins.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_GPIO_IRQ
+EXTERN void hcs12_gpioirqinitialize(void);
+#else
+# define hcs12_gpioirqinitialize()
+#endif
+
+/************************************************************************************
+ * Name: hcs12_configgpio
+ *
+ * Description:
+ * Configure a GPIO pin based on bit-encoded description of the pin.
+ *
+ ************************************************************************************/
+
+EXTERN int hcs12_configgpio(uint16_t cfgset);
+
+/************************************************************************************
+ * Name: hcs12_gpiowrite
+ *
+ * Description:
+ * Write one or zero to the selected GPIO pin
+ *
+ ************************************************************************************/
+
+EXTERN void hcs12_gpiowrite(uint16_t pinset, bool value);
+
+/************************************************************************************
+ * Name: hcs12_gpioread
+ *
+ * Description:
+ * Read one or zero from the selected GPIO pin
+ *
+ ************************************************************************************/
+
+EXTERN bool hcs12_gpioread(uint16_t pinset);
+
+/************************************************************************************
+ * Name: hcs12_gpioirqenable
+ *
+ * Description:
+ * Enable the interrupt for specified GPIO IRQ
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_GPIO_IRQ
+EXTERN void hcs12_gpioirqenable(int irq);
+#else
+# define hcs12_gpioirqenable(irq)
+#endif
+
+/************************************************************************************
+ * Name: hcs12_gpioirqdisable
+ *
+ * Description:
+ * Disable the interrupt for specified GPIO IRQ
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_GPIO_IRQ
+EXTERN void hcs12_gpioirqdisable(int irq);
+#else
+# define hcs12_gpioirqdisable(irq)
+#endif
+
+/************************************************************************************
+ * Function: hcs12_dumpgpio
+ *
+ * Description:
+ * Dump all GPIO registers associated with the base address of the provided pinset.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_DEBUG_GPIO
+EXTERN int hcs12_dumpgpio(uint16_t pinset, const char *msg);
+#else
+# define hcs12_dumpgpio(p,m)
+#endif
+
+/************************************************************************************
* Function: hcs12_ethinitialize
*
* Description:
diff --git a/nuttx/arch/hc/src/m9s12/m9s12_irq.c b/nuttx/arch/hc/src/m9s12/m9s12_irq.c
index 1fb59d551..076ef0b3c 100755
--- a/nuttx/arch/hc/src/m9s12/m9s12_irq.c
+++ b/nuttx/arch/hc/src/m9s12/m9s12_irq.c
@@ -83,4 +83,18 @@ void up_irqinitialize(void)
/* currents_regs is non-NULL only while processing an interrupt */
current_regs = NULL;
+
+ /* Initialize logic to support a second level of interrupt decoding for
+ * GPIO pins.
+ */
+
+#ifdef CONFIG_GPIO_IRQ
+ lpc17_gpioirqinitialize();
+#endif
+
+ /* And finally, enable interrupts */
+
+#ifndef CONFIG_SUPPRESS_INTERRUPTS
+ irqrestore(0);
+#endif
}
diff --git a/nuttx/arch/hc/src/m9s12/m9s12_pim.h b/nuttx/arch/hc/src/m9s12/m9s12_pim.h
index 8b857fdb6..68b702382 100755
--- a/nuttx/arch/hc/src/m9s12/m9s12_pim.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_pim.h
@@ -98,6 +98,7 @@
#define HCS12_PIM_PORT_RDR(n) (HCS12_PIM_PORT_BASE(n) + HCS12_PIM_RDR_OFFSET)
#define HCS12_PIM_PORT_PER(n) (HCS12_PIM_PORT_BASE(n) + HCS12_PIM_PER_OFFSET)
#define HCS12_PIM_PORT_PS(n) (HCS12_PIM_PORT_BASE(n) + HCS12_PIM_PS_OFFSET)
+#define HCS12_PIM_PORT_WOM(n) (HCS12_PIM_PORT_BASE(n) + HCS12_PIM_WOM_OFFSET)
#define HCS12_PIM_PORT_IE(n) (HCS12_PIM_PORT_BASE(n) + HCS12_PIM_IE_OFFSET)
#define HCS12_PIM_PORT_IF(n) (HCS12_PIM_PORT_BASE(n) + HCS12_PIM_IF_OFFSET)