diff options
-rw-r--r-- | nuttx/arch/arm/include/tiva/irq.h | 32 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/tiva_gpio.h | 35 |
2 files changed, 34 insertions, 33 deletions
diff --git a/nuttx/arch/arm/include/tiva/irq.h b/nuttx/arch/arm/include/tiva/irq.h index 5c7b5fa70..fd2b21cbd 100644 --- a/nuttx/arch/arm/include/tiva/irq.h +++ b/nuttx/arch/arm/include/tiva/irq.h @@ -41,7 +41,6 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <nuttx/irq.h> #include <arch/tiva/chip.h> /************************************************************************************ @@ -467,37 +466,6 @@ extern "C" * Public Functions ************************************************************************************/ -/**************************************************************************** - * Name: gpio_irqattach - * - * Description: - * Attach the interrupt handler 'isr' to the GPIO IRQ 'irq' - * - ****************************************************************************/ - -int gpio_irqattach(int irq, xcpt_t isr); -#define gpio_irqdetach(isr) gpio_irqattach(isr, NULL) - -/**************************************************************************** - * Name: gpio_irqenable - * - * Description: - * Enable the GPIO IRQ specified by 'irq' - * - ****************************************************************************/ - -void gpio_irqenable(int irq); - -/**************************************************************************** - * Name: gpio_irqdisable - * - * Description: - * Disable the GPIO IRQ specified by 'irq' - * - ****************************************************************************/ - -void gpio_irqdisable(int irq); - #ifdef __cplusplus } #endif diff --git a/nuttx/arch/arm/src/tiva/tiva_gpio.h b/nuttx/arch/arm/src/tiva/tiva_gpio.h index 5e194aac2..4f8327655 100644 --- a/nuttx/arch/arm/src/tiva/tiva_gpio.h +++ b/nuttx/arch/arm/src/tiva/tiva_gpio.h @@ -1,7 +1,7 @@ /************************************************************************************ * arch/arm/src/tiva/tiva_gpio.h * - * Copyright (C) 2009-2010, 2013-2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2009-2010, 2013-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -46,6 +46,8 @@ #include <stdint.h> #include <stdbool.h> +#include <nuttx/irq.h> + #include "up_internal.h" #include "chip.h" @@ -271,6 +273,37 @@ int tiva_dumpgpio(uint32_t pinset, const char *msg); int weak_function gpio_irqinitialize(void); +/**************************************************************************** + * Name: gpio_irqattach + * + * Description: + * Attach the interrupt handler 'isr' to the GPIO IRQ 'irq' + * + ****************************************************************************/ + +int gpio_irqattach(int irq, xcpt_t isr); +#define gpio_irqdetach(isr) gpio_irqattach(isr, NULL) + +/**************************************************************************** + * Name: gpio_irqenable + * + * Description: + * Enable the GPIO IRQ specified by 'irq' + * + ****************************************************************************/ + +void gpio_irqenable(int irq); + +/**************************************************************************** + * Name: gpio_irqdisable + * + * Description: + * Disable the GPIO IRQ specified by 'irq' + * + ****************************************************************************/ + +void gpio_irqdisable(int irq); + #if defined(__cplusplus) } #endif |