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

Add branch for the conversion of demos to use standard C header files for configuration, rather than makefile defined macros.

Browse source
This commit is contained in:
Dean Camera 2012-05-10 19:24:58 +00:00
parent e8570c4a37
commit 359fbfe14d
395 changed files with 9912 additions and 2756 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/MediaController/Descriptors.c
View file

@ -149,10 +149,10 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
.EndpointAddress = (ENDPOINT_DIR_IN | MEDIACONTROL_HID_EPNUM),
.EndpointAddress = MEDIACONTROL_HID_EPADDR,
.Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = MEDIACONTROL_HID_EPSIZE,
.PollingIntervalMS = 0x01
.PollingIntervalMS = 0x05
},
};

8
Projects/MediaController/Descriptors.h
View file

@ -57,11 +57,11 @@
} USB_Descriptor_Configuration_t;
/* Macros: */
/** Endpoint number of the Media Control HID reporting IN endpoint. */
#define MEDIACONTROL_HID_EPNUM 1
/** Endpoint address of the Media Control HID reporting IN endpoint. */
#define MEDIACONTROL_HID_EPADDR (ENDPOINT_DIR_IN | 1)
/** Size in bytes of the Media Control HID reporting IN and OUT endpoints. */
#define MEDIACONTROL_HID_EPSIZE 8
/** Size in bytes of the Media Control HID reporting IN endpoint. */
#define MEDIACONTROL_HID_EPSIZE 8
/* Function Prototypes: */
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

11
Projects/MediaController/MediaController.c
View file

@ -48,11 +48,12 @@ USB_ClassInfo_HID_Device_t MediaControl_HID_Interface =
.Config =
{
.InterfaceNumber = 0,
.ReportINEndpointNumber = MEDIACONTROL_HID_EPNUM,
.ReportINEndpointSize = MEDIACONTROL_HID_EPSIZE,
.ReportINEndpointDoubleBank = false,
.ReportINEndpoint =
{
.Address = MEDIACONTROL_HID_EPADDR,
.Size = MEDIACONTROL_HID_EPSIZE,
.Banks = 1,
},
.PrevReportINBuffer = PrevMediaControlHIDReportBuffer,
.PrevReportINBufferSize = sizeof(PrevMediaControlHIDReportBuffer),
},