From 071fd8ce536522ca6365580d64cd465e4c18a031 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 24 Feb 2010 06:58:23 +0000 Subject: Revert changes made for the partial port to the AVR32 architecture. --- LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h | 3 +- LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h | 13 +-- LUFA/Drivers/Board/BUMBLEB/Buttons.h | 3 +- LUFA/Drivers/Board/BUMBLEB/Joystick.h | 7 +- LUFA/Drivers/Board/BUMBLEB/LEDs.h | 11 +-- LUFA/Drivers/Board/Buttons.h | 4 +- LUFA/Drivers/Board/Dataflash.h | 8 +- LUFA/Drivers/Board/EVK1101/Buttons.h | 98 --------------------- LUFA/Drivers/Board/EVK1101/Joystick.h | 116 ------------------------- LUFA/Drivers/Board/EVK1101/LEDs.h | 137 ------------------------------ LUFA/Drivers/Board/EVK527/Buttons.h | 3 +- LUFA/Drivers/Board/EVK527/Joystick.h | 5 +- LUFA/Drivers/Board/EVK527/LEDs.h | 11 +-- LUFA/Drivers/Board/Joystick.h | 4 +- LUFA/Drivers/Board/LEDs.h | 16 ++-- LUFA/Drivers/Board/RZUSBSTICK/LEDs.h | 11 +-- LUFA/Drivers/Board/STK525/Buttons.h | 3 +- LUFA/Drivers/Board/STK525/Joystick.h | 3 +- LUFA/Drivers/Board/STK525/LEDs.h | 13 +-- LUFA/Drivers/Board/STK526/Buttons.h | 4 +- LUFA/Drivers/Board/STK526/Joystick.h | 4 +- LUFA/Drivers/Board/STK526/LEDs.h | 13 +-- LUFA/Drivers/Board/Temperature.c | 13 +-- LUFA/Drivers/Board/Temperature.h | 8 +- LUFA/Drivers/Board/USBKEY/Buttons.h | 4 +- LUFA/Drivers/Board/USBKEY/Joystick.h | 4 +- LUFA/Drivers/Board/USBKEY/LEDs.h | 13 +-- LUFA/Drivers/Board/XPLAIN/LEDs.h | 13 +-- 28 files changed, 92 insertions(+), 453 deletions(-) delete mode 100644 LUFA/Drivers/Board/EVK1101/Buttons.h delete mode 100644 LUFA/Drivers/Board/EVK1101/Joystick.h delete mode 100644 LUFA/Drivers/Board/EVK1101/LEDs.h (limited to 'LUFA/Drivers/Board') diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h b/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h index d26e0e861..af95a894b 100644 --- a/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h +++ b/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h @@ -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); } diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h b/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h index fb7e09ff4..2208f2e40 100644 --- a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h +++ b/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h @@ -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); } diff --git a/LUFA/Drivers/Board/BUMBLEB/Buttons.h b/LUFA/Drivers/Board/BUMBLEB/Buttons.h index 166c97083..e0a5cc5a9 100644 --- a/LUFA/Drivers/Board/BUMBLEB/Buttons.h +++ b/LUFA/Drivers/Board/BUMBLEB/Buttons.h @@ -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); } diff --git a/LUFA/Drivers/Board/BUMBLEB/Joystick.h b/LUFA/Drivers/Board/BUMBLEB/Joystick.h index fdd4b0319..5d57ec559 100644 --- a/LUFA/Drivers/Board/BUMBLEB/Joystick.h +++ b/LUFA/Drivers/Board/BUMBLEB/Joystick.h @@ -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); } diff --git a/LUFA/Drivers/Board/BUMBLEB/LEDs.h b/LUFA/Drivers/Board/BUMBLEB/LEDs.h index a5251be58..549bbde62 100644 --- a/LUFA/Drivers/Board/BUMBLEB/LEDs.h +++ b/LUFA/Drivers/Board/BUMBLEB/LEDs.h @@ -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); } diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h index f50977706..d908fd43a 100644 --- a/LUFA/Drivers/Board/Buttons.h +++ b/LUFA/Drivers/Board/Buttons.h @@ -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 diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h index dfd8cd6e9..762142c33 100644 --- a/LUFA/Drivers/Board/Dataflash.h +++ b/LUFA/Drivers/Board/Dataflash.h @@ -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 diff --git a/LUFA/Drivers/Board/EVK1101/Buttons.h b/LUFA/Drivers/Board/EVK1101/Buttons.h deleted file mode 100644 index 0aa195f27..000000000 --- a/LUFA/Drivers/Board/EVK1101/Buttons.h +++ /dev/null @@ -1,98 +0,0 @@ -/* - 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 - #include - - #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 - -/** @} */ diff --git a/LUFA/Drivers/Board/EVK1101/Joystick.h b/LUFA/Drivers/Board/EVK1101/Joystick.h deleted file mode 100644 index f02ec405f..000000000 --- a/LUFA/Drivers/Board/EVK1101/Joystick.h +++ /dev/null @@ -1,116 +0,0 @@ -/* - 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 - - #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 - -/** @} */ diff --git a/LUFA/Drivers/Board/EVK1101/LEDs.h b/LUFA/Drivers/Board/EVK1101/LEDs.h deleted file mode 100644 index 9b341695c..000000000 --- a/LUFA/Drivers/Board/EVK1101/LEDs.h +++ /dev/null @@ -1,137 +0,0 @@ -/* - 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 LED driver header for the EVK1101. - * - * \note This file should not be included directly. It is automatically included as needed by the LEDs driver - * dispatch header located in LUFA/Drivers/Board/LEDs.h. - */ - -/** \ingroup Group_LEDs - * @defgroup Group_LEDs_EVK1101 EVK1101 - * - * Board specific LED driver header for the EVK1101. - * - * \note This file should not be included directly. It is automatically included as needed by the LEDs driver - * dispatch header located in LUFA/Drivers/Board/LEDs.h. - * - * @{ - */ - -#ifndef __LEDS_EVK1101_H__ -#define __LEDS_EVK1101_H__ - - /* Includes: */ - #include - - #include "../../../Common/Common.h" - - /* Enable C linkage for C++ Compilers: */ - #if defined(__cplusplus) - extern "C" { - #endif - - /* Preprocessor Checks: */ - #if !defined(__INCLUDE_FROM_LEDS_H) - #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead. - #endif - - /* Public Interface - May be used in end-application: */ - /* Macros: */ - /** LED mask for the first LED on the board. */ - #define LEDS_LED1 (1UL << 7) - - /** LED mask for the second LED on the board. */ - #define LEDS_LED2 (1UL << 8) - - /** LED mask for the third LED on the board. */ - #define LEDS_LED3 (1UL << 21) - - /** LED mask for the fourth LED on the board. */ - #define LEDS_LED4 (1UL << 22) - - /** LED mask for all the LEDs on the board. */ - #define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4) - - /** LED mask for the none of the board LEDs */ - #define LEDS_NO_LEDS 0 - - /* Inline Functions: */ - #if !defined(__DOXYGEN__) - static inline void LEDs_Init(void) - { - AVR32_GPIO.port[0].gpers = LEDS_ALL_LEDS; - AVR32_GPIO.port[0].oders = LEDS_ALL_LEDS; - AVR32_GPIO.port[0].ovrs = LEDS_ALL_LEDS; - } - - static inline void LEDs_TurnOnLEDs(const uintN_t LEDMask) - { - AVR32_GPIO.port[0].ovrc = LEDMask; - } - - static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask) - { - AVR32_GPIO.port[0].ovrs = LEDMask; - } - - static inline void LEDs_SetAllLEDs(const uintN_t LEDMask) - { - AVR32_GPIO.port[0].ovrs = LEDS_ALL_LEDS; - AVR32_GPIO.port[0].ovrc = LEDMask; - } - - static inline void LEDs_ChangeLEDs(const uintN_t LEDMask, const uintN_t ActiveMask) - { - AVR32_GPIO.port[0].ovrs = LEDMask; - AVR32_GPIO.port[0].ovrc = ActiveMask; - } - - static inline void LEDs_ToggleLEDs(const uintN_t LEDMask) - { - AVR32_GPIO.port[0].ovrt = LEDMask; - } - - static inline uintN_t LEDs_GetLEDs(void) - { - return (AVR32_GPIO.port[0].ovr & LEDS_ALL_LEDS); - } - #endif - - /* Disable C linkage for C++ Compilers: */ - #if defined(__cplusplus) - } - #endif - -#endif - -/** @} */ diff --git a/LUFA/Drivers/Board/EVK527/Buttons.h b/LUFA/Drivers/Board/EVK527/Buttons.h index 950c5742d..0150fa151 100644 --- a/LUFA/Drivers/Board/EVK527/Buttons.h +++ b/LUFA/Drivers/Board/EVK527/Buttons.h @@ -85,7 +85,8 @@ PORTE |= 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 ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1); } diff --git a/LUFA/Drivers/Board/EVK527/Joystick.h b/LUFA/Drivers/Board/EVK527/Joystick.h index d8583d19d..7d208ea9f 100644 --- a/LUFA/Drivers/Board/EVK527/Joystick.h +++ b/LUFA/Drivers/Board/EVK527/Joystick.h @@ -68,7 +68,7 @@ /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Macros: */ - #define JOY_FMASK ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7)) + #define JOY_FMASK ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7)) #define JOY_CMASK (1 << 6)) #endif @@ -100,7 +100,8 @@ PORTC |= JOY_CMASK; } - 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)~PINF & JOY_FMASK) | (((uint8_t)~PINC & JOY_CMASK) >> 3)); } diff --git a/LUFA/Drivers/Board/EVK527/LEDs.h b/LUFA/Drivers/Board/EVK527/LEDs.h index d01a81480..ea7c7c2c7 100644 --- a/LUFA/Drivers/Board/EVK527/LEDs.h +++ b/LUFA/Drivers/Board/EVK527/LEDs.h @@ -90,31 +90,32 @@ PORTD &= ~LEDS_ALL_LEDS; } - static inline void LEDs_TurnOnLEDs(const uintN_t LEDMask) + static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) { PORTD |= LEDMask; } - static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask) + static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) { PORTD &= ~LEDMask; } - static inline void LEDs_SetAllLEDs(const uintN_t LEDMask) + static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) { PORTD = ((PORTD & ~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) { PORTD = ((PORTD & ~LEDMask) | ActiveMask); } - 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 uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t LEDs_GetLEDs(void) { return (PORTD & LEDS_ALL_LEDS); diff --git a/LUFA/Drivers/Board/Joystick.h b/LUFA/Drivers/Board/Joystick.h index b14e98986..39375a265 100644 --- a/LUFA/Drivers/Board/Joystick.h +++ b/LUFA/Drivers/Board/Joystick.h @@ -83,8 +83,6 @@ #include "EVK527/Joystick.h" #elif (BOARD == BOARD_USER) #include "Board/Joystick.h" - #elif (BOARD == BOARD_EVK1101) - #include "EVK1101/Joystick.h" #else #error The selected board does not contain a joystick. #endif @@ -102,7 +100,7 @@ * \return Mask indicating the joystick direction - see corresponding board specific Joystick.h file * for direction masks */ - static inline uintN_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; + static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; #endif #endif diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h index 1def9ea90..94fbf3cf7 100644 --- a/LUFA/Drivers/Board/LEDs.h +++ b/LUFA/Drivers/Board/LEDs.h @@ -84,7 +84,7 @@ static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) {}; static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) {}; static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) {}; - static inline uintN_t LEDs_GetLEDs(void) { return 0; } + static inline uint8_t LEDs_GetLEDs(void) { return 0; } #elif (BOARD == BOARD_USBKEY) #include "USBKEY/LEDs.h" #elif (BOARD == BOARD_STK525) @@ -105,8 +105,6 @@ #include "EVK527/LEDs.h" #elif (BOARD == BOARD_USER) #include "Board/LEDs.h" - #elif (BOARD == BOARD_EVK1101) - #include "EVK1101/LEDs.h" #endif #if !defined(LEDS_LED1) @@ -136,20 +134,20 @@ * * \param[in] LEDMask Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file) */ - static inline void LEDs_TurnOnLEDs(const uintN_t LEDMask); + static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask); /** Turns off the LEDs specified in the given LED mask. * * \param[in] LEDMask Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file) */ - static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask); + static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask); /** Turns off all LEDs not specified in the given LED mask, and turns on all the LEDs in the given LED * mask. * * \param[in] LEDMask Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file) */ - static inline void LEDs_SetAllLEDs(const uintN_t LEDMask); + static inline void LEDs_SetAllLEDs(const uint8_t LEDMask); /** Turns off all LEDs in the LED mask that are not set in the active mask, and turns on all the LEDs * specified in both the LED and active masks. @@ -157,20 +155,20 @@ * \param[in] LEDMask Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file) * \param[in] ActiveMask Mask of whether the LEDs in the LED mask should be turned on or 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); /** Toggles all LEDs in the LED mask, leaving all others in their current states. * * \param[in] LEDMask Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file) */ - static inline void LEDs_ToggleLEDs(const uintN_t LEDMask); + static inline void LEDs_ToggleLEDs(const uint8_t LEDMask); /** Returns the status of all the board LEDs; set LED masks in the return value indicate that the * corresponding LED is on. * * \return Mask of the board LEDs which are currently turned on */ - static inline uintN_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; + static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; #endif #endif diff --git a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h b/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h index e33aa862b..d095d6e0f 100644 --- a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h +++ b/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h @@ -106,21 +106,21 @@ PORTE |= (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT); } - static inline void LEDs_TurnOnLEDs(const uintN_t LEDMask) + static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) { PORTD |= (LEDMask & LEDS_LED1); PORTD &= ~(LEDMask & LEDS_LED2); PORTE &= ~((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT); } - static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask) + static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) { PORTD &= ~(LEDMask & LEDS_LED1); PORTD |= (LEDMask & LEDS_LED2); PORTE |= ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT); } - static inline void LEDs_SetAllLEDs(const uintN_t LEDMask) + static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) { PORTD = (((PORTD & ~LEDS_LED1) | (LEDMask & LEDS_LED1)) | ((PORTD | LEDS_LED2) & ~(LEDMask & LEDS_LED2))); @@ -128,7 +128,7 @@ ~((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT)); } - 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_LED1)) | (ActiveMask & LEDS_LED1)) | ((PORTD | (LEDMask & LEDS_LED2)) & ~(ActiveMask & LEDS_LED2))); @@ -136,12 +136,13 @@ ~((ActiveMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT)); } - static inline void LEDs_ToggleLEDs(const uintN_t LEDMask) + static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) { PORTD = (PORTD ^ (LEDMask & LEDS_PORTD_LEDS)); PORTE = (PORTE ^ ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT)); } + static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t LEDs_GetLEDs(void) { return (((PORTD & LEDS_LED1) | (~PORTD & LEDS_LED2)) | diff --git a/LUFA/Drivers/Board/STK525/Buttons.h b/LUFA/Drivers/Board/STK525/Buttons.h index e70822ea4..f3dccafd9 100644 --- a/LUFA/Drivers/Board/STK525/Buttons.h +++ b/LUFA/Drivers/Board/STK525/Buttons.h @@ -85,7 +85,8 @@ PORTE |= 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 ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1); } diff --git a/LUFA/Drivers/Board/STK525/Joystick.h b/LUFA/Drivers/Board/STK525/Joystick.h index aab650d98..6358f957e 100644 --- a/LUFA/Drivers/Board/STK525/Joystick.h +++ b/LUFA/Drivers/Board/STK525/Joystick.h @@ -100,7 +100,8 @@ PORTE |= JOY_EMASK; } - 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)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> 1)); } diff --git a/LUFA/Drivers/Board/STK525/LEDs.h b/LUFA/Drivers/Board/STK525/LEDs.h index 1f2e9a2b0..b54a8c987 100644 --- a/LUFA/Drivers/Board/STK525/LEDs.h +++ b/LUFA/Drivers/Board/STK525/LEDs.h @@ -93,32 +93,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; } - static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask) + static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) { PORTD &= ~LEDMask; } - static inline void LEDs_SetAllLEDs(const uintN_t LEDMask) + static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) { PORTD = ((PORTD & ~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) { PORTD = ((PORTD & ~LEDMask) | ActiveMask); } - 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); } diff --git a/LUFA/Drivers/Board/STK526/Buttons.h b/LUFA/Drivers/Board/STK526/Buttons.h index 56af91f29..f480560f6 100644 --- a/LUFA/Drivers/Board/STK526/Buttons.h +++ b/LUFA/Drivers/Board/STK526/Buttons.h @@ -85,8 +85,8 @@ PORTD |= BUTTONS_BUTTON1; } - static inline uintN_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT; - 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); } diff --git a/LUFA/Drivers/Board/STK526/Joystick.h b/LUFA/Drivers/Board/STK526/Joystick.h index f17e280be..b095536aa 100644 --- a/LUFA/Drivers/Board/STK526/Joystick.h +++ b/LUFA/Drivers/Board/STK526/Joystick.h @@ -97,8 +97,8 @@ PORTB |= JOY_BMASK; } - static inline uintN_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; - 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)~PINB & JOY_BMASK); } diff --git a/LUFA/Drivers/Board/STK526/LEDs.h b/LUFA/Drivers/Board/STK526/LEDs.h index fdae8f577..d1ac493ad 100644 --- a/LUFA/Drivers/Board/STK526/LEDs.h +++ b/LUFA/Drivers/Board/STK526/LEDs.h @@ -93,32 +93,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; } - static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask) + static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) { PORTD &= ~LEDMask; } - static inline void LEDs_SetAllLEDs(const uintN_t LEDMask) + static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) { PORTD = ((PORTD & ~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) { 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); } diff --git a/LUFA/Drivers/Board/Temperature.c b/LUFA/Drivers/Board/Temperature.c index 09d705085..ea12bf766 100644 --- a/LUFA/Drivers/Board/Temperature.c +++ b/LUFA/Drivers/Board/Temperature.c @@ -47,25 +47,14 @@ int8_t Temperature_GetTemperature(void) { uint16_t Temp_ADC = ADC_GetChannelReading(ADC_REFERENCE_AVCC | ADC_RIGHT_ADJUSTED | TEMP_ADC_CHANNEL_MASK); - #if defined(__AVR32__) - if (Temp_ADC > Temperature_Lookup[0]) - return TEMP_MIN_TEMP; - - for (uint16_t Index = 0; Index < TEMP_TABLE_SIZE; Index++) - { - if (Temp_ADC > Temperature_Lookup[Index]) - return (Index + TEMP_TABLE_OFFSET); - } - #elif defined(__AVR__) if (Temp_ADC > pgm_read_word(&Temperature_Lookup[0])) - return TEMP_MIN_TEMP; + return TEMP_MIN_TEMP; for (uint16_t Index = 0; Index < TEMP_TABLE_SIZE; Index++) { if (Temp_ADC > pgm_read_word(&Temperature_Lookup[Index])) return (Index + TEMP_TABLE_OFFSET); } - #endif return TEMP_MAX_TEMP; } diff --git a/LUFA/Drivers/Board/Temperature.h b/LUFA/Drivers/Board/Temperature.h index 8700839b6..7a5af367b 100644 --- a/LUFA/Drivers/Board/Temperature.h +++ b/LUFA/Drivers/Board/Temperature.h @@ -53,13 +53,7 @@ #define __TEMPERATURE_H__ /* Includes: */ - #if defined(__AVR32__) - #include - #include - #elif defined(__AVR__) - #include - #include - #endif + #include #include "../../Common/Common.h" #include "../Peripheral/ADC.h" diff --git a/LUFA/Drivers/Board/USBKEY/Buttons.h b/LUFA/Drivers/Board/USBKEY/Buttons.h index 471a19ad2..db1391c8e 100644 --- a/LUFA/Drivers/Board/USBKEY/Buttons.h +++ b/LUFA/Drivers/Board/USBKEY/Buttons.h @@ -79,8 +79,8 @@ PORTE |= BUTTONS_BUTTON1; } - static inline uintN_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT; - 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 ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1); } diff --git a/LUFA/Drivers/Board/USBKEY/Joystick.h b/LUFA/Drivers/Board/USBKEY/Joystick.h index b6dd8d17d..b0829914b 100644 --- a/LUFA/Drivers/Board/USBKEY/Joystick.h +++ b/LUFA/Drivers/Board/USBKEY/Joystick.h @@ -100,8 +100,8 @@ PORTE |= JOY_EMASK; } - static inline uintN_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; - 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)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> 1)); } diff --git a/LUFA/Drivers/Board/USBKEY/LEDs.h b/LUFA/Drivers/Board/USBKEY/LEDs.h index 0864be82d..e1a5b2314 100644 --- a/LUFA/Drivers/Board/USBKEY/LEDs.h +++ b/LUFA/Drivers/Board/USBKEY/LEDs.h @@ -93,32 +93,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; } - static inline void LEDs_TurnOffLEDs(const uintN_t LEDMask) + static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) { PORTD &= ~LEDMask; } - static inline void LEDs_SetAllLEDs(const uintN_t LEDMask) + static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) { PORTD = ((PORTD & ~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) { PORTD = ((PORTD & ~LEDMask) | ActiveMask); } - 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); } diff --git a/LUFA/Drivers/Board/XPLAIN/LEDs.h b/LUFA/Drivers/Board/XPLAIN/LEDs.h index 2c80aa702..add868d20 100644 --- a/LUFA/Drivers/Board/XPLAIN/LEDs.h +++ b/LUFA/Drivers/Board/XPLAIN/LEDs.h @@ -84,32 +84,33 @@ 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 & 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 = (PORTB ^ (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 (~PORTB & LEDS_ALL_LEDS); } -- cgit v1.2.3