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

Oops - Mouse ClassDriver multi-arch demo changes were applied to trunk, rather than the correct branch.

Browse source
This commit is contained in:
Dean Camera 2011-06-20 15:06:17 +00:00
parent 3bd36f811c
commit 84ddf237db
5 changed files with 34 additions and 582 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Demos/Device/ClassDriver/Mouse/Descriptors.c
View file

@ -72,13 +72,13 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
.Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
.VendorID = CPU_TO_LE16(0x03EB),
.ProductID = CPU_TO_LE16(0x2041),
.ReleaseNumber = VERSION_BCD(00.02),
.VendorID = 0x03EB,
.ProductID = 0x2041,
.ReleaseNumber = VERSION_BCD(00.01),
.ManufacturerStrIndex = 0x01,
.ProductStrIndex = 0x02,
.SerialNumStrIndex = USE_INTERNAL_SERIAL,
.SerialNumStrIndex = NO_DESCRIPTOR,
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
};
@ -94,7 +94,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{
.Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
.TotalConfigurationSize = CPU_TO_LE16(sizeof(USB_Descriptor_Configuration_t)),
.TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
.TotalInterfaces = 1,
.ConfigurationNumber = 1,
@ -129,7 +129,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.CountryCode = 0x00,
.TotalReportDescriptors = 1,
.HIDReportType = HID_DTYPE_Report,
.HIDReportLength = CPU_TO_LE16(sizeof(MouseReport))
.HIDReportLength = sizeof(MouseReport)
},
.HID_ReportINEndpoint =
@ -138,7 +138,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | MOUSE_EPNUM),
.Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = CPU_TO_LE16(MOUSE_EPSIZE),
.EndpointSize = MOUSE_EPSIZE,
.PollingIntervalMS = 0x01
}
};
@ -162,17 +162,7 @@ const USB_Descriptor_String_t PROGMEM ManufacturerString =
{
.Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
.UnicodeString = {CPU_TO_LE16('D'),
CPU_TO_LE16('e'),
CPU_TO_LE16('a'),
CPU_TO_LE16('n'),
CPU_TO_LE16(' '),
CPU_TO_LE16('C'),
CPU_TO_LE16('a'),
CPU_TO_LE16('m'),
CPU_TO_LE16('e'),
CPU_TO_LE16('r'),
CPU_TO_LE16('a')}
.UnicodeString = L"Dean Camera"
};
/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
@ -183,21 +173,7 @@ const USB_Descriptor_String_t PROGMEM ProductString =
{
.Header = {.Size = USB_STRING_LEN(15), .Type = DTYPE_String},
.UnicodeString = {CPU_TO_LE16('L'),
CPU_TO_LE16('U'),
CPU_TO_LE16('F'),
CPU_TO_LE16('A'),
CPU_TO_LE16(' '),
CPU_TO_LE16('M'),
CPU_TO_LE16('o'),
CPU_TO_LE16('u'),
CPU_TO_LE16('s'),
CPU_TO_LE16('e'),
CPU_TO_LE16(' '),
CPU_TO_LE16('D'),
CPU_TO_LE16('e'),
CPU_TO_LE16('m'),
CPU_TO_LE16('o')}
.UnicodeString = L"LUFA Mouse Demo"
};
/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
@ -231,15 +207,15 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
{
case 0x00:
Address = &LanguageString;
Size = LanguageString.Header.Size;
Size = pgm_read_byte(&LanguageString.Header.Size);
break;
case 0x01:
Address = &ManufacturerString;
Size = ManufacturerString.Header.Size;
Size = pgm_read_byte(&ManufacturerString.Header.Size);
break;
case 0x02:
Address = &ProductString;
Size = ProductString.Header.Size;
Size = pgm_read_byte(&ProductString.Header.Size);
break;
}