Kinetis GPIO: Pin IRQ logic no longer returns the xcpt_t oldhandler. There value is useless and dangerous after the recent changes to interrupt argument passing.

arch/arm/src/kinetis/kinetis.h

@@ -568,19 +568,17 @@ void kinetis_pinirqinitialize(void);
  *   3. Call kinetis_pinirqenable() to enable interrupts on the pin.
  *
  * Parameters:
- *  pinset -  Pin configuration
+ *   pinset -  Pin configuration
- *  pinisr -:wq
+ *   pinisr -  Pin interrupt service routine
-:wq:  Pin interrupt service routine
+ *   arg    -  An argument that will be provided to the interrupt service routine.
- *  arg:r  -   And argument that will be provided to the interrupt service routine.
  *
  * Return Value:
- *   The previous value of the interrupt handler function pointer.  This value may,
+ *   Zero (OK) is returned on success; a negated errno value is returned on any
- *   for example, be used to restore the previous handler when multiple handlers are
+ *   failure to indicate the nature of the failure.
- *   used.
  *
  ************************************************************************************/
 
-xcpt_t kinetis_pinirqattach(uint32_t pinset, xcpt_t pinisr, void *arg);
+int kinetis_pinirqattach(uint32_t pinset, xcpt_t pinisr, void *arg);
 
 /************************************************************************************
  * Name: kinetis_pinirqenable

arch/arm/src/kinetis/kinetis_pinirq.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  *  arch/arm/src/kinetis/kinetis_pinirq.c
  *
- *   Copyright (C) 2011, 2013, 2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013, 2016-2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -262,21 +262,20 @@ void kinetis_pinirqinitialize(void)
  *   3. Call kinetis_pinirqenable() to enable interrupts on the pin.
  *
  * Parameters:
- *  - pinset:  Pin configuration
+ *   pinset - Pin configuration
- *  - pinisr:  Pin interrupt service routine
+ *   pinisr - Pin interrupt service routine
+ *   arg    - An argument that will be provided to the interrupt service routine.
  *
  * Returns:
- *   The previous value of the interrupt handler function pointer.  This
+ *   Zero (OK) is returned on success; a negated errno value is returned on any
- *   value may, for example, be used to restore the previous handler whe
+ *   failure to indicate the nature of the failure.
- *   multiple handlers are used.
  *
- ****************************************************************************/
+ ************************************************************************************/
 
-xcpt_t kinetis_pinirqattach(uint32_t pinset, xcpt_t pinisr, void *arg)
+int kinetis_pinirqattach(uint32_t pinset, xcpt_t pinisr, void *arg)
 {
 #ifdef HAVE_PORTINTS
   struct kinetis_pinirq_s *isrtab;
-  xcpt_t oldisr;
   irqstate_t flags;
   unsigned int port;
   unsigned int pin;
@@ -331,16 +330,15 @@ xcpt_t kinetis_pinirqattach(uint32_t pinset, xcpt_t pinisr, void *arg)
 
    /* Get the old PIN ISR and set the new PIN ISR */
 
-   oldisr              = isrtab[pin].handler;
    isrtab[pin].handler = pinisr;
    isrtab[pin].arg     = arg;
 
    /* And return the old PIN isr address */
 
    leave_critical_section(flags);
-   return oldisr;
+   return OK;
 #else
-   return NULL;
+   return -ENOSYS;
 #endif /* HAVE_PORTINTS */
 }
 

configs/freedom-k64f/src/k64_sdhc.c

@@ -169,7 +169,7 @@ int k64_sdhc_initialize(void)
 
   /* Attached the card detect interrupt (but don't enable it yet) */
 
-  kinetis_pinirqattach(GPIO_SD_CARDDETECT, k64_cdinterrupt, NULL);
+  (void)kinetis_pinirqattach(GPIO_SD_CARDDETECT, k64_cdinterrupt, NULL);
 
   /* Configure the write protect GPIO -- None */
 

configs/freedom-k66f/src/k66_buttons.c

@@ -139,7 +139,6 @@ uint8_t board_buttons(void)
 #ifdef CONFIG_ARCH_IRQBUTTONS
 xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
-  xcpt_t oldhandler;
   uint32_t pinset;
 
   /* Map the button id to the GPIO bit set. */
@@ -163,12 +162,12 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
    * Attach the new button handler.
    */
 
-  oldhandler = kinetis_pinirqattach(pinset, irqhandler, NULL);
+  (void)kinetis_pinirqattach(pinset, irqhandler, NULL);
 
   /* Then make sure that interrupts are enabled on the pin */
 
   kinetis_pinirqenable(pinset);
-  return oldhandler;
+  return NULL;
 }
 #endif
 #endif /* CONFIG_ARCH_BUTTONS */

configs/freedom-k66f/src/k66_sdhc.c

@@ -170,7 +170,7 @@ int k66_sdhc_initialize(void)
 
   /* Attached the card detect interrupt (but don't enable it yet) */
 
-  kinetis_pinirqattach(GPIO_SD_CARDDETECT, k66_cdinterrupt, NULL);
+  (void)kinetis_pinirqattach(GPIO_SD_CARDDETECT, k66_cdinterrupt, NULL);
 
   /* Configure the write protect GPIO -- None */
 

configs/kwikstik-k40/src/k40_appinit.c

@@ -217,7 +217,7 @@ int board_app_initialize(uintptr_t arg)
   /* Attached the card detect interrupt (but don't enable it yet) */
 
   kinetis_pinconfig(GPIO_SD_CARDDETECT);
-  kinetis_pinirqattach(GPIO_SD_CARDDETECT, kinetis_cdinterrupt, NULL);
+  (void)kinetis_pinirqattach(GPIO_SD_CARDDETECT, kinetis_cdinterrupt, NULL);
 
   /* Mount the SDHC-based MMC/SD block driver */
   /* First, get an instance of the SDHC interface */

configs/twr-k60n512/src/k60_appinit.c

@@ -224,7 +224,7 @@ int board_app_initialize(uintptr_t arg)
   /* Attached the card detect interrupt (but don't enable it yet) */
 
   kinetis_pinconfig(GPIO_SD_CARDDETECT);
-  kinetis_pinirqattach(GPIO_SD_CARDDETECT, kinetis_cdinterrupt, NULL);
+  (void)kinetis_pinirqattach(GPIO_SD_CARDDETECT, kinetis_cdinterrupt, NULL);
 
   /* Configure the write protect GPIO */
 

configs/twr-k64f120m/src/k64_sdhc.c

@@ -166,7 +166,7 @@ int k64_sdhc_initialize(void)
 
   /* Attached the card detect interrupt (but don't enable it yet) */
 
-  kinetis_pinirqattach(GPIO_SD_CARDDETECT, k64_cdinterrupt, NULL);
+  (void)kinetis_pinirqattach(GPIO_SD_CARDDETECT, k64_cdinterrupt, NULL);
 
   /* Configure the write protect GPIO -- None */