ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge in latest trunk.

Browse source
This commit is contained in:
Dean Camera 2012-05-20 17:16:21 +00:00
commit 5f709e281e
18 changed files with 115 additions and 361 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Projects/AVRISP-MKII/AVRISP-MKII.h
View file

@ -49,7 +49,7 @@
#include <LUFA/Drivers/Peripheral/ADC.h>
#endif
#include "Descriptors.h"
#include "AVRISPDescriptors.h"
#include "Lib/V2Protocol.h"
#include "Config/AppConfig.h"
@ -79,6 +79,12 @@
void EVENT_USB_Device_Connect(void);
void EVENT_USB_Device_Disconnect(void);
void EVENT_USB_Device_ConfigurationChanged(void);
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex,
const void** const DescriptorAddress,
uint8_t* const DescriptorMemorySpace)
ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4);
#endif