Code cleanup:

[reactos.git] / reactos / drivers / usb / miniport / common / usbcommon.h

diff --git a/reactos/drivers/usb/miniport/common/usbcommon.h b/reactos/drivers/usb/miniport/common/usbcommon.h
index dc22e22..2f5090e 100644 (file)
--- a/reactos/drivers/usb/miniport/common/usbcommon.h
+++ b/reactos/drivers/usb/miniport/common/usbcommon.h
@@ -20,37 +20,29 @@ extern CONNECT_DATA MouseClassInformation;
 extern PDEVICE_OBJECT KeyboardFdo;
 extern PDEVICE_OBJECT MouseFdo;
 
-/* cleanup.c */
-NTSTATUS STDCALL
-UsbMpCleanup(
-       IN PDEVICE_OBJECT DeviceObject,
-       IN PIRP Irp);
-
-/* close.c */
-NTSTATUS STDCALL
-UsbMpClose(
+/* fdo.c */
+NTSTATUS
+UsbMpFdoCreate(
        IN PDEVICE_OBJECT DeviceObject,
        IN PIRP Irp);
 
-/* create.c */
-NTSTATUS STDCALL
-UsbMpCreate(
+NTSTATUS
+UsbMpFdoClose(
        IN PDEVICE_OBJECT DeviceObject,
        IN PIRP Irp);
 
-/* fdo.c */
-NTSTATUS STDCALL
-UsbMpPnpFdo(
+NTSTATUS
+UsbMpFdoCleanup(
        IN PDEVICE_OBJECT DeviceObject,
        IN PIRP Irp);
 
 NTSTATUS
-UsbMpDeviceControlFdo(
+UsbMpFdoPnp(
        IN PDEVICE_OBJECT DeviceObject,
        IN PIRP Irp);
 
 NTSTATUS
-UsbMpInternalDeviceControlFdo(
+UsbMpFdoDeviceControl(
        IN PDEVICE_OBJECT DeviceObject,
        IN PIRP Irp);
 
@@ -60,7 +52,7 @@ ForwardIrpAndWait(
        IN PDEVICE_OBJECT DeviceObject,
        IN PIRP Irp);
 
-NTSTATUS STDCALL
+NTSTATUS
 ForwardIrpAndForget(
        IN PDEVICE_OBJECT DeviceObject,
        IN PIRP Irp);
@@ -77,18 +69,41 @@ UsbMpInitMultiSzString(
        ... /* list of PCSZ */);
 
 /* pdo.c */
-NTSTATUS STDCALL
-UsbMpPnpPdo(
+NTSTATUS
+UsbMpPdoCreate(
+       IN PDEVICE_OBJECT DeviceObject,
+       IN PIRP Irp);
+
+NTSTATUS
+UsbMpPdoClose(
+       IN PDEVICE_OBJECT DeviceObject,
+       IN PIRP Irp);
+
+NTSTATUS
+UsbMpPdoCleanup(
+       IN PDEVICE_OBJECT DeviceObject,
+       IN PIRP Irp);
+
+NTSTATUS
+UsbMpPdoPnp(
+       IN PDEVICE_OBJECT DeviceObject,
+       IN PIRP Irp);
+
+NTSTATUS
+UsbMpPdoDeviceControl(
        IN PDEVICE_OBJECT DeviceObject,
        IN PIRP Irp);
 
 NTSTATUS
-UsbMpDeviceControlPdo(
+UsbMpPdoInternalDeviceControl(
        IN PDEVICE_OBJECT DeviceObject,
        IN PIRP Irp);
 
-/* Needed by this object library */
-VOID STDCALL 
+/*
+ * Needed by this object library, but not
+ * present in any file of this library
+ */
+VOID NTAPI 
 DriverUnload(PDRIVER_OBJECT DriverObject);
 
 NTSTATUS