X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/cd0adb7574525978f50eabd536f7563f2d9f9aa7..c2de01b66186f8f195b6d19c311a67d1aede6d57:/LUFA/Drivers/Board/BUMBLEB/Joystick.h diff --git a/LUFA/Drivers/Board/BUMBLEB/Joystick.h b/LUFA/Drivers/Board/BUMBLEB/Joystick.h index edcf5320f..5d57ec559 100644 --- a/LUFA/Drivers/Board/BUMBLEB/Joystick.h +++ b/LUFA/Drivers/Board/BUMBLEB/Joystick.h @@ -1,21 +1,21 @@ /* LUFA Library - Copyright (C) Dean Camera, 2009. + Copyright (C) Dean Camera, 2010. dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ /* - Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com) - - Permission to use, copy, modify, and distribute this software - and its documentation for any purpose and without fee is hereby - granted, 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 + 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 @@ -40,6 +40,12 @@ /** \ingroup Group_Joystick * @defgroup Group_Joystick_BUMBLEB BUMBLEB * + * 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 + * dispatch header located in LUFA/Drivers/Board/Joystick.h. + * * @{ */ @@ -57,7 +63,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_JOYSTICK_H) + #if !defined(__INCLUDE_FROM_JOYSTICK_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead. #endif @@ -90,7 +96,7 @@ { DDRD &= ~JOY_MASK; PORTD |= JOY_MASK; - }; + } static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t Joystick_GetStatus(void)