Modules/USB - Cleaning up protocol code, working on device API

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

diff --git a/Modules/USB/Core/usb.h b/Modules/USB/Core/usb.h
index c293c7d..8759ee1 100644 (file)
--- a/Modules/USB/Core/usb.h
+++ b/Modules/USB/Core/usb.h
@@ -19,9 +19,7 @@ typedef struct sUSBEndpoint   tUSBEndpoint;
  */
 struct sUSBHub
 {
-       tUSBDevice      *Device;
-       
-       tUSB_HubPoll    CheckPorts;
+       tUSBInterface   *Interface;
        
         int    nPorts;
        tUSBDevice      *Devices[];
@@ -29,14 +27,14 @@ struct sUSBHub
 
 struct sUSBEndpoint
 {
-       tUSBInterface   *Interface;
        tUSBEndpoint    *Next;  // In the poll list
+       tUSBInterface   *Interface;
+        int    EndpointNum;
+       
         int    PollingPeriod;  // In 1ms intervals
         int    MaxPacketSize;  // In bytes
 
-       char    Direction;      // 1 Polled Input, 0 Output
-       
-       Uint8   Type;   // Same as sDescriptor_Endpoint.Type
+       Uint8   Type;   // Same as sUSBDriver.Endpoints.Type
 };
 
 /**
@@ -81,6 +79,7 @@ struct sUSBHost
        Uint8   AddressBitmap[128/8];
        
        tUSBDevice      RootHubDev;
+       tUSBInterface   RootHubIf;
        tUSBHub RootHub;
 };