X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/071e02c6b6b4837fa9cf0b6d4c749994e02638d7..2d49c09b384375298a4995b79c4b29e8d9390cd6:/LUFA/Drivers/Board/USBKEY/Joystick.h diff --git a/LUFA/Drivers/Board/USBKEY/Joystick.h b/LUFA/Drivers/Board/USBKEY/Joystick.h index 0b2fa456e..892782257 100644 --- a/LUFA/Drivers/Board/USBKEY/Joystick.h +++ b/LUFA/Drivers/Board/USBKEY/Joystick.h @@ -1,21 +1,21 @@ /* LUFA Library Copyright (C) Dean Camera, 2010. - + dean [at] fourwalledcubicle [dot] com - www.fourwalledcubicle.com + www.lufa-lib.org */ /* Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com) - Permission to use, copy, modify, distribute, and sell this + 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 + 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 + 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 @@ -29,9 +29,9 @@ */ /** \file - * \brief Board specific joystick driver header for the USBKEY. + * \brief Board specific joystick driver header for the Atmel USBKEY. * - * Board specific joystick driver header for the USBKEY. + * Board specific joystick driver header for the Atmel USBKEY. * * \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. @@ -40,7 +40,7 @@ /** \ingroup Group_Joystick * @defgroup Group_Joystick_USBKEY USBKEY * - * Board specific joystick driver header for the USBKEY. + * Board specific joystick driver header for the Atmel USBKEY. * * \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. @@ -72,7 +72,7 @@ #define JOY_BMASK ((1 << 5) | (1 << 6) | (1 << 7)) #define JOY_EMASK ((1 << 4) | (1 << 5)) #endif - + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Mask for the joystick being pushed in the left direction. */ @@ -89,7 +89,7 @@ /** Mask for the joystick being pushed inward. */ #define JOY_PRESS (1 << 5) - + /* Inline Functions: */ #if !defined(__DOXYGEN__) static inline void Joystick_Init(void) @@ -98,9 +98,9 @@ DDRE &= ~(JOY_EMASK); PORTB |= JOY_BMASK; - PORTE |= JOY_EMASK; + PORTE |= JOY_EMASK; } - + static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t Joystick_GetStatus(void) { @@ -116,3 +116,4 @@ #endif /** @} */ +