X-Git-Url: http://cloudbase.mooo.com/gitweb/irmp.git/blobdiff_plain/4a7dc859e27ad629f32a77237b6e6af4fb714603..3d2da98a7a2b423edbdf4e685b588fbc5789dd7f:/irmpsystem.h?ds=sidebyside

diff --git a/irmpsystem.h b/irmpsystem.h
index d4e5b13..41cd344 100644
--- a/irmpsystem.h
+++ b/irmpsystem.h
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------------------------------------------------------------------------
  * irmpsystem.h - system specific includes and defines
  *
- * Copyright (c) 2009-2013 Frank Meyer - frank(at)fli4l.de
+ * Copyright (c) 2009-2015 Frank Meyer - frank(at)fli4l.de
  *
- * $Id: irmpsystem.h,v 1.11 2014/07/01 07:50:33 fm Exp $
+ * $Id: irmpsystem.h,v 1.18 2015/05/18 10:51:07 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
@@ -30,6 +30,7 @@
 #  include <stm32l1xx.h>
 #  define ARM_STM32
 #  define ARM_STM32L1XX
+#  define F_CPU (SysCtlClockGet())
 #elif defined(STM32F10X_LD) || defined(STM32F10X_LD_VL) \
    || defined(STM32F10X_MD) || defined(STM32F10X_MD_VL) \
    || defined(STM32F10X_HD) || defined(STM32F10X_HD_VL) \
@@ -37,11 +38,12 @@
 #  include <stm32f10x.h>
 #  define ARM_STM32
 #  define ARM_STM32F10X
+#  define F_CPU (SysCtlClockGet())
 #elif defined(STM32F4XX)                                                            // ARM STM32
 #  include <stm32f4xx.h>
 #  define ARM_STM32
 #  define ARM_STM32F4XX
-#elif defined(TARGET_IS_BLIZZARD_RA2)                                                                                           // TI Stellaris (tested on Stellaris Launchpad with Code Composer Studio)
+#elif defined(TARGET_IS_BLIZZARD_RA2)                                               // TI Stellaris (tested on Stellaris Launchpad with Code Composer Studio)
 #  define STELLARIS_ARM_CORTEX_M4
 #  define F_CPU (SysCtlClockGet())
 #elif defined(unix) || defined(WIN32) || defined(__APPLE__)                         // Unix/Linux or Windows or Apple
@@ -79,7 +81,16 @@ typedef unsigned short                  uint16_t;
 #  define IRSND_OC0                     3       // OC0
 #  define IRSND_OC0A                    4       // OC0A
 #  define IRSND_OC0B                    5       // OC0B
+
+#  define IRSND_XMEGA_OC0A              0       // OC0A
+#  define IRSND_XMEGA_OC0B              1       // OC0B
+#  define IRSND_XMEGA_OC0C              2       // OC0C
+#  define IRSND_XMEGA_OC0D              3       // OC0D
+#  define IRSND_XMEGA_OC1A              4       // OC1A
+#  define IRSND_XMEGA_OC1B              5       // OC1B
+
 #elif defined(STELLARIS_ARM_CORTEX_M4)
+
 #  include "inc/hw_ints.h"
 #  include "inc/hw_memmap.h"
 #  include "inc/hw_types.h"
@@ -92,12 +103,24 @@ typedef unsigned short                  uint16_t;
 #  include "driverlib/systick.h"
 #  include "driverlib/pin_map.h"
 #  include "driverlib/timer.h"
-#  define PROGMEM volatile
-#  define memcpy_P memcpy
+#  define PROGMEM
+#  define memcpy_P                      memcpy
 #  define APP_SYSTICKS_PER_SEC          32
+
+#elif defined(ARM_STM32F10X)
+
+#  include "stm32f10x_gpio.h"
+#  include "stm32f10x_rcc.h"
+#  include "stm32f10x_tim.h"
+#  include "misc.h"
+#  define PROGMEM
+#  define memcpy_P                      memcpy
+
 #else
+
 #  define PROGMEM
 #  define memcpy_P                      memcpy
+
 #endif
 
 #if defined(PIC_CCS) || defined(PIC_C18) || defined(ARM_STM32) || defined(STELLARIS_ARM_CORTEX_M4)
@@ -107,8 +130,10 @@ typedef unsigned short                  uint16_t;
 
 #if defined (PIC_C18)                                                               // PIC C18 or XC8 compiler
 #  include <p18cxxx.h>                                                              // main PIC18 h file
+#ifndef __XC8
 #  include <timers.h>                                                               // timer lib
 #  include <pwm.h>                                                                  // pwm lib
+#endif
 #  define IRSND_PIC_CCP1                1                                           // PIC C18 RC2 = PWM1 module
 #  define IRSND_PIC_CCP2                2                                           // PIC C18 RC1 = PWM2 module
 #endif
@@ -118,9 +143,9 @@ typedef unsigned short                  uint16_t;
 #  define FALSE                         0
 #endif
 
-typedef struct
+typedef struct __attribute__ ((__packed__))
 {
-  uint8_t                               protocol;                                   // protocol, i.e. NEC_PROTOCOL
+  uint8_t                               protocol;                                   // protocol, e.g. NEC_PROTOCOL
   uint16_t                              address;                                    // address
   uint16_t                              command;                                    // command
   uint8_t                               flags;                                      // flags, e.g. repetition