Skip to content

GitLab

Commit 071fd8ce authored by Dean Camera's avatar Dean Camera
Browse files

Revert changes made for the partial port to the AVR32 architecture.

parent a7aaa45e
Expand all Hide whitespace changes
Inline Side-by-side
LUFA.pnproj
View file @ 071fd8ce
This diff is collapsed.
LUFA/Common/Atomic.h deleted 100644 → 0
View file @ a7aaa45e
/*
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
LUFA/Common/BoardTypes.h
View file @ 071fd8ce
......@@ -94,9 +94,6 @@
* 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
......
LUFA/Common/Common.h
View file @ 071fd8ce
......@@ -56,17 +56,8 @@
#define __COMMON_H__
/* Includes: */
#if defined(__AVR32__)
#include <avr32/io.h>
#include <stdint.h>
#include "Atomic.h"
#define PROGMEM const
#elif defined(__AVR__)
#include <avr/io.h>
#endif
#include <avr/io.h>
#include "FunctionAttributes.h"
#include "BoardTypes.h"
......@@ -188,20 +179,6 @@
}
}
/* Type Defines: */
#if defined(__AVR32__)
/** Type define for an unsigned native word-sized chunk of data. */
typedef uint32_t uintN_t;
/** Type define for a signed native word-sized chunk of data. */
typedef int32_t intN_t;
#elif defined(__AVR__)
/** Type define for an unsigned native word-sized chunk of data. */
typedef uint8_t uintN_t;
/** Type define for a signed native word-sized chunk of data. */
typedef int8_t intN_t;
#endif
#endif
/** @} */
LUFA/DriverStubs/Buttons.h
View file @ 071fd8ce
......@@ -70,7 +70,8 @@
// TODO: Initialize the appropriate port pins as an inputs here, with pull-ups
}
static inline uintN_t Buttons_GetStatus(void)
static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Buttons_GetStatus(void)
{
// TODO: Return current button status here, debounced if required
}
......
LUFA/DriverStubs/Joystick.h
View file @ 071fd8ce
......@@ -82,7 +82,8 @@
// TODO: Initialize joystick port pins as inputs with pull-ups
}
static inline uintN_t Joystick_GetStatus(void)
static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Joystick_GetStatus(void)
{
// TODO: Return current joystick position data which can be obtained by masking against the JOY_* macros
}
......
LUFA/DriverStubs/LEDs.h
View file @ 071fd8ce
......@@ -84,32 +84,33 @@
// TODO: Add code to initialize LED port pins as outputs here
}
static inline void LEDs_TurnOnLEDs(const uintN_t LEDMask)
static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
{
// TODO: Add code to turn on LEDs given in the LEDMask mask here, leave others as-is
}
static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask)
static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
{
// TODO: Add code to turn off LEDs given in the LEDMask mask here, leave others as-is
}
static inline void LEDs_SetAllLEDs(const uintN_t LEDMask)
static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
{
// TODO: Add code to turn on only LEDs given in the LEDMask mask here, all others off
}
static inline void LEDs_ChangeLEDs(const uintN_t LEDMask, const uintN_t ActiveMask)
static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask)
{
// TODO: Add code to set the Leds in the given LEDMask to the status given in ActiveMask here
}
static inline void LEDs_ToggleLEDs(const uintN_t LEDMask)
static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
{
// TODO: Add code to toggle the Leds in the given LEDMask, ignoring all others
}
static inline uintN_t LEDs_GetLEDs(void)
static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t LEDs_GetLEDs(void)
{
// TODO: Add code to return the current LEDs status' here which can be masked against LED_LED* macros
}
......
LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h
View file @ 071fd8ce
......@@ -79,7 +79,8 @@
PORTD |= BUTTONS_BUTTON1;
}
static inline uintN_t Buttons_GetStatus(void)
static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Buttons_GetStatus(void)
{
return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
}
......
LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
View file @ 071fd8ce
......@@ -96,32 +96,33 @@
PORTD &= ~LEDS_ALL_LEDS;
}
static inline void LEDs_TurnOnLEDs(const uintN_t LEDMask)
static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
{
PORTD |= (LEDMask & LEDS_ALL_LEDS);
}
static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask)
static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
{
PORTD &= ~(LEDMask & LEDS_ALL_LEDS);
}
static inline void LEDs_SetAllLEDs(const uintN_t LEDMask)
static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
{
PORTD = (PORTD & ~LEDS_ALL_LEDS) | (LEDMask & LEDS_ALL_LEDS);
}
static inline void LEDs_ChangeLEDs(const uintN_t LEDMask, const uintN_t ActiveMask)
static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask)
{
PORTD = ((PORTD & ~(LEDMask & LEDS_ALL_LEDS)) | (ActiveMask & LEDS_ALL_LEDS));
}
static inline void LEDs_ToggleLEDs(const uintN_t LEDMask)
static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
{
PORTD = (PORTD ^ (LEDMask & LEDS_ALL_LEDS));
}
static inline uintN_t LEDs_GetLEDs(void)
static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t LEDs_GetLEDs(void)
{
return (PORTD & LEDS_ALL_LEDS);
}
......
LUFA/Drivers/Board/BUMBLEB/Buttons.h
View file @ 071fd8ce
......@@ -81,7 +81,8 @@
PORTD |= BUTTONS_BUTTON1;
}
static inline uintN_t Buttons_GetStatus(void)
static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Buttons_GetStatus(void)
{
return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
}
......
LUFA/Drivers/Board/BUMBLEB/Joystick.h
View file @ 071fd8ce
......@@ -30,7 +30,7 @@
/** \file
*
* Board specific joystick driver header for the BUMBLEB. The BUMBLEB third-party board does not include any on-board
* Board specific joystick driver header for the USBKEY. The BUMBLEB third-party board does not include any on-board
* peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick.
*
* \note This file should not be included directly. It is automatically included as needed by the joystick driver
......@@ -40,7 +40,7 @@
/** \ingroup Group_Joystick
* @defgroup Group_Joystick_BUMBLEB BUMBLEB
*
* Board specific joystick driver header for the BUMBLEB. The BUMBLEB third-party board does not include any on-board
* Board specific joystick driver header for the USBKEY. The BUMBLEB third-party board does not include any on-board
* peripherals, but does have an officially recommended external peripheral layout for buttons, LEDs and a Joystick.
*
* \note This file should not be included directly. It is automatically included as needed by the joystick driver
......@@ -98,7 +98,8 @@
PORTD |= JOY_MASK;
}
static inline uintN_t Joystick_GetStatus(void)
static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Joystick_GetStatus(void)
{
return (uint8_t)(~PIND & JOY_MASK);
}
......
LUFA/Drivers/Board/BUMBLEB/LEDs.h
View file @ 071fd8ce
......@@ -95,27 +95,28 @@
PORTB &= ~LEDS_ALL_LEDS;
}
static inline void LEDs_TurnOnLEDs(const uintN_t LedMask)
static inline void LEDs_TurnOnLEDs(const uint8_t LedMask)
{
PORTB |= LedMask;
}
static inline void LEDs_TurnOffLEDs(const uintN_t LedMask)
static inline void LEDs_TurnOffLEDs(const uint8_t LedMask)
{
PORTB &= ~LedMask;
}
static inline void LEDs_SetAllLEDs(const uintN_t LedMask)
static inline void LEDs_SetAllLEDs(const uint8_t LedMask)
{
PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LedMask);
}
static inline void LEDs_ChangeLEDs(const uintN_t LedMask, const uintN_t ActiveMask)
static inline void LEDs_ChangeLEDs(const uint8_t LedMask, const uint8_t ActiveMask)
{
PORTB = ((PORTB & ~LedMask) | ActiveMask);
}
static inline uintN_t LEDs_GetLEDs(void)
static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t LEDs_GetLEDs(void)
{
return (PORTB & LEDS_ALL_LEDS);
}
......
LUFA/Drivers/Board/Buttons.h
View file @ 071fd8ce
......@@ -86,8 +86,6 @@
#include "EVK527/Buttons.h"
#elif (BOARD == BOARD_USER)
#include "Board/Buttons.h"
#elif (BOARD == BOARD_EVK1101)
#include "EVK1101/Buttons.h"
#else
#error The selected board does not contain any GPIO buttons.
#endif
......@@ -105,7 +103,7 @@
*
* \return Mask indicating which board buttons are currently pressed
*/
static inline uintN_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
#endif
#endif
......
LUFA/Drivers/Board/Dataflash.h
View file @ 071fd8ce
......@@ -127,7 +127,7 @@
static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)
{
return SPI_Transfer(Byte);
return SPI_TransferByte(Byte);
}
/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
......@@ -137,7 +137,7 @@
static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
static inline void Dataflash_SendByte(const uint8_t Byte)
{
SPI_Send(Byte);
SPI_SendByte(Byte);
}
/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.
......@@ -147,7 +147,7 @@
static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Dataflash_ReceiveByte(void)
{
return SPI_Receive();
return SPI_ReceiveByte();
}
/* Includes: */
......@@ -167,8 +167,6 @@
#include "EVK527/Dataflash.h"
#elif (BOARD == BOARD_USER)
#include "Board/Dataflash.h"
#elif (BOARD = BOARD_EVK1101)
#include "EVK1101/Dataflash.h"
#else
#error The selected board does not contain a dataflash IC.
#endif
......
LUFA/Drivers/Board/EVK1101/Buttons.h deleted 100644 → 0
View file @ a7aaa45e
/*
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
*
* Board specific Buttons driver header for the EVK1101.
*
* \note This file should not be included directly. It is automatically included as needed by the Buttons driver
* dispatch header located in LUFA/Drivers/Board/Buttons.h.
*/
/** \ingroup Group_Buttons
* @defgroup Group_Buttons_EVK1101 EVK1101
*
* Board specific Buttons driver header for the EVK1101.
*
* \note This file should not be included directly. It is automatically included as needed by the Buttons driver
* dispatch header located in LUFA/Drivers/Board/Buttons.h.
*
* @{
*/
#ifndef __BUTTONS_EVK1101_H__
#define __BUTTONS_EVK1101_H__
/* Includes: */
#include <avr32/io.h>
#include <stdbool.h>
#include "../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
extern "C" {
#endif
/* Preprocessor Checks: */
#if !defined(__INCLUDE_FROM_BUTTONS_H)
#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
#endif
/* Public Interface - May be used in end-application: */
/* Macros: */
/** Button mask for the first button on the board. */
#define BUTTONS_BUTTON1 (1UL << 2)
/** Button mask for the second button on the board. */
#define BUTTONS_BUTTON2 (1UL << 3)
/* Inline Functions: */
#if !defined(__DOXYGEN__)
static inline void Buttons_Init(void)
{
AVR32_GPIO.port[1].gpers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
AVR32_GPIO.port[1].puers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
}
static inline uintN_t Buttons_GetStatus(void)
{
return (~AVR32_GPIO.port[1].pvr & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2));
}
#endif
/* Disable C linkage for C++ Compilers: */
#if defined(__cplusplus)
}
#endif
#endif
/** @} */
LUFA/Drivers/Board/EVK1101/Joystick.h deleted 100644 → 0
View file @ a7aaa45e
/*
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
*
* Board specific joystick driver header for the EVK1101.
*
* \note This file should not be included directly. It is automatically included as needed by the joystick driver
* dispatch header located in LUFA/Drivers/Board/Joystick.h.
*/
/** \ingroup Group_Joystick
* @defgroup Group_Joystick_EVK1101 EVK1101
*
* Board specific joystick driver header for the EVK1101.
*
* \note This file should not be included directly. It is automatically included as needed by the joystick driver
* dispatch header located in LUFA/Drivers/Board/Joystick.h.
*
* @{
*/
#ifndef __JOYSTICK_EVK1101_H__
#define __JOYSTICK_EVK1101_H__
/* Includes: */
#include <avr32/io.h>
#include "../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
extern "C" {
#endif
/* Preprocessor Checks: */
#if !defined(__INCLUDE_FROM_JOYSTICK_H)
#error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.
#endif
/* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__)
/* Macros: */
#define JOY_MASK_PA (1 << 13)
#define JOY_MASK_PB ((1 << 6) | (1 << 7) | (1 << 8) | (1 << 9))
#endif
/* Public Interface - May be used in end-application: */
/* Macros: */
/** Mask for the joystick being pushed in the left direction. */
#define JOY_LEFT (1UL << 6)
/** Mask for the joystick being pushed in the upward direction. */
#define JOY_UP (1UL << 7)
/** Mask for the joystick being pushed in the right direction. */
#define JOY_RIGHT (1UL << 8)
/** Mask for the joystick being pushed in the downward direction. */
#define JOY_DOWN (1UL << 9)
/** Mask for the joystick being pushed inward. */
#define JOY_PRESS (1UL << 13)
/* Inline Functions: */
#if !defined(__DOXYGEN__)
static inline void Joystick_Init(void)
{
AVR32_GPIO.port[0].gpers = JOY_MASK_PA;
AVR32_GPIO.port[0].puers = JOY_MASK_PA;
AVR32_GPIO.port[1].gpers = JOY_MASK_PB;
AVR32_GPIO.port[1].puers = JOY_MASK_PB;
}
static inline uintN_t Joystick_GetStatus(void)
{
return ((~AVR32_GPIO.port[1].pvr & JOY_MASK_PB) |
(~AVR32_GPIO.port[0].pvr & JOY_MASK_PA));
}
#endif
/* Disable C linkage for C++ Compilers: */
#if defined(__cplusplus)
}
#endif
#endif
/** @} */
LUFA/Drivers/Board/EVK1101/LEDs.h deleted 100644 → 0
View file @ a7aaa45e
/*
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