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 0b1b7b9..8759ee1 100644 (file)
--- a/Modules/USB/Core/usb.h
+++ b/Modules/USB/Core/usb.h
@@ -5,19 +5,51 @@
 #ifndef _USB_H_
 #define _USB_H_
 
-// === TYPES ===
+#include <usb_core.h>
+#include <usb_hub.h>
+#include <usb_host.h>
+
 typedef struct sUSBHost        tUSBHost;
 typedef struct sUSBDevice      tUSBDevice;
+typedef struct sUSBEndpoint    tUSBEndpoint;
 
 // === STRUCTURES ===
 /**
- * \brief Defines a USB Host Controller
+ * \brief USB Hub data
  */
-struct sUSBHost
+struct sUSBHub
+{
+       tUSBInterface   *Interface;
+       
+        int    nPorts;
+       tUSBDevice      *Devices[];
+};
+
+struct sUSBEndpoint
 {
-        int    (*SendIN)(void *Ptr, int Fcn, int Endpt, int DataTgl, void *Data, size_t Length);
-        int    (*SendOUT)(void *Ptr, int Fcn, int Endpt, int DataTgl, void *Data, size_t Length);
-        int    (*SendSETUP)(void *Ptr, int Fcn, int Endpt, int DataTgl, void *Data, size_t Length);
+       tUSBEndpoint    *Next;  // In the poll list
+       tUSBInterface   *Interface;
+        int    EndpointNum;
+       
+        int    PollingPeriod;  // In 1ms intervals
+        int    MaxPacketSize;  // In bytes
+
+       Uint8   Type;   // Same as sUSBDriver.Endpoints.Type
+};
+
+/**
+ * \brief Structure for a device's interface
+ */
+struct sUSBInterface
+{
+       tUSBInterface   *Next;
+       tUSBDevice      *Dev;
+
+       tUSBDriver      *Driver;
+       void    *Data;
+       
+        int    nEndpoints;
+       tUSBEndpoint    Endpoints[];
 };
 
 /**
@@ -25,13 +57,32 @@ struct sUSBHost
  */
 struct sUSBDevice
 {
-       tUSBHost        *Host;
+       tUSBHub *ParentHub;
 
+       /**
+        * \brief Host controller used
+        */
+       tUSBHost        *Host;
         int    Address;
 
-        int    MaxControl;
-        int    MaxBulk;
-        int    MaxISync;
+        int    nInterfaces;
+       tUSBInterface   *Interfaces[];
 };
 
+struct sUSBHost
+{
+       struct sUSBHost *Next;
+       
+       tUSBHostDef     *HostDef;
+       void    *Ptr;
+       
+       Uint8   AddressBitmap[128/8];
+       
+       tUSBDevice      RootHubDev;
+       tUSBInterface   RootHubIf;
+       tUSBHub RootHub;
+};
+
+extern void    USB_NewDevice(tUSBHub *Hub);
+
 #endif