gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-06-10 02:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing C++ linkage command in ArchitectureSpecific.h.

Browse Source 
Fix missing closing brace in an Endpoint function for the UC3 targets.
This commit is contained in:
Dean Camera 2011-09-21 23:40:05 +00:00
parent b5682f2c44
commit 022fa26b43
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Demos/Device/ClassDriver/Keyboard/Keyboard.c
View File

@ -139,8 +139,11 @@ void EVENT_USB_Device_StartOfFrame(void)
* *
* \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent * \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent
*/ */
bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize) uint8_t* const ReportID,
const uint8_t ReportType,
void* ReportData,
uint16_t* const ReportSize)
{ {
USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData; USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;

5
LUFA/Common/ArchitectureSpecific.h
View File

@ -56,6 +56,11 @@
#error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality. #error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality.
#endif #endif
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
extern "C" {
#endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
/* Macros: */ /* Macros: */
#if (ARCH == ARCH_AVR8) || defined(__DOXYGEN__) #if (ARCH == ARCH_AVR8) || defined(__DOXYGEN__)

2
LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
View File

@ -305,7 +305,7 @@
((uint32_t)Type << AVR32_USBB_EPTYPE_OFFSET) | ((uint32_t)Type << AVR32_USBB_EPTYPE_OFFSET) |
((uint32_t)(Direction ? AVR32_USBB_UECFG0_EPDIR_MASK : 0) | ((uint32_t)(Direction ? AVR32_USBB_UECFG0_EPDIR_MASK : 0) |
((uint32_t)Banks << AVR32_USBB_EPBK_OFFSET) | ((uint32_t)Banks << AVR32_USBB_EPBK_OFFSET) |
Endpoint_BytesToEPSizeMask(Size))); Endpoint_BytesToEPSizeMask(Size))));
} }
/** Indicates the number of bytes currently stored in the current endpoint's selected bank. /** Indicates the number of bytes currently stored in the current endpoint's selected bank.

2
LUFA/ManPages/LUFAPoweredProjects.txt
View File

@ -37,6 +37,7 @@
* *
* - Accelerometer Game Joystick: http://www.crictor.co.il/he/episodes/joystick/ * - Accelerometer Game Joystick: http://www.crictor.co.il/he/episodes/joystick/
* - Arcade Controller: http://fletchtronics.net/arcade-controller-made-petunia * - Arcade Controller: http://fletchtronics.net/arcade-controller-made-petunia
* - Arcade Joystick: http://jamie.lentin.co.uk/embedded/arcade-joystick/
* - AVR USB Modem, a 3G Wireless Modem host: http://code.google.com/p/avrusbmodem/ * - AVR USB Modem, a 3G Wireless Modem host: http://code.google.com/p/avrusbmodem/
* - Bicycle POV: http://www.code.google.com/p/bicycleledpov/ * - Bicycle POV: http://www.code.google.com/p/bicycleledpov/
* - Bluetooth Explorerbot: http://code.google.com/p/bluetooth-explorerbot/ * - Bluetooth Explorerbot: http://code.google.com/p/bluetooth-explorerbot/
@ -85,6 +86,7 @@
* - SDR1, a Software Defined Radio firmware: https://code.google.com/p/sdr-mk1/ * - SDR1, a Software Defined Radio firmware: https://code.google.com/p/sdr-mk1/
* - SEGA Megadrive/Genesis Development Cartridge: http://www.makestuff.eu/wordpress/?page_id=398 * - SEGA Megadrive/Genesis Development Cartridge: http://www.makestuff.eu/wordpress/?page_id=398
* - Serial Line bus analyser: http://www.pjrc.com/teensy/projects/SerialAnalyzer.html * - Serial Line bus analyser: http://www.pjrc.com/teensy/projects/SerialAnalyzer.html
* - Smartcard Detective: https://code.google.com/p/smartcarddetective/
* - SmartportVHD Apple II Mass Storage adapter: http://pcedric3.free.fr/SmartportVHD/ * - SmartportVHD Apple II Mass Storage adapter: http://pcedric3.free.fr/SmartportVHD/
* - Single LED Matrix Display: http://guysoft.wordpress.com/2009/10/08/bumble-b/ * - Single LED Matrix Display: http://guysoft.wordpress.com/2009/10/08/bumble-b/
* - Stripe Snoop, a Magnetic Card reader: http://www.ossguy.com/ss_usb/ * - Stripe Snoop, a Magnetic Card reader: http://www.ossguy.com/ss_usb/