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

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

diff --git a/Modules/USB/Core/usb.h b/Modules/USB/Core/usb.h
index 9bc45c8..177d7c7 100644 (file)
--- a/Modules/USB/Core/usb.h
+++ b/Modules/USB/Core/usb.h
@@ -5,37 +5,22 @@
 #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 sUSBHub tUSBHub;
-typedef struct sUSBDevice      tUSBDevice;
 
 // === STRUCTURES ===
-/**
- * \brief Defines a USB Host Controller type
- */
-struct sUSBHost
-{
-       tUSBHost        *Next;
-
-       void    (*CheckPorts)(void *Ptr);
-
-       void    *(*SendIN)(void *Ptr, int Fcn, int Endpt, int DataTgl, int bIOC, void *Data, size_t Length);
-       void    *(*SendOUT)(void *Ptr, int Fcn, int Endpt, int DataTgl, int bIOC, void *Data, size_t Length);
-       void    *(*SendSETUP)(void *Ptr, int Fcn, int Endpt, int DataTgl, int bIOC, void *Data, size_t Length);
-};
-
 /**
  * \brief USB Hub data
  */
 struct sUSBHub
 {
-       /**
-        * \brief Host controller used
-        */
-       tUSBHost        *HostDef;
-       void    *Controller;
-
+       tUSBDevice      *Device;
+       
+       tUSB_HubPoll    CheckPorts;
+       
         int    nPorts;
        tUSBDevice      *Devices[];
 };
@@ -46,19 +31,31 @@ struct sUSBHub
 struct sUSBDevice
 {
        tUSBDevice      *Next;
-       tUSBDevice      *Hub;
+       tUSBHub *ParentHub;
 
+       /**
+        * \brief Host controller used
+        */
+       tUSBHost        *Host;
         int    Address;
        
-        int    Type;
+       tUSBDriver      *Driver;
+       void    *Data;
+};
+
+struct sUSBHost
+{
+       struct sUSBHost *Next;
+       
+       tUSBHostDef     *HostDef;
+       void    *Ptr;
+       
+       Uint8   AddressBitmap[128/8];
        
-       union {
-               tUSBHub Hub;
-               char    Impl[0];
-       }       Data;
+       tUSBDevice      RootHubDev;
+       tUSBHub RootHub;
 };
 
-extern void    USB_RegisterHost(tUSBHost *HostDef, void *ControllerPtr);
 extern void    USB_NewDevice(tUSBHub *Hub);
 
 #endif