Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2

[tpg/acess2.git] / Modules / USB / Core / usb_proto.h

diff --git a/Modules/USB/Core/usb_proto.h b/Modules/USB/Core/usb_proto.h
index 776237d..5641dd2 100644 (file)
--- 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