diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-22 11:44:34 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-22 11:44:34 +0000 |
| commit | aae20139b90521cf1d1b17fdcb3ff9d42ecdf937 (patch) | |
| tree | c74b83691225a38b1fac5a78d83740081c441043 /LUFA/Common | |
| parent | d2851b335106293e5f95107226b5deeed712a69c (diff) | |
| download | lufa-aae20139b90521cf1d1b17fdcb3ff9d42ecdf937.tar.gz lufa-aae20139b90521cf1d1b17fdcb3ff9d42ecdf937.tar.bz2 lufa-aae20139b90521cf1d1b17fdcb3ff9d42ecdf937.zip | |
Add drivers for the EVK1101 - begin full port to the AVR32 UC3B line of AVRs.
Diffstat (limited to 'LUFA/Common')
| -rw-r--r-- | LUFA/Common/Atomic.h | 99 | ||||
| -rw-r--r-- | LUFA/Common/BoardTypes.h | 3 | ||||
| -rw-r--r-- | LUFA/Common/Common.h | 21 |
3 files changed, 121 insertions, 2 deletions
diff --git a/LUFA/Common/Atomic.h b/LUFA/Common/Atomic.h new file mode 100644 index 000000000..81ac10cc6 --- /dev/null +++ b/LUFA/Common/Atomic.h @@ -0,0 +1,99 @@ +/*
+ LUFA Library
+ Copyright (C) Dean Camera, 2010.
+
+ dean [at] fourwalledcubicle [dot] com
+ www.fourwalledcubicle.com
+*/
+
+/*
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+ Permission to use, copy, modify, distribute, and sell this
+ software and its documentation for any purpose is hereby granted
+ without fee, provided that the above copyright notice appear in
+ all copies and that both that the copyright notice and this
+ permission notice and warranty disclaimer appear in supporting
+ documentation, and that the name of the author not be used in
+ advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ The author disclaim all warranties with regard to this
+ software, including all implied warranties of merchantability
+ and fitness. In no event shall the author be liable for any
+ special, indirect or consequential damages or any damages
+ whatsoever resulting from loss of use, data or profits, whether
+ in an action of contract, negligence or other tortious action,
+ arising out of or in connection with the use or performance of
+ this software.
+*/
+
+/** \file
+ *
+ * Atomic block header for the 32-bit AVRs, modelled on the 8-bit AVR's util/atomic.h
+ * header.
+ *
+ * \note Do not include this file directly, rather include the Common.h header file instead to gain this file's
+ * functionality on the 32-bit AVRs.
+ */
+
+#ifndef __ATOMIC_H__
+#define __ATOMIC_H__
+
+ /* Includes: */
+ #include <avr32/io.h>
+ #include <stdint.h>
+ #include <stdbool.h>
+
+ /* Public Interface - May be used in end-application: */
+ /* Macros: */
+ #define ATOMIC_BLOCK(type) for ( type, __ToDo = __iCliRetVal(); \
+ __ToDo ; __ToDo = 0 )
+ #define NONATOMIC_BLOCK(type) for ( type, __ToDo = __iSeiRetVal(); \
+ __ToDo ; __ToDo = 0 )
+ #define ATOMIC_RESTORESTATE uint8_t sreg_save \
+ __attribute__((__cleanup__(__iRestore))) = 0 /* TODO */
+ #define ATOMIC_FORCEON uint8_t sreg_save \
+ __attribute__((__cleanup__(__iSeiParam))) = 0
+ #define NONATOMIC_RESTORESTATE uint8_t sreg_save \
+ __attribute__((__cleanup__(__iRestore))) = 0 /* TODO */
+ #define NONATOMIC_FORCEOFF uint8_t sreg_save \
+ __attribute__((__cleanup__(__iCliParam))) = 0
+
+ /* Private Interface - For use in library only: */
+ #if !defined(__DOXYGEN__)
+ /* Inline Functions: */
+ static __inline__ uint8_t __iSeiRetVal(void)
+ {
+ ((avr32_sr_t*)AVR32_SR_T)->gm = true;
+ return 1;
+ }
+
+ static __inline__ uint8_t __iCliRetVal(void)
+ {
+ ((avr32_sr_t*)AVR32_SR_T)->gm = false;
+ return 1;
+ }
+
+ static __inline__ void __iSeiParam(const uint8_t *__s)
+ {
+ ((avr32_sr_t*)AVR32_SR_T)->gm = true;
+ __asm__ volatile ("" ::: "memory");
+ (void)__s;
+ }
+
+ static __inline__ void __iCliParam(const uint8_t *__s)
+ {
+ ((avr32_sr_t*)AVR32_SR_T)->gm = false;
+ __asm__ volatile ("" ::: "memory");
+ (void)__s;
+ }
+
+ static __inline__ void __iRestore(const uint8_t *__s)
+ {
+ ((avr32_sr_t*)AVR32_SR_T)->gm = *__s;
+ __asm__ volatile ("" ::: "memory");
+ }
+ #endif
+
+#endif
diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h index 10e31ac1b..43b692dbd 100644 --- a/LUFA/Common/BoardTypes.h +++ b/LUFA/Common/BoardTypes.h @@ -94,6 +94,9 @@ * such as the Joystick driver, where the removal would adversely affect the code's operation is still disallowed. */
#define BOARD_NONE 10
+ /** Selects the EVK1101 specific board drivers, including Temperature, Button, Dataflash, Joystick and LED drivers. */
+ #define BOARD_EVK1101 11
+
#if !defined(__DOXYGEN__)
#define BOARD_ BOARD_NONE
diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h index 2ddb58c8c..4052480dd 100644 --- a/LUFA/Common/Common.h +++ b/LUFA/Common/Common.h @@ -56,8 +56,17 @@ #define __COMMON_H__
/* Includes: */
- #include <avr/io.h>
-
+ #if defined(__AVR32__)
+ #include <avr32/io.h>
+ #include <stdint.h>
+
+ #include "Atomic.h"
+
+ #define PROGMEM
+ #else
+ #include <avr/io.h>
+ #endif
+
#include "FunctionAttributes.h"
#include "BoardTypes.h"
@@ -179,6 +188,14 @@ }
}
+ /* Type Defines: */
+ #if defined(__AVR32__)
+ typedef uint32_t uintN_t;
+ typedef int32_t intN_t;
+ #else
+ typedef uint8_t uintN_t;
+ typedef int8_t intN_t;
+ #endif
#endif
/** @} */
|