Version 2.8.0: port to AVR XMEGA

[irmp.git] / irmpsystem.h

diff --git a/irmpsystem.h b/irmpsystem.h
index a6a4a6949fe0fc90890c507a976fd6c69e75f642..6e851498c604739a161cbc3ed74d314c8f47a12d 100644 (file)
--- a/irmpsystem.h
+++ b/irmpsystem.h
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2015 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmpsystem.h,v 1.16 2015/01/26 13:07:01 fm Exp $\r
+ * $Id: irmpsystem.h,v 1.17 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
@@ -80,7 +80,16 @@ typedef unsigned short                  uint16_t;
 #  define IRSND_OC0                     3       // OC0\r
 #  define IRSND_OC0A                    4       // OC0A\r
 #  define IRSND_OC0B                    5       // OC0B\r
+\r
+#  define IRSND_XMEGA_OC0A              0       // OC0A\r
+#  define IRSND_XMEGA_OC0B              1       // OC0B\r
+#  define IRSND_XMEGA_OC0C              2       // OC0C\r
+#  define IRSND_XMEGA_OC0D              3       // OC0D\r
+#  define IRSND_XMEGA_OC1A              4       // OC1A\r
+#  define IRSND_XMEGA_OC1B              5       // OC1B\r
+\r
 #elif defined(STELLARIS_ARM_CORTEX_M4)\r
+\r
 #  include "inc/hw_ints.h"\r
 #  include "inc/hw_memmap.h"\r
 #  include "inc/hw_types.h"\r
@@ -93,19 +102,24 @@ typedef unsigned short                  uint16_t;
 #  include "driverlib/systick.h"\r
 #  include "driverlib/pin_map.h"\r
 #  include "driverlib/timer.h"\r
-#  define PROGMEM volatile\r
-#  define memcpy_P memcpy\r
+#  define PROGMEM\r
+#  define memcpy_P                      memcpy\r
 #  define APP_SYSTICKS_PER_SEC          32\r
+\r
 #elif defined(ARM_STM32F10X)\r
+\r
 #  include "stm32f10x_gpio.h"\r
 #  include "stm32f10x_rcc.h"\r
 #  include "stm32f10x_tim.h"\r
 #  include "misc.h"\r
 #  define PROGMEM\r
 #  define memcpy_P                      memcpy\r
+\r
 #else\r
+\r
 #  define PROGMEM\r
 #  define memcpy_P                      memcpy\r
+\r
 #endif\r
 \r
 #if defined(PIC_CCS) || defined(PIC_C18) || defined(ARM_STM32) || defined(STELLARIS_ARM_CORTEX_M4)\r