From 7acf0bff18188b350eaa3cdf74f83a45a88f677b Mon Sep 17 00:00:00 2001 From: Jinyan BAI Date: Tue, 11 Sep 2018 23:42:36 +0100 Subject: [PATCH] use non-ROM variant functions since the ROM ones are no longer supported in cc2640r2sdk --- arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.h b/arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.h index ce757eb50..8983051ce 100644 --- a/arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.h +++ b/arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.h @@ -54,12 +54,13 @@ #include /*---------------------------------------------------------------------------*/ #define gpio_hal_arch_interrupt_enable(p) interrupt_enable(p) -#define gpio_hal_arch_interrupt_disable(p) ti_lib_rom_ioc_int_disable(p) #ifdef ThisLibraryIsFor_CC26x0R2_HaltIfViolated +#define gpio_hal_arch_interrupt_disable(p) ti_lib_ioc_int_disable(p) #define gpio_hal_arch_pin_set_input(p) ti_lib_ioc_pin_type_gpio_input(p) #define gpio_hal_arch_pin_set_output(p) ti_lib_ioc_pin_type_gpio_output(p) #else +#define gpio_hal_arch_interrupt_disable(p) ti_lib_rom_ioc_int_disable(p) #define gpio_hal_arch_pin_set_input(p) ti_lib_rom_ioc_pin_type_gpio_input(p) #define gpio_hal_arch_pin_set_output(p) ti_lib_rom_ioc_pin_type_gpio_output(p) #endif @@ -79,6 +80,8 @@ interrupt_enable(gpio_hal_pin_t pin) ti_lib_gpio_clear_event_dio(pin); #ifndef ThisLibraryIsFor_CC26x0R2_HaltIfViolated ti_lib_rom_ioc_int_enable(pin); +#else + ti_lib_ioc_int_enable(pin) #endif } /*---------------------------------------------------------------------------*/