Version 2.8.0: port to AVR XMEGA

[irmp.git] / irmp.h

diff --git a/irmp.h b/irmp.h
index 2ff7766c2fc4e0e2dfd2f98fe3499740b1227765..f662fe1269791bd3863fc6bfd065cd4b87825be3 100644 (file)
--- a/irmp.h
+++ b/irmp.h
@@ -1,11 +1,9 @@
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * irmp.h\r
  *\r
- * Copyright (c) 2009-2013 Frank Meyer - frank(at)fli4l.de\r
+ * Copyright (c) 2009-2015 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.h,v 1.85 2014/06/05 21:00:06 fm Exp $\r
- *\r
- * ATMEGA88 @ 8 MHz\r
+ * $Id: irmp.h,v 1.93 2015/02/26 15:42:53 fm Exp $\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -23,7 +21,19 @@
 #  include "irmpconfig.h"\r
 #endif\r
 \r
-#if defined (ATMEL_AVR)\r
+#if defined (__AVR_XMEGA__)\r
+#  define _CONCAT(a,b)                          a##b\r
+#  define CONCAT(a,b)                           _CONCAT(a,b)\r
+#  define IRMP_PORT_PRE                         CONCAT(PORT, IRMP_PORT_LETTER)\r
+#  define IRMP_DDR_PRE                          CONCAT(DDR, IRMP_PORT_LETTER)\r
+#  define IRMP_PIN_PRE                          CONCAT(PIN, IRMP_PORT_LETTER)\r
+#  define IRMP_PORT                             IRMP_PORT_PRE.OUT\r
+#  define IRMP_DDR                              IRMP_DDR_PRE.DIR\r
+#  define IRMP_PIN                              IRMP_PIN_PRE.IN\r
+#  define IRMP_BIT                              IRMP_BIT_NUMBER\r
+#  define input(x)                              ((x) & (1 << IRMP_BIT))\r
+\r
+#elif defined (ATMEL_AVR)\r
 #  define _CONCAT(a,b)                          a##b\r
 #  define CONCAT(a,b)                           _CONCAT(a,b)\r
 #  define IRMP_PORT                             CONCAT(PORT, IRMP_PORT_LETTER)\r
@@ -31,10 +41,10 @@
 #  define IRMP_PIN                              CONCAT(PIN, IRMP_PORT_LETTER)\r
 #  define IRMP_BIT                              IRMP_BIT_NUMBER\r
 #  define input(x)                              ((x) & (1 << IRMP_BIT))\r
-#elif defined (PIC_C18)\r
-#  define input(x)                              (x)\r
-#elif defined (PIC_CCS)\r
+\r
+#elif defined (PIC_C18) || defined (PIC_CCS)\r
 #  define input(x)                              (x)\r
+\r
 #elif defined (ARM_STM32)\r
 #  define _CONCAT(a,b)                          a##b\r
 #  define CONCAT(a,b)                           _CONCAT(a,b)\r
@@ -52,6 +62,7 @@
 #  ifndef USE_STDPERIPH_DRIVER\r
 #    warning The STM32 port of IRMP uses the ST standard peripheral drivers which are not enabled in your build configuration.\r
 #  endif\r
+\r
 #elif defined (STELLARIS_ARM_CORTEX_M4)\r
 #  define _CONCAT(a,b)                          a##b\r
 #  define CONCAT(a,b)                           _CONCAT(a,b)\r
@@ -61,6 +72,7 @@
 #  define IRMP_PIN                              IRMP_PORT_PIN\r
 #  define input(x)                              ((uint8_t)(ROM_GPIOPinRead(IRMP_PORT_BASE, IRMP_PORT_PIN)))\r
 #  define sei()                                 IntMasterEnable()\r
+\r
 #endif\r
 \r
 #if IRMP_SUPPORT_DENON_PROTOCOL == 1 && IRMP_SUPPORT_RUWIDO_PROTOCOL == 1\r
@@ -128,6 +140,12 @@
 #  define IRMP_SUPPORT_LEGO_PROTOCOL            0\r
 #endif\r
 \r
+#if IRMP_SUPPORT_SAMSUNG48_PROTOCOL == 1 && IRMP_SUPPORT_SAMSUNG_PROTOCOL == 0\r
+#  warning SAMSUNG48 protocol needs also SAMSUNG protocol, SAMSUNG protocol enabled\r
+#  undef IRMP_SUPPORT_SAMSUNG_PROTOCOL\r
+#  define IRMP_SUPPORT_SAMSUNG_PROTOCOL         1\r
+#endif\r
+\r
 #if IRMP_SUPPORT_JVC_PROTOCOL == 1 && IRMP_SUPPORT_NEC_PROTOCOL == 0\r
 #  warning JVC protocol needs also NEC protocol, NEC protocol enabled\r
 #  undef IRMP_SUPPORT_NEC_PROTOCOL\r
@@ -167,16 +185,15 @@
 #define IRMP_FLAG_REPETITION            0x01\r
 \r
 extern void                             irmp_init (void);\r
-extern uint8_t                          irmp_get_data (IRMP_DATA *);\r
-extern uint8_t                          irmp_is_busy (void);\r
-extern uint8_t                          irmp_ISR (void);\r
+extern uint_fast8_t                     irmp_get_data (IRMP_DATA *);\r
+extern uint_fast8_t                     irmp_ISR (void);\r
 \r
 #if IRMP_PROTOCOL_NAMES == 1\r
-extern char *                           irmp_protocol_names[IRMP_N_PROTOCOLS + 1];\r
+extern const char * const               irmp_protocol_names[IRMP_N_PROTOCOLS + 1] PROGMEM;\r
 #endif\r
 \r
 #if IRMP_USE_CALLBACK == 1\r
-extern void                             irmp_set_callback_ptr (void (*cb)(uint8_t));\r
+extern void                             irmp_set_callback_ptr (void (*cb)(uint_fast8_t));\r
 #endif // IRMP_USE_CALLBACK == 1\r
 \r
 #endif /* _IRMP_H_ */\r