From 80c255f609d67004c15cad2ad1cca77b7fdf26a7 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 18 Dec 2014 15:19:16 -0600 Subject: Tiva: Change negative logic CONFIG_TIVA_DISABLE_GPIOx_IRQS to positive logic CONFIG_TIVA_GPIOx_IRQS --- nuttx/configs/dk-tm4c129x/README.txt | 25 ++++++----------------- nuttx/configs/dk-tm4c129x/nsh/defconfig | 30 ++++++++++++++-------------- nuttx/configs/dk-tm4c129x/src/tm4c_buttons.c | 2 +- 3 files changed, 22 insertions(+), 35 deletions(-) (limited to 'nuttx/configs/dk-tm4c129x') diff --git a/nuttx/configs/dk-tm4c129x/README.txt b/nuttx/configs/dk-tm4c129x/README.txt index d4a6d217e..166392d12 100644 --- a/nuttx/configs/dk-tm4c129x/README.txt +++ b/nuttx/configs/dk-tm4c129x/README.txt @@ -448,25 +448,12 @@ DK-TM4129X Configuration Options the delay actually is 100 seconds. There are configurations for disabling support for interrupts GPIO ports. - GPIOJ must be disabled because it does not exist on the TM4C129x. - Additional interrupt support can be disabled if desired to reduce memory - footprint. - - CONFIG_TIVA_DISABLE_GPIOA_IRQS=n - CONFIG_TIVA_DISABLE_GPIOB_IRQS=n - CONFIG_TIVA_DISABLE_GPIOC_IRQS=n - CONFIG_TIVA_DISABLE_GPIOD_IRQS=n - CONFIG_TIVA_DISABLE_GPIOE_IRQS=n - CONFIG_TIVA_DISABLE_GPIOF_IRQS=n - CONFIG_TIVA_DISABLE_GPIOG_IRQS=n - CONFIG_TIVA_DISABLE_GPIOH_IRQS=n - CONFIG_TIVA_DISABLE_GPIOJ_IRQS=n - CONFIG_TIVA_DISABLE_GPIOK_IRQS=n - CONFIG_TIVA_DISABLE_GPIOL_IRQS=n - CONFIG_TIVA_DISABLE_GPIOM_IRQS=n - CONFIG_TIVA_DISABLE_GPION_IRQS=n - CONFIG_TIVA_DISABLE_GPIOP_IRQS=n - CONFIG_TIVA_DISABLE_GPIOQ_IRQS=n + Only GPIOP and GPIOQ pins can be used as interrupting sources on the + TM4C129x. Additional interrupt support can be disabled if desired to + reduce memory footprint. + + CONFIG_TIVA_GPIOP_IRQS=y + CONFIG_TIVA_GPIOQ_IRQS=y TM4C129x specific device driver settings diff --git a/nuttx/configs/dk-tm4c129x/nsh/defconfig b/nuttx/configs/dk-tm4c129x/nsh/defconfig index f4dea412e..15ff8e991 100644 --- a/nuttx/configs/dk-tm4c129x/nsh/defconfig +++ b/nuttx/configs/dk-tm4c129x/nsh/defconfig @@ -164,21 +164,21 @@ CONFIG_SSI1_DISABLE=y # # Disable GPIO Interrupts # -# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set -# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set -# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set -# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set -# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set -# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set -# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set -CONFIG_TIVA_DISABLE_GPIOH_IRQS=y -CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y -# CONFIG_TIVA_DISABLE_GPIOK_IRQS is not set -# CONFIG_TIVA_DISABLE_GPIOL_IRQS is not set -# CONFIG_TIVA_DISABLE_GPIOM_IRQS is not set -# CONFIG_TIVA_DISABLE_GPION_IRQS is not set -# CONFIG_TIVA_DISABLE_GPIOP_IRQS is not set -# CONFIG_TIVA_DISABLE_GPIOQ_IRQS is not set +# CONFIG_TIVA_GPIOA_IRQS is not set +# CONFIG_TIVA_GPIOB_IRQS is not set +# CONFIG_TIVA_GPIOC_IRQS is not set +# CONFIG_TIVA_GPIOD_IRQS is not set +# CONFIG_TIVA_GPIOE_IRQS is not set +# CONFIG_TIVA_GPIOF_IRQS is not set +# CONFIG_TIVA_GPIOG_IRQS is not set +# CONFIG_TIVA_GPIOH_IRQS is not set +# CONFIG_TIVA_GPIOJ_IRQS is not set +# CONFIG_TIVA_GPIOK_IRQS is not set +# CONFIG_TIVA_GPIOL_IRQS is not set +# CONFIG_TIVA_GPIOM_IRQS is not set +# CONFIG_TIVA_GPION_IRQS is not set +CONFIG_TIVA_GPIOP_IRQS=y +# CONFIG_TIVA_GPIOQ_IRQS is not set # # Architecture Options diff --git a/nuttx/configs/dk-tm4c129x/src/tm4c_buttons.c b/nuttx/configs/dk-tm4c129x/src/tm4c_buttons.c index 118dcc64b..479de4758 100644 --- a/nuttx/configs/dk-tm4c129x/src/tm4c_buttons.c +++ b/nuttx/configs/dk-tm4c129x/src/tm4c_buttons.c @@ -148,7 +148,7 @@ uint8_t board_buttons(void) * ************************************************************************************/ -#if defined(CONFIG_ARCH_IRQBUTTONS) && !defined(CONFIG_TIVA_DISABLE_GPIOP_IRQS) +#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_TIVA_GPIOP_IRQS) xcpt_t board_button_irq(int id, xcpt_t irqhandler) { static xcpt_t handler = NULL; -- cgit v1.2.3