Merge branch 'master' of epagris.com:epagris/flatUSB
This commit is contained in:
		
						commit
						e1ba91e952
					
				@ -33,7 +33,7 @@ const FullConfigurations0 fullConfDescs0 = {
 | 
				
			|||||||
     0x9,                       //bLength
 | 
					     0x9,                       //bLength
 | 
				
			||||||
     UD_Configuration,          //bDescriptorType
 | 
					     UD_Configuration,          //bDescriptorType
 | 
				
			||||||
     sizeof(struct _FullConfigurations0),       //wTotalLength
 | 
					     sizeof(struct _FullConfigurations0),       //wTotalLength
 | 
				
			||||||
     0x3,                       //bNumInterfaces
 | 
					     0x2,                       //bNumInterfaces
 | 
				
			||||||
     0x1,                       //bConfigurationValue
 | 
					     0x1,                       //bConfigurationValue
 | 
				
			||||||
     0x0,                       //iConfiguration
 | 
					     0x0,                       //iConfiguration
 | 
				
			||||||
     USB_CONFIG_ATTR_USB1_1_FLAG,       //bmAttributes
 | 
					     USB_CONFIG_ATTR_USB1_1_FLAG,       //bmAttributes
 | 
				
			||||||
@ -101,7 +101,7 @@ const FullConfigurations0 fullConfDescs0 = {
 | 
				
			|||||||
     (USB_IN << 7) | (1),       //bEndpointAddress
 | 
					     (USB_IN << 7) | (1),       //bEndpointAddress
 | 
				
			||||||
     UT_Bulk,                   //bmAttributes
 | 
					     UT_Bulk,                   //bmAttributes
 | 
				
			||||||
     0x40,                      //wMaxPacketSize
 | 
					     0x40,                      //wMaxPacketSize
 | 
				
			||||||
     0x14,                      //bInterval
 | 
					     0x0,                       //bInterval
 | 
				
			||||||
     },                         //ep1in
 | 
					     },                         //ep1in
 | 
				
			||||||
    {                           /* Endpoint descriptor : 1 out */
 | 
					    {                           /* Endpoint descriptor : 1 out */
 | 
				
			||||||
     0x7,                       //bLength
 | 
					     0x7,                       //bLength
 | 
				
			||||||
@ -109,35 +109,8 @@ const FullConfigurations0 fullConfDescs0 = {
 | 
				
			|||||||
     (USB_OUT << 7) | (1),      //bEndpointAddress
 | 
					     (USB_OUT << 7) | (1),      //bEndpointAddress
 | 
				
			||||||
     UT_Bulk,                   //bmAttributes
 | 
					     UT_Bulk,                   //bmAttributes
 | 
				
			||||||
     0x40,                      //wMaxPacketSize
 | 
					     0x40,                      //wMaxPacketSize
 | 
				
			||||||
     0x14,                      //bInterval
 | 
					     0x0,                       //bInterval
 | 
				
			||||||
     },                         //ep1out
 | 
					     },                         //ep1out
 | 
				
			||||||
    {                           /* Interface descriptor : 2 */
 | 
					 | 
				
			||||||
     0x9,                       //bLength
 | 
					 | 
				
			||||||
     UD_Interface,              //bDescriptorType
 | 
					 | 
				
			||||||
     0x2,                       //bInterfaceNumber
 | 
					 | 
				
			||||||
     0x0,                       //bAlternateSetting
 | 
					 | 
				
			||||||
     0x2,                       //bNumEndpoints
 | 
					 | 
				
			||||||
     0x2,                       //bInterfaceClass
 | 
					 | 
				
			||||||
     0xc,                       //bInterfaceSubclass
 | 
					 | 
				
			||||||
     0x7,                       //bInterfaceProtocol
 | 
					 | 
				
			||||||
     0x0,                       //iInterface
 | 
					 | 
				
			||||||
     },                         //intf2
 | 
					 | 
				
			||||||
    {                           /* Endpoint descriptor : 3 in */
 | 
					 | 
				
			||||||
     0x7,                       //bLength
 | 
					 | 
				
			||||||
     UD_Endpoint,               //bDescriptorType
 | 
					 | 
				
			||||||
     (USB_IN << 7) | (3),       //bEndpointAddress
 | 
					 | 
				
			||||||
     UT_Bulk,                   //bmAttributes
 | 
					 | 
				
			||||||
     0x40,                      //wMaxPacketSize
 | 
					 | 
				
			||||||
     0xa,                       //bInterval
 | 
					 | 
				
			||||||
     },                         //ep3in
 | 
					 | 
				
			||||||
    {                           /* Endpoint descriptor : 3 out */
 | 
					 | 
				
			||||||
     0x7,                       //bLength
 | 
					 | 
				
			||||||
     UD_Endpoint,               //bDescriptorType
 | 
					 | 
				
			||||||
     (USB_OUT << 7) | (3),      //bEndpointAddress
 | 
					 | 
				
			||||||
     UT_Bulk,                   //bmAttributes
 | 
					 | 
				
			||||||
     0x40,                      //wMaxPacketSize
 | 
					 | 
				
			||||||
     0xa,                       //bInterval
 | 
					 | 
				
			||||||
     },                         //ep3out
 | 
					 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const ConfDescs confDescs = {
 | 
					const ConfDescs confDescs = {
 | 
				
			||||||
 | 
				
			|||||||
@ -46,9 +46,6 @@ typedef struct _FullConfigurations0 {
 | 
				
			|||||||
    USB_InterfaceDesc intf1;    /* Interface descriptor : 1 */
 | 
					    USB_InterfaceDesc intf1;    /* Interface descriptor : 1 */
 | 
				
			||||||
    USB_EndpointDesc ep1in;     /* Endpoint descriptor : 1 in */
 | 
					    USB_EndpointDesc ep1in;     /* Endpoint descriptor : 1 in */
 | 
				
			||||||
    USB_EndpointDesc ep1out;    /* Endpoint descriptor : 1 out */
 | 
					    USB_EndpointDesc ep1out;    /* Endpoint descriptor : 1 out */
 | 
				
			||||||
    USB_InterfaceDesc intf2;    /* Interface descriptor : 2 */
 | 
					 | 
				
			||||||
    USB_EndpointDesc ep3in;     /* Endpoint descriptor : 3 in */
 | 
					 | 
				
			||||||
    USB_EndpointDesc ep3out;    /* Endpoint descriptor : 3 out */
 | 
					 | 
				
			||||||
} __attribute__((packed)) FullConfigurations0;
 | 
					} __attribute__((packed)) FullConfigurations0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern const FullConfigurations0 fullConfDescs0;
 | 
					extern const FullConfigurations0 fullConfDescs0;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user