From 5c23099eed6f447b6edaeb1130ff6fd94d394e36 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Tue, 11 Dec 2018 15:06:53 -0800 Subject: [PATCH] board_button_irq: API change in upstream --- boards/px4/cannode-v1/src/buttons.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/boards/px4/cannode-v1/src/buttons.c b/boards/px4/cannode-v1/src/buttons.c index 87108edd8d..4fbf4d3f9c 100644 --- a/boards/px4/cannode-v1/src/buttons.c +++ b/boards/px4/cannode-v1/src/buttons.c @@ -68,7 +68,6 @@ * Public Functions ****************************************************************************/ void board_button_initialize(void); -xcpt_t board_button_irq(int id, xcpt_t irqhandler); /**************************************************************************** * Button support. * @@ -137,17 +136,17 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -xcpt_t board_button_irq(int id, xcpt_t irqhandler) +int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) { - xcpt_t oldhandler = NULL; + int ret = -EINVAL; /* The following should be atomic */ if (id == IRQBUTTON) { - oldhandler = stm32_gpiosetevent(BUTTON_BOOT0n, true, true, true, irqhandler); + ret = stm32_gpiosetevent(BUTTON_BOOT0n, true, true, true, irqhandler, arg); } - return oldhandler; + return ret; } #endif #endif /* CONFIG_ARCH_BUTTONS */