sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename HC version of CONFIG_GPIO_IRQ to CONFIG_HCS12_GPIOIRQ

Browse Source
This commit is contained in:
Gregory Nutt 2016-07-22 14:46:54 -06:00
parent e6137ff129
commit c00ad93165
6 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/hc/src/m9s12/Kconfig
View File

@ -40,4 +40,11 @@ config HCS12_NONBANKED
in memory. in memory.
endmenu # HSC12 Build Options endmenu # HSC12 Build Options
config HCS12_GPIOIRQ
bool "GPIO interrupt support"
default n
---help---
Enable support for GPIO interrupts
endif # ARCH_HSC12 endif # ARCH_HSC12

4
arch/hc/src/m9s12/m9s12.h
View File

@ -266,7 +266,7 @@ bool hcs12_gpioread(uint16_t pinset);
* *
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_GPIO_IRQ #ifdef CONFIG_HCS12_GPIOIRQ
void hcs12_gpioirqenable(int irq); void hcs12_gpioirqenable(int irq);
#else #else
# define hcs12_gpioirqenable(irq) # define hcs12_gpioirqenable(irq)
@ -280,7 +280,7 @@ void hcs12_gpioirqenable(int irq);
* *
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_GPIO_IRQ #ifdef CONFIG_HCS12_GPIOIRQ
void hcs12_gpioirqdisable(int irq); void hcs12_gpioirqdisable(int irq);
#else #else
# define hcs12_gpioirqdisable(irq) # define hcs12_gpioirqdisable(irq)

20
arch/hc/src/m9s12/m9s12_gpioirq.c
View File

@ -75,7 +75,7 @@
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_GPIO_IRQ #ifdef CONFIG_HCS12_GPIOIRQ
static int hcs12_mapirq(int irq, uint16_t *regaddr, uint8_t *pin) static int hcs12_mapirq(int irq, uint16_t *regaddr, uint8_t *pin)
{ {
if (irq >= HCC12_IRQ_PGFIRST) if (irq >= HCC12_IRQ_PGFIRST)
@ -121,7 +121,7 @@ static int hcs12_mapirq(int irq, uint16_t *regaddr, uint8_t *pin)
} }
return -EINVAL; return -EINVAL;
} }
#endif /* CONFIG_GPIO_IRQ */ #endif /* CONFIG_HCS12_GPIOIRQ */
/**************************************************************************** /****************************************************************************
* Name: up_gpioa/b/cinterrupt * Name: up_gpioa/b/cinterrupt
@ -131,7 +131,7 @@ static int hcs12_mapirq(int irq, uint16_t *regaddr, uint8_t *pin)
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_GPIO_IRQ #ifdef CONFIG_HCS12_GPIOIRQ
static int hcs12_interrupt(uint16_t base, int irq0, uint8_t valid, void *context) static int hcs12_interrupt(uint16_t base, int irq0, uint8_t valid, void *context)
{ {
uint8_t pending; uint8_t pending;
@ -204,7 +204,7 @@ static int hcs12_pjinterrupt(int irq, void *context)
HCS12_IRQ_PJSET, context); HCS12_IRQ_PJSET, context);
} }
#endif #endif
#endif /* CONFIG_GPIO_IRQ */ #endif /* CONFIG_HCS12_GPIOIRQ */
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
@ -229,7 +229,7 @@ void hcs12_gpioirqinitialize(void)
/* Attach GPIO IRQ interrupt handlers */ /* Attach GPIO IRQ interrupt handlers */
#ifdef CONFIG_GPIO_IRQ #ifdef CONFIG_HCS12_GPIOIRQ
# ifdef CONFIG_HCS12_PORTG_INTS # ifdef CONFIG_HCS12_PORTG_INTS
irq_attach(HCS12_IRQ_VPORTG, hcs12_pginterrupt); irq_attach(HCS12_IRQ_VPORTG, hcs12_pginterrupt);
# endif # endif
@ -239,7 +239,7 @@ void hcs12_gpioirqinitialize(void)
# ifdef CONFIG_HCS12_PORTJ_INTS # ifdef CONFIG_HCS12_PORTJ_INTS
irq_attach(HCS12_IRQ_VPORTJ, hcs12_pjinterrupt); irq_attach(HCS12_IRQ_VPORTJ, hcs12_pjinterrupt);
# endif # endif
#endif /* CONFIG_GPIO_IRQ */ #endif /* CONFIG_HCS12_GPIOIRQ */
} }
/**************************************************************************** /****************************************************************************
@ -250,7 +250,7 @@ void hcs12_gpioirqinitialize(void)
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_GPIO_IRQ #ifdef CONFIG_HCS12_GPIOIRQ
void hcs12_gpioirqenable(int irq) void hcs12_gpioirqenable(int irq)
{ {
uint16_t regaddr; uint16_t regaddr;
@ -265,7 +265,7 @@ void hcs12_gpioirqenable(int irq)
leave_critical_section(flags); leave_critical_section(flags);
} }
} }
#endif /* CONFIG_GPIO_IRQ */ #endif /* CONFIG_HCS12_GPIOIRQ */
/**************************************************************************** /****************************************************************************
* Name: hcs12_gpioirqdisable * Name: hcs12_gpioirqdisable
@ -275,7 +275,7 @@ void hcs12_gpioirqenable(int irq)
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_GPIO_IRQ #ifdef CONFIG_HCS12_GPIOIRQ
void hcs12_gpioirqdisable(int irq) void hcs12_gpioirqdisable(int irq)
{ {
uint16_t regaddr; uint16_t regaddr;
@ -290,5 +290,5 @@ void hcs12_gpioirqdisable(int irq)
leave_critical_section(flags); leave_critical_section(flags);
} }
} }
#endif /* CONFIG_GPIO_IRQ */ #endif /* CONFIG_HCS12_GPIOIRQ */

2
arch/hc/src/m9s12/m9s12_irq.c
View File

@ -75,7 +75,7 @@ void up_irqinitialize(void)
* GPIO pins. * GPIO pins.
*/ */
#ifdef CONFIG_GPIO_IRQ #ifdef CONFIG_HCS12_GPIOIRQ
hcs12_gpioirqinitialize(); hcs12_gpioirqinitialize();
#endif #endif

2
configs/demo9s12ne64/README.txt
View File

@ -315,7 +315,7 @@ HCS12/DEMO9S12NEC64-specific Configuration Options
GPIO Interrupts GPIO Interrupts
CONFIG_GPIO_IRQ - Enable general support for GPIO IRQs CONFIG_HCS12_GPIOIRQ - Enable general support for GPIO IRQs
CONFIG_HCS12_PORTG_INTS - Enable PortG IRQs CONFIG_HCS12_PORTG_INTS - Enable PortG IRQs
CONFIG_HCS12_PORTH_INTS - Enable PortH IRQs CONFIG_HCS12_PORTH_INTS - Enable PortH IRQs
CONFIG_HCS12_PORTJ_INTS - Enable PortJ IRQs CONFIG_HCS12_PORTJ_INTS - Enable PortJ IRQs

2
configs/ne64badge/README.txt
View File

@ -422,7 +422,7 @@ HCS12/NE64BADGE-specific Configuration Options
GPIO Interrupts GPIO Interrupts
CONFIG_GPIO_IRQ - Enable general support for GPIO IRQs CONFIG_HCS12_GPIOIRQ - Enable general support for GPIO IRQs
CONFIG_HCS12_PORTG_INTS - Enable PortG IRQs CONFIG_HCS12_PORTG_INTS - Enable PortG IRQs
CONFIG_HCS12_PORTH_INTS - Enable PortH IRQs CONFIG_HCS12_PORTH_INTS - Enable PortH IRQs
CONFIG_HCS12_PORTJ_INTS - Enable PortJ IRQs CONFIG_HCS12_PORTJ_INTS - Enable PortJ IRQs