X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FUSB%2FCore%2Fusb_proto.h;h=5641dd245ae879d0344c419a8138a0f2b7f88e73;hb=8de6b4e1a2050289458d6489551eb61b6c1d3645;hp=776237daea52568c8ac8910fb2084214dfe35b6c;hpb=b77a57935b392d5b056b83f0e2dd03ab894bc0ce;p=tpg%2Facess2.git diff --git a/Modules/USB/Core/usb_proto.h b/Modules/USB/Core/usb_proto.h index 776237da..5641dd24 100644 --- a/Modules/USB/Core/usb_proto.h +++ b/Modules/USB/Core/usb_proto.h @@ -1,4 +1,9 @@ /** + * Acess2 USB Stack + * - By John Hodge (thePowersGang) + * + * usb_proto.h + * - USB Core Protocol Definitions */ #ifndef _USB_PROTO_H_ #define _USB_PROTO_H_ @@ -33,7 +38,7 @@ struct sDescriptor_Device Uint8 SerialNumberStr; Uint8 NumConfigurations; -}; +} PACKED; struct sDescriptor_Configuration { @@ -46,15 +51,15 @@ struct sDescriptor_Configuration Uint8 ConfigurationStr; Uint8 AttributesBmp; Uint8 MaxPower; // in units of 2 mA -}; +} PACKED; struct sDescriptor_String { Uint8 Length; Uint8 Type; // = 3 - Uint16 Data[62]; // 62 is arbitary -}; + Uint16 Data[128-1]; // (256 bytes - 2 bytes) / Uint16 +} PACKED; struct sDescriptor_Interface { @@ -70,13 +75,13 @@ struct sDescriptor_Interface Uint8 InterfaceProtocol; Uint8 InterfaceStr; -}; +} PACKED; struct sDescriptor_Endpoint { Uint8 Length; Uint8 Type; // = 5 - Uint8 Address; // 3:0 Endpoint Num, 7: Direction (IN/OUT) + Uint8 Address; // 3:0 Endpoint Num, 7: Direction (1=IN) /** * 1:0 - Transfer Type * - 00 = Control @@ -100,7 +105,7 @@ struct sDescriptor_Endpoint * */ Uint8 PollingInterval; -}; +} PACKED; #endif