revert 49345 as requested by ros arm team.

svn path=/branches/cmake-bringup/; revision=49373

drivers/storage/classpnp/autorun.c

@@ -769,10 +769,7 @@ ClasspSetMediaChangeStateEx(
 
     return;
 } // end ClassSetMediaChangeStateEx()
-
-SCSIPORTAPI
 VOID
-NTAPI
 ClassSetMediaChangeState(
     IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
     IN MEDIA_CHANGE_DETECTION_STATE NewState,
@@ -1391,9 +1388,7 @@ Return Value:
     none
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassCheckMediaState(
     IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
     )
@@ -1444,9 +1439,7 @@ Return Value:
     None
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassResetMediaChangeTimer(
     IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
     )
@@ -2010,9 +2003,7 @@ Arguments:
 Return Value:
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassInitializeTestUnitPolling(
     IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
     IN BOOLEAN AllowDriveToSleep
@@ -2046,9 +2037,7 @@ Arguments:
 Return Value:
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassInitializeMediaChangeDetection(
     IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
     IN PUCHAR EventPrefix
@@ -2704,9 +2693,7 @@ Arguments:
 Return Value:
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassEnableMediaChangeDetection(
     IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
     )
@@ -2790,9 +2777,7 @@ Return Value:
 --*/
 ULONG BreakOnMcnDisable = FALSE;
 
-SCSIPORTAPI
 VOID
-NTAPI
 ClassDisableMediaChangeDetection(
     IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
     )
@@ -2837,9 +2822,7 @@ Arguments:
 Return Value:
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassCleanupMediaChangeDetection(
     IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
     )
@@ -3450,9 +3433,7 @@ Arguments:
 Return Value:
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassNotifyFailurePredicted(
     PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
     PUCHAR Buffer,
@@ -3535,9 +3516,7 @@ Return Value:
     NT Status
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassSetFailurePredictionPoll(
     PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
     FAILURE_PREDICTION_METHOD FailurePredictionMethod,

drivers/storage/classpnp/class.c

@@ -115,9 +115,7 @@ Return Value:
     A valid return code for a DriverEntry routine.
 
 --*/
-SCSIPORTAPI
 ULONG
-NTAPI
 ClassInitialize(
     IN  PVOID            Argument1,
     IN  PVOID            Argument2,
@@ -363,9 +361,7 @@ Return Value:
     Status Code
 
 --*/
-SCSIPORTAPI
 ULONG
-NTAPI
 ClassInitializeEx(
     IN  PDRIVER_OBJECT   DriverObject,
     IN  LPGUID           Guid,
@@ -1729,10 +1725,7 @@ Return Value:
     Status is returned.
 
 --*/
-SCSIPORTAPI
+NTSTATUS ClassReadDriveCapacity(IN PDEVICE_OBJECT Fdo)
-NTSTATUS
-NTAPI
-ClassReadDriveCapacity(IN PDEVICE_OBJECT Fdo)
 {
     READ_CAPACITY_DATA readCapacityBuffer = {0};
     NTSTATUS status;
@@ -2015,9 +2008,7 @@ Return Value:
     None.
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassSendStartUnit(
     IN PDEVICE_OBJECT Fdo
     )
@@ -2170,9 +2161,7 @@ Return Value:
     None.
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassAsynchronousCompletion(
     PDEVICE_OBJECT DeviceObject,
     PIRP Irp,
@@ -2438,9 +2427,7 @@ Return Value:
     NT status
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassIoComplete(
     IN PDEVICE_OBJECT Fdo,
     IN PIRP Irp,
@@ -2656,9 +2643,7 @@ Return Value:
        Srb->DataTransferLength
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassSendSrbSynchronous(
     PDEVICE_OBJECT Fdo,
     PSCSI_REQUEST_BLOCK Srb,
@@ -3004,9 +2989,7 @@ Return Value:
             FALSE: Drivers should not retry this request.
 
 --*/
-SCSIPORTAPI
 BOOLEAN
-NTAPI
 ClassInterpretSenseInfo(
     IN PDEVICE_OBJECT Fdo,
     IN PSCSI_REQUEST_BLOCK Srb,
@@ -4137,10 +4120,7 @@ Return Value:
     Length of the transferred data is returned.
 
 --*/
-SCSIPORTAPI
+ULONG ClassModeSense(   IN PDEVICE_OBJECT Fdo,
-ULONG
-NTAPI
-ClassModeSense(   IN PDEVICE_OBJECT Fdo,
                         IN PCHAR ModeSenseBuffer,
                         IN ULONG Length,
                         IN UCHAR PageMode)
@@ -4226,9 +4206,7 @@ Return Value:
     then NULL is return.
 
 --*/
-SCSIPORTAPI
 PVOID
-NTAPI
 ClassFindModePage(
     IN PCHAR ModeSenseBuffer,
     IN ULONG Length,
@@ -4339,9 +4317,7 @@ Return Value:
     or returns a status value to indicate why it failed.
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassSendSrbAsynchronous(
     PDEVICE_OBJECT Fdo,
     PSCSI_REQUEST_BLOCK Srb,
@@ -4609,9 +4585,7 @@ Return Value:
    Returns back a STATUS_PENDING or a completion status.
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassDeviceControl(
     PDEVICE_OBJECT DeviceObject,
     PIRP Irp
@@ -5634,7 +5608,6 @@ Return Value:
 
 --*/
 NTSTATUS
-NTAPI
 ClassShutdownFlush(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp
@@ -5707,9 +5680,7 @@ Return Value:
     NTSTATUS
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassCreateDeviceObject(
     IN PDRIVER_OBJECT          DriverObject,
     IN PCCHAR                  ObjectNameBuffer,
@@ -6006,9 +5977,7 @@ Return Value:
     Returns a status indicating success or failure of the operation.
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassClaimDevice(
     IN PDEVICE_OBJECT LowerDeviceObject,
     IN BOOLEAN Release
@@ -6139,9 +6108,7 @@ Return Value:
    Returns back a STATUS_PENDING or a completion status.
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassInternalIoControl(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp
@@ -6213,9 +6180,7 @@ Return Value:
     None, but it sets a new default timeout for a class of devices.
 
 --*/
-SCSIPORTAPI
 ULONG
-NTAPI
 ClassQueryTimeOutRegistryValue(
     IN PDEVICE_OBJECT DeviceObject
     )
@@ -6322,9 +6287,7 @@ Return Value:
     NT status
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassCheckVerifyComplete(
     IN PDEVICE_OBJECT Fdo,
     IN PIRP Irp,
@@ -6389,9 +6352,7 @@ Return Value:
     buffer allocated on behalf of the caller.
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassGetDescriptor(
     IN PDEVICE_OBJECT DeviceObject,
     IN PSTORAGE_PROPERTY_ID PropertyId,
@@ -6540,9 +6501,7 @@ Return Value:
     STATUS_MORE_PROCESSING_REQUIRED
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassSignalCompletion(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp,
@@ -6629,9 +6588,7 @@ Return Value:
     None
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassMarkChildrenMissing(
     IN PFUNCTIONAL_DEVICE_EXTENSION Fdo
     )
@@ -6683,9 +6640,7 @@ Return Value:
     to PNP.
 
 --*/
-SCSIPORTAPI
 BOOLEAN
-NTAPI
 ClassMarkChildMissing(
     IN PPHYSICAL_DEVICE_EXTENSION Child,
     IN BOOLEAN AcquireChildLock
@@ -6939,9 +6894,7 @@ Return Value:
     none
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassInvalidateBusRelations(
     IN PDEVICE_OBJECT Fdo
     )
@@ -6996,9 +6949,7 @@ Return Value:
     status
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassRemoveDevice(
     IN PDEVICE_OBJECT DeviceObject,
     IN UCHAR RemoveType
@@ -7262,9 +7213,7 @@ Return Value:
     Either NULL if none, or a pointer to the driver extension
 
 --*/
-SCSIPORTAPI
 PCLASS_DRIVER_EXTENSION
-NTAPI
 ClassGetDriverExtension(
     IN PDRIVER_OBJECT DriverObject
     )
@@ -7348,9 +7297,7 @@ Return Value:
     None
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassUpdateInformationInRegistry(
     IN PDEVICE_OBJECT     Fdo,
     IN PCHAR              DeviceName,
@@ -7687,9 +7634,7 @@ Arguments:
 Return Value:
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassSendDeviceIoControlSynchronous(
     IN ULONG IoControlCode,
     IN PDEVICE_OBJECT TargetDeviceObject,
@@ -7946,9 +7891,7 @@ Arguments:
 Return Value:
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassForwardIrpSynchronous(
     IN PCOMMON_DEVICE_EXTENSION CommonExtension,
     IN PIRP Irp
@@ -7977,9 +7920,7 @@ Arguments:
 Return Value:
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassSendIrpSynchronous(
     IN PDEVICE_OBJECT TargetDeviceObject,
     IN PIRP Irp
@@ -8078,9 +8019,7 @@ Return Value:
     the VPB, or NULL if none.
 
 --*/
-SCSIPORTAPI
 PVPB
-NTAPI
 ClassGetVpb(
     IN PDEVICE_OBJECT DeviceObject
     )
@@ -8189,9 +8128,7 @@ Return Value:
     None.
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassReleaseQueue(
     IN PDEVICE_OBJECT Fdo
     )
@@ -8511,9 +8448,7 @@ Return Value:
     None
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassAcquireChildLock(
     IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
     )
@@ -8555,9 +8490,7 @@ Return Value:
     None.
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassReleaseChildLock(
     IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
     )

drivers/storage/classpnp/classp.h

@@ -508,7 +508,6 @@ static inline BOOLEAN SimpleIsSlistEmpty(SINGLE_LIST_ENTRY *SListHdr)
 }
 
 NTSTATUS
-NTAPI
 DriverEntry(
     IN PDRIVER_OBJECT DriverObject,
     IN PUNICODE_STRING RegistryPath
@@ -556,6 +555,12 @@ ClassDeviceControlDispatch(
     PIRP Irp
     );
 
+NTSTATUS
+ClassDeviceControl(
+    PDEVICE_OBJECT DeviceObject,
+    PIRP Irp
+    );
+
 NTSTATUS
 ClassDispatchPnp(
     PDEVICE_OBJECT DeviceObject,
@@ -568,7 +573,12 @@ ClassPnpStartDevice(
     );
 
 NTSTATUS
-NTAPI
+ClassInternalIoControl (
+    IN PDEVICE_OBJECT DeviceObject,
+    IN PIRP Irp
+    );
+
+NTSTATUS
 ClassShutdownFlush(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp

drivers/storage/classpnp/classwmi.c

@@ -561,7 +561,6 @@ Return Value:
 --*/
 SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassWmiCompleteRequest(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp,
@@ -725,9 +724,7 @@ Return Value:
     status
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassWmiFireEvent(
     IN PDEVICE_OBJECT DeviceObject,
     IN LPGUID Guid,

drivers/storage/classpnp/lock.c

@@ -78,9 +78,7 @@ Return Value:
     lock.
 
 --*/
-SCSIPORTAPI
 ULONG
-NTAPI
 ClassAcquireRemoveLockEx(
     IN PDEVICE_OBJECT DeviceObject,
     IN OPTIONAL PVOID Tag,
@@ -210,9 +208,7 @@ Return Value:
     none
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassReleaseRemoveLock(
     IN PDEVICE_OBJECT DeviceObject,
     IN OPTIONAL PIRP Tag
@@ -375,9 +371,7 @@ Return Value:
     none
 
 --*/
-SCSIPORTAPI
 VOID
-NTAPI
 ClassCompleteRequest(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp,

drivers/storage/classpnp/obsolete.c

@@ -51,10 +51,7 @@ typedef struct _CSCAN_LIST_ENTRY {
  *      StartIo routine when the transfer size is too large for the hardware.
  *      We map it to our new read/write handler.
  */
-SCSIPORTAPI
+VOID ClassSplitRequest(IN PDEVICE_OBJECT Fdo, IN PIRP Irp, IN ULONG MaximumBytes)
-VOID
-NTAPI
-ClassSplitRequest(IN PDEVICE_OBJECT Fdo, IN PIRP Irp, IN ULONG MaximumBytes)
 {
     PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension;
     PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData;
@@ -102,9 +99,7 @@ Return Value:
     NT status
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassIoCompleteAssociated(
     IN PDEVICE_OBJECT Fdo,
     IN PIRP Irp,
@@ -481,9 +476,7 @@ Return Value:
     NT Status
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassBuildRequest(
     PDEVICE_OBJECT Fdo,
     PIRP Irp
@@ -916,10 +909,7 @@ Return Value:
     None
 
 --*/
-SCSIPORTAPI
+VOID ClassDeleteSrbLookasideList(IN PCOMMON_DEVICE_EXTENSION CommonExtension)
-VOID
-NTAPI
-ClassDeleteSrbLookasideList(IN PCOMMON_DEVICE_EXTENSION CommonExtension)
 {
     PAGED_CODE();
 
@@ -962,10 +952,7 @@ Note:
 
 --*/
 
-SCSIPORTAPI
+VOID ClassInitializeSrbLookasideList(   IN PCOMMON_DEVICE_EXTENSION CommonExtension,
-VOID
-NTAPI
-ClassInitializeSrbLookasideList(   IN PCOMMON_DEVICE_EXTENSION CommonExtension,
                                         IN ULONG NumberElements)
 {
     PAGED_CODE();

drivers/storage/classpnp/power.c

@@ -1387,9 +1387,7 @@ Return Value:
     None
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassSpinDownPowerHandler(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp
@@ -1456,9 +1454,7 @@ Routine Description:
         CLASS_SPECIAL_NO_QUEUE_LOCK
 
 --*/
-SCSIPORTAPI
 NTSTATUS
-NTAPI
 ClassStopUnitPowerHandler(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp

drivers/storage/classpnp/utils.c

@@ -55,10 +55,7 @@ BOOLEAN ClasspMyStringMatches(IN PCHAR StringToMatch OPTIONAL, IN PCHAR TargetSt
 }
 
 
-SCSIPORTAPI
+VOID ClassGetDeviceParameter(
-VOID
-NTAPI
-ClassGetDeviceParameter(
     IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
     IN PWSTR SubkeyName OPTIONAL,
     IN PWSTR ParameterName,
@@ -143,10 +140,7 @@ ClassGetDeviceParameter(
 } // end ClassGetDeviceParameter()
 
 
-SCSIPORTAPI
+NTSTATUS ClassSetDeviceParameter(
-NTSTATUS
-NTAPI
-ClassSetDeviceParameter(
     IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
     IN PWSTR SubkeyName OPTIONAL,
     IN PWSTR ParameterName,
@@ -224,10 +218,7 @@ ClassSetDeviceParameter(
  *      hardware based upon id strings.  it does not check the registry.
  */
 
-SCSIPORTAPI
+VOID ClassScanForSpecial(
-VOID
-NTAPI
-ClassScanForSpecial(
     IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
     IN CLASSPNP_SCAN_FOR_SPECIAL_INFO DeviceList[],
     IN PCLASS_SCAN_FOR_SPECIAL_HANDLER Function)