X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FUSB%2FUHCI%2Fuhci.h;h=a93459a96d791e6e6779f3cbe3bbc5df3a11ffa9;hb=4c717bb526a0a7b1aa44ed7fc4f07a6b7da5d2f9;hp=6056c987ad4f5c199a291747cd8d353225d0aaca;hpb=b77a57935b392d5b056b83f0e2dd03ab894bc0ce;p=tpg%2Facess2.git

diff --git a/Modules/USB/UHCI/uhci.h b/Modules/USB/UHCI/uhci.h
index 6056c987..a93459a9 100644
--- a/Modules/USB/UHCI/uhci.h
+++ b/Modules/USB/UHCI/uhci.h
@@ -24,10 +24,20 @@ struct sUHCI_Controller
 	 */
 	Uint16	IOBase;
 	
+	/**
+	 * \brief Memory Mapped-IO base address
+	 */
+	Uint16	*MemIOMap;
+
 	/**
 	 * \brief IRQ Number assigned to the device
 	 */
 	 int	IRQNum;
+
+	/**
+	 * \brief Number of the last frame to be cleaned
+	 */
+	 int	LastCleanedFrame;
 	
 	/**
 	 * \brief Frame list
@@ -104,20 +114,14 @@ struct sUHCI_TD
 	 */
 	Uint32	BufferPointer;
 
-	union
+	struct
 	{
-		/**
-		 * \brief Avaliable for use by software
-		 */
-		Uint32	Avaliable[4];
-		
-		struct
-		{
-			void	*Callback;
-			void	*DestPtr;
-		} _info;
-	};
-};
+		tUSBHostCb	Callback;
+		void	*CallbackPtr;
+		void	*DataPtr;
+		 int	bCopyData;
+	} _info;
+} __attribute__((aligned(16)));
 
 struct sUHCI_QH
 {