X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=include%2Fddk%2Fstorport.h;h=fd8cf9b19aeee40dfc689550b38841fe89d366c3;hp=7859967a32d2f305073e6dcbdc4c1eb733bd444f;hb=52281dc572d81fd4ab8b4f4cf9cdf12129c6809a;hpb=47b1e82248d1cc321b9fe7b7ab7441cb8bc2a591

diff --git a/include/ddk/storport.h b/include/ddk/storport.h
index 7859967a32d..fd8cf9b19ae 100644
--- a/include/ddk/storport.h
+++ b/include/ddk/storport.h
@@ -76,7 +76,7 @@ typedef struct _SCSI_WMI_REQUEST_BLOCK {
 
 STORPORTAPI
 ULONG
-DDKAPI
+NTAPI
 StorPortInitialize(
   IN PVOID  Argument1,
   IN PVOID  Argument2,
@@ -85,14 +85,14 @@ StorPortInitialize(
 
 STORPORTAPI
 VOID
-DDKAPI
+NTAPI
 StorPortFreeDeviceBase(
   IN PVOID  HwDeviceExtension,
   IN PVOID  MappedAddress);
 
 STORPORTAPI
 ULONG
-DDKAPI
+NTAPI
 StorPortGetBusData(
   IN PVOID  DeviceExtension,
   IN ULONG  BusDataType,
@@ -103,7 +103,7 @@ StorPortGetBusData(
 
 STORPORTAPI
 ULONG
-DDKAPI
+NTAPI
 StorPortSetBusDataByOffset(
   IN PVOID  DeviceExtension,
   IN ULONG   BusDataType,
@@ -115,7 +115,7 @@ StorPortSetBusDataByOffset(
 
 STORPORTAPI
 PVOID
-DDKAPI
+NTAPI
 StorPortGetDeviceBase(
   IN PVOID  HwDeviceExtension,
   IN INTERFACE_TYPE  BusType,
@@ -126,7 +126,7 @@ StorPortGetDeviceBase(
 
 STORPORTAPI
 PVOID
-DDKAPI
+NTAPI
 StorPortGetLogicalUnit(
   IN PVOID  HwDeviceExtension,
   IN UCHAR  PathId,
@@ -135,7 +135,7 @@ StorPortGetLogicalUnit(
 
 STORPORTAPI
 PSCSI_REQUEST_BLOCK
-DDKAPI
+NTAPI
 StorPortGetSrb(
   IN PVOID  DeviceExtension,
   IN UCHAR  PathId,
@@ -145,7 +145,7 @@ StorPortGetSrb(
 
 STORPORTAPI
 STOR_PHYSICAL_ADDRESS
-DDKAPI
+NTAPI
 StorPortGetPhysicalAddress(
   IN PVOID  HwDeviceExtension,
   IN PSCSI_REQUEST_BLOCK  Srb,
@@ -154,14 +154,14 @@ StorPortGetPhysicalAddress(
 
 STORPORTAPI
 PVOID
-DDKAPI
+NTAPI
 StorPortGetVirtualAddress(
   IN PVOID  HwDeviceExtension,
   IN STOR_PHYSICAL_ADDRESS  PhysicalAddress);
 
 STORPORTAPI
 PVOID
-DDKAPI
+NTAPI
 StorPortGetUncachedExtension(
   IN PVOID HwDeviceExtension,
   IN PPORT_CONFIGURATION_INFORMATION ConfigInfo,
@@ -169,7 +169,7 @@ StorPortGetUncachedExtension(
 
 STORPORTAPI
 VOID
-DDKCDECLAPI
+__cdecl
 StorPortNotification(
   IN SCSI_NOTIFICATION_TYPE  NotificationType,
   IN PVOID  HwDeviceExtension,
@@ -177,7 +177,7 @@ StorPortNotification(
 
 STORPORTAPI
 VOID
-DDKAPI
+NTAPI
 StorPortLogError(
   IN PVOID  HwDeviceExtension,
   IN PSCSI_REQUEST_BLOCK  Srb OPTIONAL,
@@ -189,7 +189,7 @@ StorPortLogError(
 
 STORPORTAPI
 VOID
-DDKAPI
+NTAPI
 StorPortCompleteRequest(
   IN PVOID  HwDeviceExtension,
   IN UCHAR  PathId,
@@ -199,7 +199,7 @@ StorPortCompleteRequest(
 
 STORPORTAPI
 VOID
-DDKAPI
+NTAPI
 StorPortMoveMemory(
   IN PVOID  WriteBuffer,
   IN PVOID  ReadBuffer,
@@ -207,25 +207,25 @@ StorPortMoveMemory(
 
 STORPORTAPI
 VOID
-DDKAPI
+NTAPI
 StorPortStallExecution(
   IN ULONG  Delay);
 
 STORPORTAPI
 STOR_PHYSICAL_ADDRESS
-DDKAPI
+NTAPI
 StorPortConvertUlong64ToPhysicalAddress(
   IN ULONG64  UlongAddress);
 
 STORPORTAPI
 ULONG64
-DDKAPI
+NTAPI
 StorPortConvertPhysicalAddressToUlong64(
   IN STOR_PHYSICAL_ADDRESS  Address);
 
 STORPORTAPI
 BOOLEAN
-DDKAPI
+NTAPI
 StorPortValidateRange(
   IN PVOID  HwDeviceExtension,
   IN INTERFACE_TYPE  BusType,
@@ -236,7 +236,7 @@ StorPortValidateRange(
 
 STORPORTAPI
 VOID
-DDKCDECLAPI
+__cdecl
 StorPortDebugPrint(
   IN ULONG  DebugPrintLevel,
   IN PCCHAR  DebugMessage,
@@ -244,85 +244,85 @@ StorPortDebugPrint(
 
 STORPORTAPI
 UCHAR
-DDKAPI
+NTAPI
 StorPortReadPortUchar(
   IN PUCHAR  Port);
 
 STORPORTAPI
 ULONG
-DDKAPI
+NTAPI
 StorPortReadPortUlong(
   IN PULONG  Port);
 
 STORPORTAPI
 USHORT
-DDKAPI
+NTAPI
 StorPortReadPortUshort(
   IN PUSHORT  Port);
 
 STORPORTAPI
 UCHAR
-DDKAPI
+NTAPI
 StorPortReadRegisterUchar(
   IN PUCHAR  Register);
 
 STORPORTAPI
 ULONG
-DDKAPI
+NTAPI
 StorPortReadRegisterUlong(
   IN PULONG  Register);
 
 STORPORTAPI
 USHORT
-DDKAPI
+NTAPI
 StorPortReadRegisterUshort(
   IN PUSHORT  Register);
 
 STORPORTAPI
 VOID
-DDKAPI
+NTAPI
 StorPortWritePortUchar(
   IN PUCHAR  Port,
   IN UCHAR  Value);
 
 STORPORTAPI
 VOID
-DDKAPI
+NTAPI
 StorPortWritePortUlong(
   IN PULONG  Port,
   IN ULONG  Value);
 
 STORPORTAPI
 VOID
-DDKAPI
+NTAPI
 StorPortWritePortUshort(
   IN PUSHORT  Port,
   IN USHORT  Value);
 
 STORPORTAPI
 VOID
-DDKAPI
+NTAPI
 StorPortWriteRegisterUchar(
   IN PUCHAR  Port,
   IN UCHAR  Value);
 
 STORPORTAPI
 VOID
-DDKAPI
+NTAPI
 StorPortWriteRegisterUlong(
   IN PULONG  Port,
   IN ULONG  Value);
 
 STORPORTAPI
 VOID
-DDKAPI
+NTAPI
 StorPortWriteRegisterUshort(
   IN PUSHORT  Port,
   IN USHORT  Value);
 
 STORPORTAPI
 BOOLEAN
-DDKAPI
+NTAPI
 StorPortPauseDevice(
   IN PVOID  HwDeviceExtension,
   IN UCHAR  PathId,
@@ -332,7 +332,7 @@ StorPortPauseDevice(
 
 STORPORTAPI
 BOOLEAN
-DDKAPI
+NTAPI
 StorPortResumeDevice(
   IN PVOID  HwDeviceExtension,
   IN UCHAR  PathId,
@@ -341,20 +341,20 @@ StorPortResumeDevice(
 
 STORPORTAPI
 BOOLEAN
-DDKAPI
+NTAPI
 StorPortPause(
   IN PVOID  HwDeviceExtension,
   IN ULONG  TimeOut);
 
 STORPORTAPI
 BOOLEAN
-DDKAPI
+NTAPI
 StorPortResume(
   IN PVOID  HwDeviceExtension);
 
 STORPORTAPI
 BOOLEAN
-DDKAPI
+NTAPI
 StorPortDeviceBusy(
   IN PVOID  HwDeviceExtension,
   IN UCHAR  PathId,
@@ -364,7 +364,7 @@ StorPortDeviceBusy(
 
 STORPORTAPI
 BOOLEAN
-DDKAPI
+NTAPI
 StorPortDeviceReady(
   IN PVOID  HwDeviceExtension,
   IN UCHAR  PathId,
@@ -373,32 +373,32 @@ StorPortDeviceReady(
 
 STORPORTAPI
 BOOLEAN
-DDKAPI
+NTAPI
 StorPortBusy(
   IN PVOID  HwDeviceExtension,
   IN ULONG  RequestsToComplete);
 
 STORPORTAPI
 BOOLEAN
-DDKAPI
+NTAPI
 StorPortReady(
   IN PVOID  HwDeviceExtension);
 
 STORPORTAPI
 PSTOR_SCATTER_GATHER_LIST
-DDKAPI
+NTAPI
 StorPortGetScatterGatherList(
   IN PVOID  DeviceExtension,
   IN PSCSI_REQUEST_BLOCK  Srb);
 
 typedef BOOLEAN
-(DDKAPI *PSTOR_SYNCHRONIZED_ACCESS)(
+(NTAPI *PSTOR_SYNCHRONIZED_ACCESS)(
   IN PVOID  HwDeviceExtension,
   IN PVOID  Context);
 
 STORPORTAPI
 VOID
-DDKAPI
+NTAPI
 StorPortSynchronizeAccess(
   IN PVOID  HwDeviceExtension,
   IN PSTOR_SYNCHRONIZED_ACCESS  SynchronizedAccessRoutine,