summaryrefslogtreecommitdiff
path: root/irmp.h
diff options
context:
space:
mode:
Diffstat (limited to 'irmp.h')
-rw-r--r--irmp.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/irmp.h b/irmp.h
index 3efc62c..c0b3c18 100644
--- a/irmp.h
+++ b/irmp.h
@@ -63,17 +63,15 @@
# warning The STM32 port of IRMP uses the ST standard peripheral drivers which are not enabled in your build configuration.
# endif
-#elif defined (ARM_OPENCM3)
+#elif defined (LIBOPENCM3)
# define _CONCAT(a,b) a##b
# define CONCAT(a,b) _CONCAT(a,b)
# define IRMP_PORT CONCAT(GPIO, IRMP_PORT_LETTER)
-# define IRMP_PORT_RCC CONCAT(RCC_GPIO, IRMP_PORT_LETTER)
+# define IRMP_PORT_RCC CONCAT(RCC_GPIO, IRMP_PORT_LETTER)
-# define IRMP_BIT IRMP_BIT_NUMBER
+# define IRMP_BIT CONCAT(GPIO, IRMP_BIT_NUMBER)
# define IRMP_PIN IRMP_PORT // for use with input(x) below
-# define input(x) ((GPIO_IDR(IRMP_PORT) & (1<<IRMP_BIT)) != 0)
-//# define input(x) (BBIO_PERIPH(IRMP_PORT+IDR, IRMP_BIT))
-# define IRMP_TIMER CONCAT(TIM, IRMP_TIMER_NUMBER)
+# define input(x) ((GPIO_IDR(x) & IRMP_BIT) != 0)
#elif defined (STELLARIS_ARM_CORTEX_M4)
# define _CONCAT(a,b) a##b