You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by je...@apache.org on 2018/12/20 09:38:42 UTC

[mynewt-core] branch master updated: Make hal_gpio_irq_release() pass 'pin' to hal_gpio_irq_disable()

This is an automated email from the ASF dual-hosted git repository.

jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git


The following commit(s) were added to refs/heads/master by this push:
     new e94e607  Make hal_gpio_irq_release() pass 'pin' to hal_gpio_irq_disable()
e94e607 is described below

commit e94e60773cc26b536c63371a16468f34a67eb6e7
Author: Randall Leberknight <ra...@pax.com>
AuthorDate: Wed Dec 19 16:12:53 2018 -0800

    Make hal_gpio_irq_release() pass 'pin' to hal_gpio_irq_disable()
---
 hw/mcu/nordic/nrf51xxx/src/hal_gpio.c        | 2 +-
 hw/mcu/nordic/nrf52xxx-compat/src/hal_gpio.c | 2 +-
 hw/mcu/nordic/nrf52xxx/src/hal_gpio.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/mcu/nordic/nrf51xxx/src/hal_gpio.c b/hw/mcu/nordic/nrf51xxx/src/hal_gpio.c
index 67e1f19..81b4946 100644
--- a/hw/mcu/nordic/nrf51xxx/src/hal_gpio.c
+++ b/hw/mcu/nordic/nrf51xxx/src/hal_gpio.c
@@ -289,7 +289,7 @@ hal_gpio_irq_release(int pin)
     if (i < 0) {
         return;
     }
-    hal_gpio_irq_disable(i);
+    hal_gpio_irq_disable(pin);
 
     NRF_GPIOTE->CONFIG[i] = 0;
     NRF_GPIOTE->EVENTS_IN[i] = 0;
diff --git a/hw/mcu/nordic/nrf52xxx-compat/src/hal_gpio.c b/hw/mcu/nordic/nrf52xxx-compat/src/hal_gpio.c
index 707e0b6..253ce15 100644
--- a/hw/mcu/nordic/nrf52xxx-compat/src/hal_gpio.c
+++ b/hw/mcu/nordic/nrf52xxx-compat/src/hal_gpio.c
@@ -343,7 +343,7 @@ hal_gpio_irq_release(int pin)
     if (i < 0) {
         return;
     }
-    hal_gpio_irq_disable(i);
+    hal_gpio_irq_disable(pin);
 
     NRF_GPIOTE->CONFIG[i] = 0;
     NRF_GPIOTE->EVENTS_IN[i] = 0;
diff --git a/hw/mcu/nordic/nrf52xxx/src/hal_gpio.c b/hw/mcu/nordic/nrf52xxx/src/hal_gpio.c
index 707e0b6..253ce15 100644
--- a/hw/mcu/nordic/nrf52xxx/src/hal_gpio.c
+++ b/hw/mcu/nordic/nrf52xxx/src/hal_gpio.c
@@ -343,7 +343,7 @@ hal_gpio_irq_release(int pin)
     if (i < 0) {
         return;
     }
-    hal_gpio_irq_disable(i);
+    hal_gpio_irq_disable(pin);
 
     NRF_GPIOTE->CONFIG[i] = 0;
     NRF_GPIOTE->EVENTS_IN[i] = 0;