X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FUSB%2FCore%2Fusb.h;h=177d7c7fa8c2b980e679aeb4433ab042bb47f8bb;hb=79089cf3bb4828329d224c1d1cac9250bc57f932;hp=6ee841c489ff3089758d9aceed9e1022f3c1d686;hpb=0f137ffed95af2eee3b9ecd2e277e5134e15ac69;p=tpg%2Facess2.git

diff --git a/Modules/USB/Core/usb.h b/Modules/USB/Core/usb.h
index 6ee841c4..177d7c7f 100644
--- a/Modules/USB/Core/usb.h
+++ b/Modules/USB/Core/usb.h
@@ -5,89 +5,24 @@
 #ifndef _USB_H_
 #define _USB_H_
 
-// === TYPES ===
-typedef struct sUSBHost	tUSBHost;
-typedef struct sUSBDevice	tUSBDevice;
-
-// === CONSTANTS ===
-enum eUSB_TransferType
-{
-	TRANSTYPE_ISYNCH,	// Constant, Low latency, low bandwidth, no transmission retries
-	TRANSTYPE_INTERRUPT,	// -- NEVER SENT -- Spontanious, Low latency, low bandwith
-	TRANSTYPE_CONTROL,	// Device control
-	TRANSTYPE_BULK  	// High latency, high bandwidth
-};
+#include <usb_core.h>
+#include <usb_hub.h>
+#include <usb_host.h>
 
-enum eUSB_PIDs
-{
-	/**
-	 * \name Token
-	 * \{
-	 */
-	PID_OUT		= 0xE1,
-	PID_IN		= 0x69,
-	PID_SOF		= 0xA5,
-	PID_SETUP	= 0x2D,
-	/**
-	 * \}
-	 */
-	
-	/**
-	 * \name Data
-	 * \{
-	 */
-	PID_DATA0	= 0xC3,
-	PID_DATA1	= 0x4B,
-	PID_DATA2	= 0x87,	// USB2 only
-	PID_MDATA	= 0x0F,	// USB2 only
-	/**
-	 * \}
-	 */
-	
-	/**
-	 * \name Handshake
-	 * \{
-	 */
-	PID_ACK		= 0xD2,
-	PID_NAK		= 0x5A,
-	PID_STALL	= 0x1E,
-	PID_NYET	= 0x96,
-	/**
-	 * \}
-	 */
-	
-	/**
-	 * \name Special
-	 * \{
-	 */
-	PID_PRE		= 0x3C, PID_ERR		= 0x3C,
-	PID_SPLIT	= 0x78,
-	PID_PING	= 0xB4,
-	PID_RESVD	= 0xF0,
-	/**
-	 * \}
-	 */
-};
-
-// === FUNCTIONS ===
-/**
- * \note 00101 - X^5+X^2+1
- */
-extern Uint8	USB_TokenCRC(void *Data, int len);
-/**
- * \note X^16 + X15 + X^2 + 1
- */
-extern Uint16	USB_DataCRC(void *Data, int len);
+typedef struct sUSBHost	tUSBHost;
 
 // === STRUCTURES ===
 /**
- * \brief Defines a USB Host Controller
+ * \brief USB Hub data
  */
-struct sUSBHost
+struct sUSBHub
 {
-	Uint16	IOBase;
+	tUSBDevice	*Device;
 	
-	 int	(*SendPacket)(int ID, int Length, void *Data);
+	tUSB_HubPoll	CheckPorts;
+	
+	 int	nPorts;
+	tUSBDevice	*Devices[];
 };
 
 /**
@@ -95,10 +30,32 @@ struct sUSBHost
  */
 struct sUSBDevice
 {
+	tUSBDevice	*Next;
+	tUSBHub	*ParentHub;
+
+	/**
+	 * \brief Host controller used
+	 */
 	tUSBHost	*Host;
-	 int	MaxControl;
-	 int	MaxBulk;
-	 int	MaxISync;
+	 int	Address;
+	
+	tUSBDriver	*Driver;
+	void	*Data;
 };
 
+struct sUSBHost
+{
+	struct sUSBHost	*Next;
+	
+	tUSBHostDef	*HostDef;
+	void	*Ptr;
+	
+	Uint8	AddressBitmap[128/8];
+	
+	tUSBDevice	RootHubDev;
+	tUSBHub	RootHub;
+};
+
+extern void	USB_NewDevice(tUSBHub *Hub);
+
 #endif