[ros-diffs] [cgutman] 47192: [USBD] - Fix usbd build and enable it

Author: cgutman
Date: Thu May 13 04:47:35 2010
New Revision: 47192

URL: http://svn.reactos.org/svn/reactos?rev=47192&view=rev
Log:
[USBD]
- Fix usbd build and enable it

Modified:
    branches/aicom-hardware-fun/drivers/usb/directory.rbuild
    branches/aicom-hardware-fun/drivers/usb/usbd/usbd.c
    branches/aicom-hardware-fun/drivers/usb/usbd/usbd.spec

Modified: branches/aicom-hardware-fun/drivers/usb/directory.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/…
==============================================================================
--- branches/aicom-hardware-fun/drivers/usb/directory.rbuild [iso-8859-1] (original)
+++ branches/aicom-hardware-fun/drivers/usb/directory.rbuild [iso-8859-1] Thu May 13
04:47:35 2010
@@ -7,9 +7,9 @@
 	<directory name="nt4compat">
 		<xi:include href="nt4compat/directory.rbuild" />
 	</directory>
-	<!--directory name="usbd">
+	<directory name="usbd">
 		<xi:include href="usbd/usbd.rbuild" />
-	</directory-->
+	</directory>
 	<directory name="usbhub">
 		<xi:include href="usbhub/usbhub.rbuild" />
 	</directory>

Modified: branches/aicom-hardware-fun/drivers/usb/usbd/usbd.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/…
==============================================================================
--- branches/aicom-hardware-fun/drivers/usb/usbd/usbd.c [iso-8859-1] (original)
+++ branches/aicom-hardware-fun/drivers/usb/usbd/usbd.c [iso-8859-1] Thu May 13 04:47:35
2010
@@ -51,26 +51,8 @@
 /*
  * @implemented
  */
-DWORD NTAPI
-DllInitialize(DWORD Unknown)
-{
-    return 0;
-}
-
-/*
- * @implemented
- */
-DWORD NTAPI
-DllUnload(VOID)
-{
-    return 0;
-}
-
-/*
- * @implemented
- */
 PVOID NTAPI
-USBD_Debug_GetHeap(DWORD Unknown1, POOL_TYPE PoolType, ULONG NumberOfBytes,
+USBD_Debug_GetHeap(ULONG Unknown1, POOL_TYPE PoolType, ULONG NumberOfBytes,
 	ULONG Tag)
 {
     return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag);
@@ -80,7 +62,7 @@
  * @implemented
  */
 VOID NTAPI
-USBD_Debug_RetHeap(PVOID Heap, DWORD Unknown2, DWORD Unknown3)
+USBD_Debug_RetHeap(PVOID Heap, ULONG Unknown2, ULONG Unknown3)
 {
     ExFreePool(Heap);
 }
@@ -98,7 +80,7 @@
  * @implemented
  */
 PVOID NTAPI
-USBD_AllocateDeviceName(DWORD Unknown)
+USBD_AllocateDeviceName(ULONG Unknown)
 {
     return NULL;
 }
@@ -106,20 +88,20 @@
 /*
  * @implemented
  */
-DWORD NTAPI
+ULONG NTAPI
 USBD_CalculateUsbBandwidth(
     ULONG MaxPacketSize,
     UCHAR EndpointType,
     BOOLEAN LowSpeed
     )
 {
-    DWORD OverheadTable[] = {
+    ULONG OverheadTable[] = {
             0x00, /* UsbdPipeTypeControl */
             0x09, /* UsbdPipeTypeIsochronous */
             0x00, /* UsbdPipeTypeBulk */
             0x0d  /* UsbdPipeTypeInterrupt */
         };
-    DWORD Result;
+    ULONG Result;
 
     if (OverheadTable[EndpointType] != 0)
     {
@@ -134,8 +116,8 @@
 /*
  * @implemented
  */
-DWORD NTAPI
-USBD_Dispatch(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, DWORD Unknown4)
+ULONG NTAPI
+USBD_Dispatch(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3, ULONG Unknown4)
 {
     return 1;
 }
@@ -167,8 +149,8 @@
 /*
  * @implemented
  */
-DWORD NTAPI
-USBD_GetSuspendPowerState(DWORD Unknown1)
+ULONG NTAPI
+USBD_GetSuspendPowerState(ULONG Unknown1)
 {
     return 0;
 }
@@ -177,56 +159,56 @@
  * @implemented
  */
 NTSTATUS NTAPI
-USBD_InitializeDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3,
-    DWORD Unknown4, DWORD Unknown5, DWORD Unknown6)
-{
-    return STATUS_NOT_SUPPORTED;
-}
-
-/*
- * @implemented
- */
-NTSTATUS NTAPI
-USBD_RegisterHostController(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3,
-    DWORD Unknown4, DWORD Unknown5, DWORD Unknown6, DWORD Unknown7,
-    DWORD Unknown8, DWORD Unknown9, DWORD Unknown10)
-{
-    return STATUS_NOT_SUPPORTED;
-}
-
-/*
- * @implemented
- */
-NTSTATUS NTAPI
-USBD_GetDeviceInformation(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3)
-{
-    return STATUS_NOT_SUPPORTED;
-}
-
-/*
- * @implemented
- */
-NTSTATUS NTAPI
-USBD_CreateDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3,
-    DWORD Unknown4, DWORD Unknown5)
-{
-    return STATUS_NOT_SUPPORTED;
-}
-
-/*
- * @implemented
- */
-NTSTATUS NTAPI
-USBD_RemoveDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3)
-{
-    return STATUS_NOT_SUPPORTED;
-}
-
-/*
- * @implemented
- */
-VOID NTAPI
-USBD_CompleteRequest(DWORD Unknown1, DWORD Unknown2)
+USBD_InitializeDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3,
+    ULONG Unknown4, ULONG Unknown5, ULONG Unknown6)
+{
+    return STATUS_NOT_SUPPORTED;
+}
+
+/*
+ * @implemented
+ */
+NTSTATUS NTAPI
+USBD_RegisterHostController(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3,
+    ULONG Unknown4, ULONG Unknown5, ULONG Unknown6, ULONG Unknown7,
+    ULONG Unknown8, ULONG Unknown9, ULONG Unknown10)
+{
+    return STATUS_NOT_SUPPORTED;
+}
+
+/*
+ * @implemented
+ */
+NTSTATUS NTAPI
+USBD_GetDeviceInformation(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3)
+{
+    return STATUS_NOT_SUPPORTED;
+}
+
+/*
+ * @implemented
+ */
+NTSTATUS NTAPI
+USBD_CreateDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3,
+    ULONG Unknown4, ULONG Unknown5)
+{
+    return STATUS_NOT_SUPPORTED;
+}
+
+/*
+ * @implemented
+ */
+NTSTATUS NTAPI
+USBD_RemoveDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3)
+{
+    return STATUS_NOT_SUPPORTED;
+}
+
+/*
+ * @implemented
+ */
+VOID NTAPI
+USBD_CompleteRequest(ULONG Unknown1, ULONG Unknown2)
 {
 }
 
@@ -245,15 +227,15 @@
  * @implemented
  */
 VOID NTAPI
-USBD_SetSuspendPowerState(DWORD Unknown1, DWORD Unknown2)
-{
-}
-
-/*
- * @implemented
- */
-NTSTATUS NTAPI
-USBD_MakePdoName(DWORD Unknown1, DWORD Unknown2)
+USBD_SetSuspendPowerState(ULONG Unknown1, ULONG Unknown2)
+{
+}
+
+/*
+ * @implemented
+ */
+NTSTATUS NTAPI
+USBD_MakePdoName(ULONG Unknown1, ULONG Unknown2)
 {
     return STATUS_NOT_SUPPORTED;
 }
@@ -289,17 +271,17 @@
  * @implemented
  */
 NTSTATUS NTAPI
-USBD_RestoreDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3)
-{
-    return STATUS_NOT_SUPPORTED;
-}
-
-/*
- * @implemented
- */
-VOID NTAPI
-USBD_RegisterHcDeviceCapabilities(DWORD Unknown1, DWORD Unknown2,
-    DWORD Unknown3)
+USBD_RestoreDevice(ULONG Unknown1, ULONG Unknown2, ULONG Unknown3)
+{
+    return STATUS_NOT_SUPPORTED;
+}
+
+/*
+ * @implemented
+ */
+VOID NTAPI
+USBD_RegisterHcDeviceCapabilities(ULONG Unknown1, ULONG Unknown2,
+    ULONG Unknown3)
 {
 }
 
@@ -315,8 +297,8 @@
     )
 {
     PURB Urb;
-    DWORD UrbSize;
-    DWORD InterfaceCount;
+    ULONG UrbSize;
+    ULONG InterfaceCount;
 
     for (InterfaceCount = 0;
          InterfaceList[InterfaceCount].InterfaceDescriptor != NULL;
@@ -363,7 +345,7 @@
 {
     ULONG_PTR Current;
     PUSB_INTERFACE_DESCRIPTOR CurrentDescriptor = InterfaceDescriptor;
-    DWORD Length = CurrentDescriptor->bLength;
+    ULONG Length = CurrentDescriptor->bLength;
 
     // USB_ENDPOINT_DESCRIPTOR_TYPE
     if (CurrentDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE)
@@ -478,7 +460,7 @@
 /*
  * @implemented
  */
-DWORD NTAPI
+ULONG NTAPI
 USBD_GetPdoRegistryParameter(
     PDEVICE_OBJECT PhysicalDeviceObject,
     PVOID Parameter,

Modified: branches/aicom-hardware-fun/drivers/usb/usbd/usbd.spec
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/…
==============================================================================
--- branches/aicom-hardware-fun/drivers/usb/usbd/usbd.spec [iso-8859-1] (original)
+++ branches/aicom-hardware-fun/drivers/usb/usbd/usbd.spec [iso-8859-1] Thu May 13
04:47:35 2010
@@ -1,9 +1,9 @@
-USBD_Debug_GetHeap(long long long long)
-USBD_Debug_RetHeap(ptr long long)
-USBD_CalculateUsbBandwidth(long long long)
-USBD_CreateConfigurationRequestEx(ptr ptr)
-USBD_CreateConfigurationRequest(ptr ptr)
-USBD_GetInterfaceLength(ptr ptr)
-USBD_ParseConfigurationDescriptorEx(ptr ptr long long long long long)
-USBD_ParseDescriptors(ptr long ptr long)
-;USBD_GetPdoRegistryParameters
+@ stdcall USBD_Debug_GetHeap(long long long long)
+@ stdcall USBD_Debug_RetHeap(ptr long long)
+@ stdcall USBD_CalculateUsbBandwidth(long long long)
+@ stdcall USBD_CreateConfigurationRequestEx(ptr ptr)
+@ stdcall USBD_CreateConfigurationRequest(ptr ptr)
+@ stdcall USBD_GetInterfaceLength(ptr ptr)
+@ stdcall USBD_ParseConfigurationDescriptorEx(ptr ptr long long long long long)
+@ stdcall USBD_ParseDescriptors(ptr long ptr long)
+@ stdcall USBD_GetPdoRegistryParameter(ptr ptr long ptr long)