X-Git-Url: http://cloudbase.mooo.com/gitweb/irmp.git/blobdiff_plain/ad4d3d4157a9781b6ff3f83ac72b42f8bc3db0b5..aa276d72956b9c9938dd8d34529276d7f1631b93:/irmp.h

diff --git a/irmp.h b/irmp.h
index f662fe1..fd027b9 100644
--- a/irmp.h
+++ b/irmp.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2009-2015 Frank Meyer - frank(at)fli4l.de
  *
- * $Id: irmp.h,v 1.93 2015/02/26 15:42:53 fm Exp $
+ * $Id: irmp.h,v 1.98 2015/11/10 08:39:27 fm Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,8 +25,8 @@
 #  define _CONCAT(a,b)                          a##b
 #  define CONCAT(a,b)                           _CONCAT(a,b)
 #  define IRMP_PORT_PRE                         CONCAT(PORT, IRMP_PORT_LETTER)
-#  define IRMP_DDR_PRE                          CONCAT(DDR, IRMP_PORT_LETTER)
-#  define IRMP_PIN_PRE                          CONCAT(PIN, IRMP_PORT_LETTER)
+#  define IRMP_DDR_PRE                          CONCAT(PORT, IRMP_PORT_LETTER)
+#  define IRMP_PIN_PRE                          CONCAT(PORT, IRMP_PORT_LETTER)
 #  define IRMP_PORT                             IRMP_PORT_PRE.OUT
 #  define IRMP_DDR                              IRMP_DDR_PRE.DIR
 #  define IRMP_PIN                              IRMP_PIN_PRE.IN
@@ -73,6 +73,18 @@
 #  define input(x)                              ((uint8_t)(ROM_GPIOPinRead(IRMP_PORT_BASE, IRMP_PORT_PIN)))
 #  define sei()                                 IntMasterEnable()
 
+#elif defined(__SDCC_stm8)
+#  define _CONCAT(a,b)                          a##b
+#  define CONCAT(a,b)                           _CONCAT(a,b)
+#  define IRMP_GPIO_STRUCT                      CONCAT(GPIO, IRMP_PORT_LETTER)
+#  define IRMP_BIT                              IRMP_BIT_NUMBER
+#  define input(x)                              ((x) & (1 << IRMP_BIT))
+
+#endif
+
+#if IRMP_SUPPORT_TECHNICS_PROTOCOL == 1
+#  undef IRMP_SUPPORT_MATSUSHITA_PROTOCOL
+#  define IRMP_SUPPORT_MATSUSHITA_PROTOCOL      1
 #endif
 
 #if IRMP_SUPPORT_DENON_PROTOCOL == 1 && IRMP_SUPPORT_RUWIDO_PROTOCOL == 1
@@ -82,6 +94,13 @@
 #  define IRMP_SUPPORT_RUWIDO_PROTOCOL          0
 #endif
 
+#if IRMP_SUPPORT_DENON_PROTOCOL == 1 && IRMP_SUPPORT_ACP24_PROTOCOL == 1
+#  warning DENON protocol conflicts wih ACP24, please enable only one of both protocols
+#  warning ACP24 protocol disabled
+#  undef IRMP_SUPPORT_ACP24_PROTOCOL
+#  define IRMP_SUPPORT_ACP24_PROTOCOL           0
+#endif
+
 #if IRMP_SUPPORT_RC6_PROTOCOL == 1 && IRMP_SUPPORT_ROOMBA_PROTOCOL == 1
 #  warning RC6 protocol conflicts wih ROOMBA, please enable only one of both protocols
 #  warning ROOMBA protocol disabled
@@ -96,6 +115,20 @@
 #  define IRMP_SUPPORT_ORTEK_PROTOCOL           0
 #endif
 
+#if IRMP_SUPPORT_RC5_PROTOCOL == 1 && IRMP_SUPPORT_S100_PROTOCOL == 1
+#  warning RC5 protocol conflicts wih S100, please enable only one of both protocols
+#  warning S100 protocol disabled
+#  undef IRMP_SUPPORT_S100_PROTOCOL
+#  define IRMP_SUPPORT_S100_PROTOCOL            0
+#endif
+
+#if IRMP_SUPPORT_NUBERT_PROTOCOL == 1 && IRMP_SUPPORT_FAN_PROTOCOL == 1
+#  warning NUBERT protocol conflicts wih FAN, please enable only one of both protocols
+#  warning FAN protocol disabled
+#  undef IRMP_SUPPORT_FAN_PROTOCOL
+#  define IRMP_SUPPORT_FAN_PROTOCOL             0
+#endif
+
 #if IRMP_SUPPORT_FDC_PROTOCOL == 1 && IRMP_SUPPORT_ORTEK_PROTOCOL == 1
 #  warning FDC protocol conflicts wih ORTEK, please enable only one of both protocols
 #  warning ORTEK protocol disabled