diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-03-22 07:12:25 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-03-22 07:12:25 +0000 |
| commit | 49b09a2042368947ab34f788f00b710183912285 (patch) | |
| tree | 5f7a09d599f84d37d1b122b66e6c0c0b62731c5e /Demos/Device/Incomplete | |
| parent | 5227ca4ce2be126b118a900e9242c813fef5e6bf (diff) | |
| download | lufa-49b09a2042368947ab34f788f00b710183912285.tar.gz lufa-49b09a2042368947ab34f788f00b710183912285.tar.bz2 lufa-49b09a2042368947ab34f788f00b710183912285.zip | |
Standardized the naming scheme given to configuration descriptor sub-elements in the Device mode demos, bootloaders and projects.
Fix errors in the MouseHostWithParser demo from incorrect use of the HID_ALIGN_DATA() macro.
Diffstat (limited to 'Demos/Device/Incomplete')
| -rw-r--r-- | Demos/Device/Incomplete/Sideshow/Descriptors.c | 8 | ||||
| -rw-r--r-- | Demos/Device/Incomplete/Sideshow/Descriptors.h | 6 | ||||
| -rw-r--r-- | Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.h | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/Demos/Device/Incomplete/Sideshow/Descriptors.c b/Demos/Device/Incomplete/Sideshow/Descriptors.c index f04b2f6a0..8f36caec3 100644 --- a/Demos/Device/Incomplete/Sideshow/Descriptors.c +++ b/Demos/Device/Incomplete/Sideshow/Descriptors.c @@ -54,7 +54,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
- Config:
+ .Config =
{
Header: {Size: sizeof(USB_Descriptor_Configuration_Header_t), Type: DTYPE_Configuration},
@@ -69,7 +69,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = MaxPowerConsumption: USB_CONFIG_POWER_MA(100)
},
- Interface:
+ .SSHOW_Interface =
{
Header: {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface},
@@ -85,7 +85,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = InterfaceStrIndex: NO_DESCRIPTOR
},
- DataInEndpoint:
+ .SSHOW_DataInEndpoint =
{
Header: {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},
@@ -95,7 +95,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = PollingIntervalMS: 0x00
},
- DataOutEndpoint:
+ .SSHOW_DataOutEndpoint =
{
Header: {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},
diff --git a/Demos/Device/Incomplete/Sideshow/Descriptors.h b/Demos/Device/Incomplete/Sideshow/Descriptors.h index 409f0c806..564b44cfe 100644 --- a/Demos/Device/Incomplete/Sideshow/Descriptors.h +++ b/Demos/Device/Incomplete/Sideshow/Descriptors.h @@ -47,9 +47,9 @@ typedef struct
{
USB_Descriptor_Configuration_Header_t Config;
- USB_Descriptor_Interface_t Interface;
- USB_Descriptor_Endpoint_t DataInEndpoint;
- USB_Descriptor_Endpoint_t DataOutEndpoint;
+ USB_Descriptor_Interface_t SSHOW_Interface;
+ USB_Descriptor_Endpoint_t SSHOW_DataInEndpoint;
+ USB_Descriptor_Endpoint_t SSHOW_DataOutEndpoint;
} USB_Descriptor_Configuration_t;
typedef struct
diff --git a/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.h b/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.h index ec5afacd8..b34567f68 100644 --- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.h +++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.h @@ -35,6 +35,7 @@ #include <avr/io.h>
#include <stdbool.h>
#include <string.h>
+ #include <stdio.h>
#include "SideshowCommon.h"
#include "SideshowApplications.h"
|