diff --git a/reactos/drivers/storage/scsiport/scsiport.c b/reactos/drivers/storage/scsiport/scsiport.c index ca829e96f2f..5b27d5b637b 100644 --- a/reactos/drivers/storage/scsiport/scsiport.c +++ b/reactos/drivers/storage/scsiport/scsiport.c @@ -43,11 +43,6 @@ #include "scsiport_int.h" -#ifdef _MSC_VER - #define STDCALL - #define DDKAPI -#endif - ULONG InternalDebugLevel = 0x00; /* TYPES *********************************************************************/ @@ -63,29 +58,29 @@ SpiGetPciConfigData(IN PDRIVER_OBJECT DriverObject, IN ULONG BusNumber, IN OUT PPCI_SLOT_NUMBER NextSlotNumber); -static NTSTATUS STDCALL +static NTSTATUS NTAPI ScsiPortCreateClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); static DRIVER_DISPATCH ScsiPortDispatchScsi; -static NTSTATUS STDCALL +static NTSTATUS NTAPI ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -static NTSTATUS STDCALL +static NTSTATUS NTAPI ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); static DRIVER_STARTIO ScsiPortStartIo; -static VOID STDCALL +static VOID NTAPI ScsiPortStartIo(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -static BOOLEAN STDCALL +static BOOLEAN NTAPI ScsiPortStartPacket(IN OUT PVOID Context); IO_ALLOCATION_ACTION -STDCALL +NTAPI SpiAdapterControl(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID MapRegisterBase, PVOID Context); @@ -121,22 +116,22 @@ SpiGetSrbData(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, IN UCHAR Lun, IN UCHAR QueueTag); -static BOOLEAN STDCALL +static BOOLEAN NTAPI ScsiPortIsr(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); -static VOID STDCALL +static VOID NTAPI ScsiPortDpcForIsr(IN PKDPC Dpc, IN PDEVICE_OBJECT DpcDeviceObject, IN PIRP DpcIrp, IN PVOID DpcContext); -static VOID STDCALL +static VOID NTAPI ScsiPortIoTimer(PDEVICE_OBJECT DeviceObject, PVOID Context); IO_ALLOCATION_ACTION -STDCALL +NTAPI ScsiPortAllocateAdapterChannel(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID MapRegisterBase, @@ -154,22 +149,22 @@ SpiSendRequestSense(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, IN PSCSI_REQUEST_BLOCK Srb); static IO_COMPLETION_ROUTINE SpiCompletionRoutine; -NTSTATUS STDCALL +NTSTATUS NTAPI SpiCompletionRoutine(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context); static VOID -STDCALL +NTAPI SpiProcessCompletedRequest(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, IN PSCSI_REQUEST_BLOCK_INFO SrbInfo, OUT PBOOLEAN NeedToCallStartIo); -VOID STDCALL +VOID NTAPI SpiGetNextRequestFromLun(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, IN PSCSI_PORT_LUN_EXTENSION LunExtension); -VOID STDCALL +VOID NTAPI SpiMiniportTimerDpc(IN struct _KDPC *Dpc, IN PVOID DeviceObject, IN PVOID SystemArgument1, @@ -182,7 +177,7 @@ SpiCreatePortConfig(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, PPORT_CONFIGURATION_INFORMATION ConfigInfo, BOOLEAN FirstCall); -NTSTATUS STDCALL +NTSTATUS NTAPI SpQueryDeviceCallout(IN PVOID Context, IN PUNICODE_STRING PathName, IN INTERFACE_TYPE BusType, @@ -246,7 +241,7 @@ SpiAllocateCommonBuffer(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, ULONG NonCa * Status. */ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { @@ -303,7 +298,7 @@ ScsiDebugPrint(IN ULONG DebugPrintLevel, /* * @unimplemented */ -VOID STDCALL +VOID NTAPI ScsiPortCompleteRequest(IN PVOID HwDeviceExtension, IN UCHAR PathId, IN UCHAR TargetId, @@ -317,7 +312,7 @@ ScsiPortCompleteRequest(IN PVOID HwDeviceExtension, /* * @unimplemented */ -VOID STDCALL +VOID NTAPI ScsiPortFlushDma(IN PVOID HwDeviceExtension) { DPRINT("ScsiPortFlushDma()\n"); @@ -328,7 +323,7 @@ ScsiPortFlushDma(IN PVOID HwDeviceExtension) /* * @implemented */ -VOID STDCALL +VOID NTAPI ScsiPortFreeDeviceBase(IN PVOID HwDeviceExtension, IN PVOID MappedAddress) { @@ -380,7 +375,7 @@ ScsiPortFreeDeviceBase(IN PVOID HwDeviceExtension, /* * @implemented */ -ULONG STDCALL +ULONG NTAPI ScsiPortGetBusData(IN PVOID DeviceExtension, IN ULONG BusDataType, IN ULONG SystemIoBusNumber, @@ -409,7 +404,7 @@ ScsiPortGetBusData(IN PVOID DeviceExtension, /* * @implemented */ -ULONG STDCALL +ULONG NTAPI ScsiPortSetBusDataByOffset(IN PVOID DeviceExtension, IN ULONG BusDataType, IN ULONG SystemIoBusNumber, @@ -430,7 +425,7 @@ ScsiPortSetBusDataByOffset(IN PVOID DeviceExtension, /* * @implemented */ -PVOID STDCALL +PVOID NTAPI ScsiPortGetDeviceBase(IN PVOID HwDeviceExtension, IN INTERFACE_TYPE BusType, IN ULONG SystemIoBusNumber, @@ -489,7 +484,7 @@ ScsiPortGetDeviceBase(IN PVOID HwDeviceExtension, /* * @unimplemented */ -PVOID STDCALL +PVOID NTAPI ScsiPortGetLogicalUnit(IN PVOID HwDeviceExtension, IN UCHAR PathId, IN UCHAR TargetId, @@ -532,7 +527,7 @@ ScsiPortGetLogicalUnit(IN PVOID HwDeviceExtension, /* * @implemented */ -SCSI_PHYSICAL_ADDRESS STDCALL +SCSI_PHYSICAL_ADDRESS NTAPI ScsiPortGetPhysicalAddress(IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb OPTIONAL, IN PVOID VirtualAddress, @@ -598,7 +593,7 @@ ScsiPortGetPhysicalAddress(IN PVOID HwDeviceExtension, /* * @unimplemented */ -PSCSI_REQUEST_BLOCK STDCALL +PSCSI_REQUEST_BLOCK NTAPI ScsiPortGetSrb(IN PVOID DeviceExtension, IN UCHAR PathId, IN UCHAR TargetId, @@ -614,7 +609,7 @@ ScsiPortGetSrb(IN PVOID DeviceExtension, /* * @implemented */ -PVOID STDCALL +PVOID NTAPI ScsiPortGetUncachedExtension(IN PVOID HwDeviceExtension, IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, IN ULONG NumberOfBytes) @@ -796,7 +791,7 @@ SpiAllocateCommonBuffer(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, ULONG NonCa /* * @implemented */ -PVOID STDCALL +PVOID NTAPI ScsiPortGetVirtualAddress(IN PVOID HwDeviceExtension, IN SCSI_PHYSICAL_ADDRESS PhysicalAddress) { @@ -917,7 +912,7 @@ SpiInitOpenKeys(PCONFIGURATION_INFO ConfigInfo, PUNICODE_STRING RegistryPath) * @implemented */ -ULONG STDCALL +ULONG NTAPI ScsiPortInitialize(IN PVOID Argument1, IN PVOID Argument2, IN struct _HW_INITIALIZATION_DATA *HwInitializationData, @@ -1715,7 +1710,7 @@ SpiCleanupAfterInit(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) /* * @unimplemented */ -VOID STDCALL +VOID NTAPI ScsiPortIoMapTransfer(IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, IN PVOID LogicalAddress, @@ -1728,7 +1723,7 @@ ScsiPortIoMapTransfer(IN PVOID HwDeviceExtension, /* * @unimplemented */ -VOID STDCALL +VOID NTAPI ScsiPortLogError(IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb OPTIONAL, IN UCHAR PathId, @@ -1752,7 +1747,7 @@ ScsiPortLogError(IN PVOID HwDeviceExtension, /* * @implemented */ -VOID STDCALL +VOID NTAPI ScsiPortMoveMemory(OUT PVOID Destination, IN PVOID Source, IN ULONG Length) @@ -1902,7 +1897,7 @@ ScsiPortNotification(IN SCSI_NOTIFICATION_TYPE NotificationType, /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI ScsiPortValidateRange(IN PVOID HwDeviceExtension, IN INTERFACE_TYPE BusType, IN ULONG SystemIoBusNumber, @@ -2300,7 +2295,7 @@ SpiGetPciConfigData(IN PDRIVER_OBJECT DriverObject, * Status. */ -static NTSTATUS STDCALL +static NTSTATUS NTAPI ScsiPortCreateClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -2412,7 +2407,7 @@ SpiHandleAttachRelease(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, * NTSTATUS */ -static NTSTATUS STDCALL +static NTSTATUS NTAPI ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -2653,7 +2648,7 @@ ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, * NTSTATUS */ -static NTSTATUS STDCALL +static NTSTATUS NTAPI ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -2727,7 +2722,7 @@ ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject, } -static VOID STDCALL +static VOID NTAPI ScsiPortStartIo(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -2905,7 +2900,7 @@ ScsiPortStartIo(IN PDEVICE_OBJECT DeviceObject, } -static BOOLEAN STDCALL +static BOOLEAN NTAPI ScsiPortStartPacket(IN OUT PVOID Context) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; @@ -3060,7 +3055,7 @@ ScsiPortStartPacket(IN OUT PVOID Context) } IO_ALLOCATION_ACTION -STDCALL +NTAPI SpiAdapterControl(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID MapRegisterBase, @@ -4042,7 +4037,7 @@ SpiSendRequestSense(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, static VOID -STDCALL +NTAPI SpiProcessCompletedRequest(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, IN PSCSI_REQUEST_BLOCK_INFO SrbInfo, OUT PBOOLEAN NeedToCallStartIo) @@ -4359,7 +4354,7 @@ Error: } NTSTATUS -STDCALL +NTAPI SpiCompletionRoutine(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context) @@ -4414,7 +4409,7 @@ SpiCompletionRoutine(PDEVICE_OBJECT DeviceObject, return STATUS_MORE_PROCESSING_REQUIRED; } -static BOOLEAN STDCALL +static BOOLEAN NTAPI ScsiPortIsr(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext) { @@ -4444,7 +4439,7 @@ ScsiPortIsr(IN PKINTERRUPT Interrupt, } BOOLEAN -STDCALL +NTAPI SpiSaveInterruptData(IN PVOID Context) { PSCSI_PORT_SAVE_INTERRUPT InterruptContext = Context; @@ -4562,7 +4557,7 @@ SpiSaveInterruptData(IN PVOID Context) } VOID -STDCALL +NTAPI SpiGetNextRequestFromLun(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, IN PSCSI_PORT_LUN_EXTENSION LunExtension) { @@ -4669,7 +4664,7 @@ SpiGetNextRequestFromLun(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, // IN PIRP DpcIrp // IN PVOID DpcContext // -static VOID STDCALL +static VOID NTAPI ScsiPortDpcForIsr(IN PKDPC Dpc, IN PDEVICE_OBJECT DpcDeviceObject, IN PIRP DpcIrp, @@ -4869,7 +4864,7 @@ TryAgain: } BOOLEAN -STDCALL +NTAPI SpiProcessTimeout(PVOID ServiceContext) { PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)ServiceContext; @@ -4915,7 +4910,7 @@ SpiProcessTimeout(PVOID ServiceContext) BOOLEAN -STDCALL +NTAPI SpiResetBus(PVOID ServiceContext) { PRESETBUS_PARAMS ResetParams = (PRESETBUS_PARAMS)ServiceContext; @@ -4948,7 +4943,7 @@ SpiResetBus(PVOID ServiceContext) // IN PVOID Context the Controller extension for the // controller the device is on // -static VOID STDCALL +static VOID NTAPI ScsiPortIoTimer(PDEVICE_OBJECT DeviceObject, PVOID Context) { @@ -5472,7 +5467,7 @@ ByeBye: } VOID -STDCALL +NTAPI SpiMiniportTimerDpc(IN struct _KDPC *Dpc, IN PVOID DeviceObject, IN PVOID SystemArgument1, @@ -6064,7 +6059,7 @@ SpiParseDeviceInfo(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, } NTSTATUS -STDCALL +NTAPI SpQueryDeviceCallout(IN PVOID Context, IN PUNICODE_STRING PathName, IN INTERFACE_TYPE BusType, @@ -6085,7 +6080,7 @@ SpQueryDeviceCallout(IN PVOID Context, } IO_ALLOCATION_ACTION -STDCALL +NTAPI ScsiPortAllocateAdapterChannel(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID MapRegisterBase, @@ -6148,7 +6143,7 @@ SpiStatusSrbToNt(UCHAR SrbStatus) /* * @implemented */ -ULONG STDCALL +ULONG NTAPI ScsiPortConvertPhysicalAddressToUlong(IN SCSI_PHYSICAL_ADDRESS Address) { DPRINT("ScsiPortConvertPhysicalAddressToUlong()\n");