Documentation improvements - put driver example code into its own section, fix incorr...

[pub/USBasp.git] / Demos / Device / ClassDriver / MassStorageKeyboard / Descriptors.c

diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c
index 0a42af7..5459eb7 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c
@@ -3,7 +3,7 @@
      Copyright (C) Dean Camera, 2010.
 
   dean [at] fourwalledcubicle [dot] com
      Copyright (C) Dean Camera, 2010.
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*


@@ -102,9 +102,9 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
        .USBSpecification       = VERSION_BCD(01.10),
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
        .USBSpecification       = VERSION_BCD(01.10),

-       .Class                  = 0x00,
-       .SubClass               = 0x00,
-       .Protocol               = 0x00,
+       .Class                  = USB_CSCP_NoDeviceClass,
+       .SubClass               = USB_CSCP_NoDeviceSubclass,
+       .Protocol               = USB_CSCP_NoDeviceProtocol,

 
        .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 
 
        .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 


@@ -150,9 +150,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
                        .TotalEndpoints         = 2,
 
 
                        .TotalEndpoints         = 2,
 

-                       .Class                  = 0x08,
-                       .SubClass               = 0x06,
-                       .Protocol               = 0x50,
+                       .Class                  = MS_CSCP_MassStorageClass,
+                       .SubClass               = MS_CSCP_SCSITransparentSubclass,
+                       .Protocol               = MS_CSCP_BulkOnlyTransportProtocol,

 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },


@@ -162,9 +162,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
 
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | MASS_STORAGE_IN_EPNUM),
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
 
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | MASS_STORAGE_IN_EPNUM),

-                       .Attributes             = EP_TYPE_BULK,
+                       .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

                        .EndpointSize           = MASS_STORAGE_IO_EPSIZE,
                        .EndpointSize           = MASS_STORAGE_IO_EPSIZE,

-                       .PollingIntervalMS      = 0x00
+                       .PollingIntervalMS      = 0x01

                },
 
        .MS_DataOutEndpoint =
                },
 
        .MS_DataOutEndpoint =


@@ -172,9 +172,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
 
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | MASS_STORAGE_OUT_EPNUM),
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
 
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | MASS_STORAGE_OUT_EPNUM),

-                       .Attributes             = EP_TYPE_BULK,
+                       .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

                        .EndpointSize           = MASS_STORAGE_IO_EPSIZE,
                        .EndpointSize           = MASS_STORAGE_IO_EPSIZE,

-                       .PollingIntervalMS      = 0x00
+                       .PollingIntervalMS      = 0x01

                },
 
        .HID_KeyboardInterface =
                },
 
        .HID_KeyboardInterface =


@@ -186,9 +186,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
                        .TotalEndpoints         = 1,
 
 
                        .TotalEndpoints         = 1,
 

-                       .Class                  = 0x03,
-                       .SubClass               = 0x01,
-                       .Protocol               = HID_BOOTP_KeyboardBootProtocol,
+                       .Class                  = HID_CSCP_HIDClass,
+                       .SubClass               = HID_CSCP_BootSubclass,
+                       .Protocol               = HID_CSCP_KeyboardBootProtocol,

 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },


@@ -209,9 +209,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
 
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | KEYBOARD_EPNUM),
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
 
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | KEYBOARD_EPNUM),

-                       .Attributes             = EP_TYPE_INTERRUPT,
+                       .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

                        .EndpointSize           = KEYBOARD_EPSIZE,
                        .EndpointSize           = KEYBOARD_EPSIZE,

-                       .PollingIntervalMS      = 0x04
+                       .PollingIntervalMS      = 0x01

                },
 };
 
                },
 };