diff --git a/reactos/drivers/storage/ide/uniata/atapi.h b/reactos/drivers/storage/ide/uniata/atapi.h
index 18278ecc283..0ed576912a0 100644
--- a/reactos/drivers/storage/ide/uniata/atapi.h
+++ b/reactos/drivers/storage/ide/uniata/atapi.h
@@ -927,30 +927,6 @@ AtapiSoftReset(
     ULONG            DeviceNumber
     );
 
-/*#define IdeHardReset(BaseIoAddress,result) \
-{\
-    UCHAR statusByte;\
-    ULONG i;\
-    SelectDrive(BaseIoAddress,DeviceNumber); \
-    AtapiWritePort1(&BaseIoAddress->AltStatus,/*IDE_DC_DISABLE_INTERRUPTS | *//*IDE_DC_RESET_CONTROLLER );\
-/*    ScsiPortStallExecution(50 * 1000);\
-    AtapiWritePort1(&BaseIoAddress->AltStatus,IDE_DC_REENABLE_CONTROLLER);\
-    /* 5 seconds for reset */ \
-/*    for (i = 0; i < 1000 * (1+11); i++) {\
-        statusByte = AtapiReadPort1(&BaseIoAddress->AltStatus);\
-        if (statusByte != IDE_STATUS_IDLE && statusByte != IDE_STATUS_SUCCESS) {\
-            ScsiPortStallExecution((i<1000) ? 5 : 500);\
-        } else {\
-            break;\
-        }\
-    }\
-    KdPrint2((PRINT_PREFIX "IdeHardReset: Status %x\n", statusByte)); \
-    if (i == 1000*1000) {\
-        result = FALSE;\
-    }\
-    result = TRUE;\
-}*/
-
 #endif //USER_MODE
 
 #define IS_RDP(OperationCode)\
@@ -1158,7 +1134,7 @@ AtapiDpcDispatch(
     );
  
 
-//#define AtaCommand(de, devn, chan, cmd, cyl, hd, sec, cnt, feat, flg) \
+//#define AtaCommand(de, devn, chan, cmd, cyl, hd, sec, cnt, feat, flg)
 
 extern LONG
 AtaPio2Mode(LONG pio);
diff --git a/reactos/drivers/storage/ide/uniata/bsmaster.h b/reactos/drivers/storage/ide/uniata/bsmaster.h
index af984f7d391..48d022c8f12 100644
--- a/reactos/drivers/storage/ide/uniata/bsmaster.h
+++ b/reactos/drivers/storage/ide/uniata/bsmaster.h
@@ -702,18 +702,19 @@ typedef struct _HW_CHANNEL {
     ULONG       NextDpcChan;
     PHW_TIMER   HwScsiTimer;
     LONGLONG    DpcTime;
-/*
+#if 0
     PHW_TIMER   HwScsiTimer1;
     PHW_TIMER   HwScsiTimer2;
     LONGLONG    DpcTime1;
-/*    PHW_TIMER           CurDpc;
-    LARGE_INTEGER       ActivationTime;*/
+//    PHW_TIMER           CurDpc;
+//    LARGE_INTEGER       ActivationTime;
 
-/*    KDPC                Dpc;
-    KTIMER              Timer;
-    PHW_TIMER           HwScsiTimer;*/
+//    KDPC                Dpc;
+//    KTIMER              Timer;
+//    PHW_TIMER           HwScsiTimer;
 //    KSPIN_LOCK          QueueSpinLock;
 //    KIRQL               QueueOldIrql;
+#endif
     struct _HW_DEVICE_EXTENSION* DeviceExtension;
     struct _HW_LU_EXTENSION* lun[2];
 
@@ -731,7 +732,7 @@ typedef struct _HW_CHANNEL {
     LONGLONG IntersectCount;
     LONGLONG TryReorderCount;
     LONGLONG TryReorderHeadCount;
-    LONGLONG TryReorderTailCount; /* in-order requests */
+    LONGLONG TryReorderTailCount; // in-order requests
 #endif //QUEUE_STATISTICS
 
     //ULONG BaseMemAddress;
@@ -832,7 +833,7 @@ typedef struct _HW_DEVICE_EXTENSION {
     ULONG FirstChannelToCheck;
 #if 1
     HW_LU_EXTENSION lun[IDE_MAX_LUN];
-    HW_CHANNEL chan[AHCI_MAX_PORT/*IDE_MAX_CHAN*/];
+    HW_CHANNEL chan[AHCI_MAX_PORT]; // IDE_MAX_CHAN
 #else
     PHW_LU_EXTENSION lun;
     PHW_CHANNEL chan;
@@ -850,12 +851,12 @@ typedef struct _HW_DEVICE_EXTENSION {
 
     ULONG       ActiveDpcChan;
     ULONG       FirstDpcChan;
-/*
-    PHW_TIMER   HwScsiTimer1;
-    PHW_TIMER   HwScsiTimer2;
-    LONGLONG    DpcTime1;
-    LONGLONG    DpcTime2;
-*/
+
+//    PHW_TIMER   HwScsiTimer1;
+//    PHW_TIMER   HwScsiTimer2;
+//    LONGLONG    DpcTime1;
+//    LONGLONG    DpcTime2;
+
     ULONG          queue_depth;
 
     PDEVICE_OBJECT Isr2DevObj;
@@ -921,8 +922,8 @@ extern UCHAR         pciBuffer[256];
 extern PBUSMASTER_CONTROLLER_INFORMATION BMList;
 extern ULONG         BMListLen;
 
-extern const CHAR retry_Wdma[MAX_RETRIES+1];
-extern const CHAR retry_Udma[MAX_RETRIES+1];
+//extern const CHAR retry_Wdma[MAX_RETRIES+1];
+//extern const CHAR retry_Udma[MAX_RETRIES+1];
 
 extern VOID
 UniataEnumBusMasterController(
diff --git a/reactos/drivers/storage/ide/uniata/config.h b/reactos/drivers/storage/ide/uniata/config.h
index a7467afc055..13f72ee146a 100644
--- a/reactos/drivers/storage/ide/uniata/config.h
+++ b/reactos/drivers/storage/ide/uniata/config.h
@@ -83,7 +83,7 @@
 /* ReactOS-specific defines */
 #ifdef DDKAPI
  #define USE_REACTOS_DDK
-#endif DDKAPI
+#endif //DDKAPI
 
 /* Are we under GNU C (mingw) ??? */
 #if __GNUC__ >=3
diff --git a/reactos/drivers/storage/ide/uniata/id_ata.cpp b/reactos/drivers/storage/ide/uniata/id_ata.cpp
index 4f18cbd6341..5ab38efc43f 100644
--- a/reactos/drivers/storage/ide/uniata/id_ata.cpp
+++ b/reactos/drivers/storage/ide/uniata/id_ata.cpp
@@ -619,7 +619,7 @@ AtapiSoftReset(
     ULONG            DeviceNumber
     )
 {
-    ULONG c = chan->lChannel;
+    //ULONG c = chan->lChannel;
     ULONG i;
     UCHAR dma_status = 0;
     KdPrint2((PRINT_PREFIX "AtapiSoftReset:\n"));
@@ -947,7 +947,7 @@ AtapiTimerDpc(
     KdPrint2((PRINT_PREFIX "AtapiTimerDpc:\n"));
 
     lChannel = deviceExtension->ActiveDpcChan = deviceExtension->FirstDpcChan;
-    if(lChannel == -1) {
+    if(lChannel == (ULONG)-1) {
         KdPrint2((PRINT_PREFIX "AtapiTimerDpc: no items\n"));
         return;
     }
@@ -959,7 +959,7 @@ AtapiTimerDpc(
         chan->HwScsiTimer = NULL;
 
         deviceExtension->FirstDpcChan = chan->NextDpcChan;
-        if(deviceExtension->FirstDpcChan != -1) {
+        if(deviceExtension->FirstDpcChan != (ULONG)-1) {
             recall = TRUE;
         }
 
@@ -968,7 +968,7 @@ AtapiTimerDpc(
         chan->NextDpcChan = -1;
 
         lChannel = deviceExtension->ActiveDpcChan = deviceExtension->FirstDpcChan;
-        if(lChannel == -1) {
+        if(lChannel == (ULONG)-1) {
             KdPrint2((PRINT_PREFIX "AtapiTimerDpc: no more items\n"));
             deviceExtension->FirstDpcChan =
             deviceExtension->ActiveDpcChan = -1;
@@ -1037,7 +1037,7 @@ AtapiQueueTimerDpc(
 
     i = deviceExtension->FirstDpcChan;
     chan = prev_chan = NULL;
-    while(i != -1) {
+    while(i != (ULONG)-1) {
         prev_chan = chan;
         chan = &deviceExtension->chan[i];
         if(chan->DpcTime > time.QuadPart) {
@@ -1822,7 +1822,7 @@ AtapiResetController__(
         max_ldev = (chan->ChannelCtrlFlags & CTRFLAGS_NO_SLAVE) ? 1 : 2;
         if(CompleteType != RESET_COMPLETE_NONE) {
 #ifndef UNIATA_CORE
-            while(CurSrb = UniataGetCurRequest(chan)) {
+            while((CurSrb = UniataGetCurRequest(chan))) {
 
                 PATA_REQ AtaReq = (PATA_REQ)(CurSrb->SrbExtension);
 
@@ -2127,7 +2127,7 @@ MapError(
     PHW_CHANNEL chan = &(deviceExtension->chan[lChannel]);
 //    ULONG i;
     UCHAR errorByte;
-    UCHAR srbStatus;
+    UCHAR srbStatus = SRB_STATUS_SUCCESS;
     UCHAR scsiStatus;
     ULONG ldev = GET_LDEV(Srb);
 
@@ -2966,7 +2966,7 @@ AtapiCallBack__(
         chan->DpcState = DPC_STATE_TIMER;
         if(!AtapiInterrupt__(HwDeviceExtension, lChannel)) {
             InterlockedExchange(&(chan->CheckIntr), CHECK_INTR_IDLE);
-            KdPrint2((PRINT_PREFIX "AtapiCallBack: What's fucking this ???!!!\n"));
+            KdPrint2((PRINT_PREFIX "AtapiCallBack: What's fucking this ???\n"));
         }
         goto ReturnCallback;
     }
@@ -3104,7 +3104,7 @@ AtapiInterrupt(
     ULONG c, _c;
     BOOLEAN status = FALSE;
     ULONG c_state;
-    ULONG i_res;
+    ULONG i_res = 0;
     ULONG pass;
     BOOLEAN checked[AHCI_MAX_PORT];
 
@@ -3253,7 +3253,7 @@ AtapiInterrupt2(
         }
 
         c_count++;
-        if(i_res = AtapiCheckInterrupt__(deviceExtension, (UCHAR)c)) {
+        if((i_res = AtapiCheckInterrupt__(deviceExtension, (UCHAR)c))) {
 
             KdPrint2((PRINT_PREFIX "AtapiInterrupt2: intr\n"));
             if(i_res == 2) {
@@ -3443,7 +3443,7 @@ AtapiCheckInterrupt__(
     ULONG ChipType  = deviceExtension->HwFlags & CHIPTYPE_MASK;
 
     ULONG status;
-    ULONG pr_status;
+    ULONG pr_status = 0;
     UCHAR dma_status = 0;
     UCHAR reg8 = 0;
     UCHAR reg32 = 0;
@@ -3583,7 +3583,7 @@ AtapiCheckInterrupt__(
 
             reg32 = AtapiReadPort1(chan, IDX_BM_DeviceSpecific0);
             KdPrint2((PRINT_PREFIX "  Sii DS0 %x\n", reg32));
-            if(reg32 == 0xffffffff) {
+            if(reg32 == (UCHAR)-1) {
                 KdPrint2((PRINT_PREFIX "  Sii mio unexpected\n"));
                 return FALSE;
             }
@@ -3806,11 +3806,11 @@ AtapiInterrupt__(
     PATA_REQ AtaReq = srb ? (PATA_REQ)(srb->SrbExtension) : NULL;
 
     ULONG wordCount = 0, wordsThisInterrupt = DEV_BSIZE/2;
-    ULONG status;
+    ULONG status = SRB_STATUS_SUCCESS;
     UCHAR dma_status = 0;
     ULONG i;
     ULONG k;
-    UCHAR statusByte,interruptReason;
+    UCHAR statusByte = 0,interruptReason;
 
     BOOLEAN atapiDev = FALSE;
 
@@ -5334,7 +5334,7 @@ IdeReadWrite(
     ULONG                ldev = GET_LDEV(Srb);
     UCHAR                DeviceNumber = (UCHAR)(ldev & 1);
     ULONG                startingSector;
-    ULONG                wordCount;
+    ULONG                wordCount = 0;
     UCHAR                statusByte,statusByte2;
     UCHAR                cmd;
     ULONGLONG            lba;
@@ -7670,10 +7670,10 @@ uata_ctl_queue:
 
                     KdPrint2((PRINT_PREFIX "AtapiStartIo: Set transfer mode\n"));
 
-                    if(AtaCtl->SetMode.OrigMode != -1) {
+                    if(AtaCtl->SetMode.OrigMode != (ULONG)-1) {
                         LunExt->OrigTransferMode = (UCHAR)(AtaCtl->SetMode.OrigMode);
                     }
-                    if(AtaCtl->SetMode.MaxMode != -1) {
+                    if(AtaCtl->SetMode.MaxMode != (ULONG)-1) {
                         LunExt->LimitedTransferMode = (UCHAR)(AtaCtl->SetMode.MaxMode);
                         if(LunExt->LimitedTransferMode > 
                            LunExt->OrigTransferMode) {
@@ -7813,7 +7813,7 @@ complete_req:
                                  Srb);
 
             // Remove current Srb & get next one
-            if(Srb = UniataGetCurRequest(chan)) {
+            if((Srb = UniataGetCurRequest(chan))) {
                 AtaReq = (PATA_REQ)(Srb->SrbExtension);
                 if(AtaReq->ReqState > REQ_STATE_QUEUED) {
                     // current request is under precessing, thus
@@ -7851,7 +7851,7 @@ UniataInitAtaCommands()
 {
     int i;
     UCHAR command;
-    UCHAR flags;
+    UCHAR flags = 0;
 
     for(i=0, command=0; i<256; i++, command++) {
 
diff --git a/reactos/drivers/storage/ide/uniata/id_badblock.cpp b/reactos/drivers/storage/ide/uniata/id_badblock.cpp
index 557d455fb6e..d753123daa8 100644
--- a/reactos/drivers/storage/ide/uniata/id_badblock.cpp
+++ b/reactos/drivers/storage/ide/uniata/id_badblock.cpp
@@ -153,7 +153,7 @@ InitBadBlocks(
         QueryTable[0].DefaultData     = 0;
         QueryTable[0].DefaultLength   = 0;
 
-        RtlZeroMemory(QueryTable + 1, sizeof RTL_QUERY_REGISTRY_TABLE);    // EOF
+        RtlZeroMemory(QueryTable + 1, sizeof(RTL_QUERY_REGISTRY_TABLE));    // EOF
 
         NTSTATUS status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES,
                                                 L"UniATA\\Parameters\\BadBlocks",
diff --git a/reactos/drivers/storage/ide/uniata/id_dma.cpp b/reactos/drivers/storage/ide/uniata/id_dma.cpp
index aadcf0a75b6..e1f35bba76f 100644
--- a/reactos/drivers/storage/ide/uniata/id_dma.cpp
+++ b/reactos/drivers/storage/ide/uniata/id_dma.cpp
@@ -50,7 +50,7 @@ static const ULONG valid_udma[7] = {0,0,2,0,4,5,6};
 static const CHAR retry_Wdma[MAX_RETRIES+1] = {2, 2, 2,-1,-1,-1};
 static const CHAR retry_Udma[MAX_RETRIES+1] = {6, 2,-1,-1,-1,-1};
 
-PHYSICAL_ADDRESS ph4gb = {0xFFFFFFFF, 0};
+PHYSICAL_ADDRESS ph4gb = {{0xFFFFFFFF, 0}};
 
 VOID
 cyrix_timing (
@@ -242,7 +242,7 @@ retry_DB_IO:
         data = (PUCHAR)(chan->DB_IO);
     } else
     if(!dma_count || ((LONG)(dma_base) == -1)) {
-        AtaReq->dma_base = NULL;
+        AtaReq->dma_base = 0;
         KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No 1st block\n" ));
         return FALSE;
     }
@@ -257,7 +257,7 @@ retry_DB_IO:
         AtaReq->dma_tab[i].count = (dma_count & 0xffff);
         i++; 
         if (i >= ATA_DMA_ENTRIES) {
-            AtaReq->dma_base = NULL;
+            AtaReq->dma_base = 0;
             KdPrint2((PRINT_PREFIX "too many segments in DMA table\n" ));
             return FALSE;
         }
@@ -272,7 +272,7 @@ retry_DB_IO:
             goto retry_DB_IO;
         } else
         if(!dma_count || !dma_base || ((LONG)(dma_base) == -1)) {
-            AtaReq->dma_base = NULL;
+            AtaReq->dma_base = 0;
             KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No NEXT block\n" ));
             return FALSE;
         }
@@ -783,7 +783,7 @@ AtapiDmaInit(
     if(deviceExtension->BaseIoAddressSATA_0.Addr) {
     //if(ChipFlags & UNIATA_SATA) {
         /****************/
-        /* SATA Generic *
+        /* SATA Generic */
         /****************/
         UCHAR ModeByte;
 
diff --git a/reactos/drivers/storage/ide/uniata/inc/CrossNt.h b/reactos/drivers/storage/ide/uniata/inc/CrossNt.h
index d76437350d6..af1c18115cd 100644
--- a/reactos/drivers/storage/ide/uniata/inc/CrossNt.h
+++ b/reactos/drivers/storage/ide/uniata/inc/CrossNt.h
@@ -133,4 +133,4 @@ int __cdecl CrNtstrcmp (
 
 }; // end extern "C"
 
-#endif //__CROSS_VERSION_LIB_NT__H__
\ No newline at end of file
+#endif //__CROSS_VERSION_LIB_NT__H__
diff --git a/reactos/drivers/storage/ide/uniata/ntddk_ex.h b/reactos/drivers/storage/ide/uniata/ntddk_ex.h
index 071f7b945e9..c54da9a1a5c 100644
--- a/reactos/drivers/storage/ide/uniata/ntddk_ex.h
+++ b/reactos/drivers/storage/ide/uniata/ntddk_ex.h
@@ -1,6 +1,9 @@
 #ifndef __NTDDK_EX__H__
 #define __NTDDK_EX__H__
 
+#undef ASSERT
+#define ASSERT
+
 typedef enum _SYSTEM_INFORMATION_CLASS
 {
     SystemBasicInformation,
diff --git a/reactos/drivers/storage/ide/uniata/srb.h b/reactos/drivers/storage/ide/uniata/srb.h
index 39ecd3ae798..ec9316ad625 100644
--- a/reactos/drivers/storage/ide/uniata/srb.h
+++ b/reactos/drivers/storage/ide/uniata/srb.h
@@ -190,7 +190,9 @@ typedef enum _SCSI_ADAPTER_CONTROL_STATUS {
 // ScsiQuerySupportedControlTypes:
 //
 
+#ifdef _MSC_VER
 #pragma warning(disable:4200)
+#endif
 typedef struct _SCSI_SUPPORTED_CONTROL_TYPE_LIST {
 
     //
@@ -209,7 +211,9 @@ typedef struct _SCSI_SUPPORTED_CONTROL_TYPE_LIST {
     OUT BOOLEAN SupportedTypeList[0];
 
 } SCSI_SUPPORTED_CONTROL_TYPE_LIST, *PSCSI_SUPPORTED_CONTROL_TYPE_LIST;
-#pragma warning(default:4200)
+#ifdef _MSC_VER
+#pragma warning(disable:4200)
+#endif
 
 //
 // Uninitialized flag value.
@@ -419,38 +423,38 @@ typedef struct _SCSI_WMI_REQUEST_BLOCK {
 //
 
 typedef
-BOOLEAN
+BOOLEAN DDKAPI
 (*PHW_INITIALIZE) (
     IN PVOID DeviceExtension
     );
 
 typedef
-BOOLEAN
+BOOLEAN DDKAPI
 (*PHW_STARTIO) (
     IN PVOID DeviceExtension,
     IN PSCSI_REQUEST_BLOCK Srb
     );
 
 typedef
-BOOLEAN
+BOOLEAN DDKAPI
 (*PHW_INTERRUPT) (
     IN PVOID DeviceExtension
     );
 
 typedef
-VOID
+VOID DDKAPI
 (*PHW_TIMER) (
     IN PVOID DeviceExtension
     );
 
 typedef
-VOID
+VOID DDKAPI
 (*PHW_DMA_STARTED) (
     IN PVOID DeviceExtension
     );
 
 typedef
-ULONG
+ULONG DDKAPI
 (*PHW_FIND_ADAPTER) (
     IN PVOID DeviceExtension,
     IN PVOID HwContext,
@@ -461,14 +465,14 @@ ULONG
     );
 
 typedef
-BOOLEAN
+BOOLEAN DDKAPI
 (*PHW_RESET_BUS) (
     IN PVOID DeviceExtension,
     IN ULONG PathId
     );
 
 typedef
-BOOLEAN
+BOOLEAN DDKAPI
 (*PHW_ADAPTER_STATE) (
     IN PVOID DeviceExtension,
     IN PVOID Context,
@@ -476,7 +480,7 @@ BOOLEAN
     );
 
 typedef
-SCSI_ADAPTER_CONTROL_STATUS
+SCSI_ADAPTER_CONTROL_STATUS DDKAPI
 (*PHW_ADAPTER_CONTROL) (
     IN PVOID DeviceExtension,
     IN SCSI_ADAPTER_CONTROL_TYPE ControlType,
@@ -603,7 +607,7 @@ typedef struct _HW_INITIALIZATION_DATA_COMMON {
 //
 
 SCSIPORT_API
-ULONG
+ULONG DDKAPI
 ScsiPortInitialize(
     IN PVOID Argument1,
     IN PVOID Argument2,
@@ -612,14 +616,14 @@ ScsiPortInitialize(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortFreeDeviceBase(
     IN PVOID HwDeviceExtension,
     IN PVOID MappedAddress
     );
 
 SCSIPORT_API
-ULONG
+ULONG DDKAPI
 ScsiPortGetBusData(
     IN PVOID DeviceExtension,
     IN ULONG BusDataType,
@@ -630,7 +634,7 @@ ScsiPortGetBusData(
     );
 
 SCSIPORT_API
-ULONG
+ULONG DDKAPI
 ScsiPortSetBusDataByOffset(
     IN PVOID DeviceExtension,
     IN ULONG BusDataType,
@@ -642,7 +646,7 @@ ScsiPortSetBusDataByOffset(
     );
 
 SCSIPORT_API
-PVOID
+PVOID DDKAPI
 ScsiPortGetDeviceBase(
     IN PVOID HwDeviceExtension,
     IN INTERFACE_TYPE BusType,
@@ -653,7 +657,7 @@ ScsiPortGetDeviceBase(
     );
 
 SCSIPORT_API
-PVOID
+PVOID DDKAPI
 ScsiPortGetLogicalUnit(
     IN PVOID HwDeviceExtension,
     IN UCHAR PathId,
@@ -662,7 +666,7 @@ ScsiPortGetLogicalUnit(
     );
 
 SCSIPORT_API
-PSCSI_REQUEST_BLOCK
+PSCSI_REQUEST_BLOCK DDKAPI
 ScsiPortGetSrb(
     IN PVOID DeviceExtension,
     IN UCHAR PathId,
@@ -672,7 +676,7 @@ ScsiPortGetSrb(
     );
 
 SCSIPORT_API
-SCSI_PHYSICAL_ADDRESS
+SCSI_PHYSICAL_ADDRESS DDKAPI
 ScsiPortGetPhysicalAddress(
     IN PVOID HwDeviceExtension,
     IN PSCSI_REQUEST_BLOCK Srb,
@@ -681,14 +685,14 @@ ScsiPortGetPhysicalAddress(
     );
 
 SCSIPORT_API
-PVOID
+PVOID DDKAPI
 ScsiPortGetVirtualAddress(
     IN PVOID HwDeviceExtension,
     IN SCSI_PHYSICAL_ADDRESS PhysicalAddress
     );
 
 SCSIPORT_API
-PVOID
+PVOID DDKAPI
 ScsiPortGetUncachedExtension(
     IN PVOID HwDeviceExtension,
     IN PPORT_CONFIGURATION_INFORMATION ConfigInfo,
@@ -696,13 +700,13 @@ ScsiPortGetUncachedExtension(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortFlushDma(
     IN PVOID DeviceExtension
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortIoMapTransfer(
     IN PVOID HwDeviceExtension,
     IN PSCSI_REQUEST_BLOCK Srb,
@@ -711,7 +715,7 @@ ScsiPortIoMapTransfer(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortNotification(
     IN SCSI_NOTIFICATION_TYPE NotificationType,
     IN PVOID HwDeviceExtension,
@@ -719,7 +723,7 @@ ScsiPortNotification(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortLogError(
     IN PVOID HwDeviceExtension,
     IN PSCSI_REQUEST_BLOCK Srb OPTIONAL,
@@ -731,7 +735,7 @@ ScsiPortLogError(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortCompleteRequest(
     IN PVOID HwDeviceExtension,
     IN UCHAR PathId,
@@ -741,7 +745,7 @@ ScsiPortCompleteRequest(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortMoveMemory(
     IN PVOID WriteBuffer,
     IN PVOID ReadBuffer,
@@ -749,25 +753,25 @@ ScsiPortMoveMemory(
     );
 
 SCSIPORT_API
-UCHAR
+UCHAR DDKAPI
 ScsiPortReadPortUchar(
     IN PUCHAR Port
     );
 
 SCSIPORT_API
-USHORT
+USHORT DDKAPI
 ScsiPortReadPortUshort(
     IN PUSHORT Port
     );
 
 SCSIPORT_API
-ULONG
+ULONG DDKAPI
 ScsiPortReadPortUlong(
     IN PULONG Port
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortReadPortBufferUchar(
     IN PUCHAR Port,
     IN PUCHAR Buffer,
@@ -775,7 +779,7 @@ ScsiPortReadPortBufferUchar(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortReadPortBufferUshort(
     IN PUSHORT Port,
     IN PUSHORT Buffer,
@@ -783,7 +787,7 @@ ScsiPortReadPortBufferUshort(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortReadPortBufferUlong(
     IN PULONG Port,
     IN PULONG Buffer,
@@ -791,25 +795,25 @@ ScsiPortReadPortBufferUlong(
     );
 
 SCSIPORT_API
-UCHAR
+UCHAR DDKAPI
 ScsiPortReadRegisterUchar(
     IN PUCHAR Register
     );
 
 SCSIPORT_API
-USHORT
+USHORT DDKAPI
 ScsiPortReadRegisterUshort(
     IN PUSHORT Register
     );
 
 SCSIPORT_API
-ULONG
+ULONG DDKAPI
 ScsiPortReadRegisterUlong(
     IN PULONG Register
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortReadRegisterBufferUchar(
     IN PUCHAR Register,
     IN PUCHAR Buffer,
@@ -817,7 +821,7 @@ ScsiPortReadRegisterBufferUchar(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortReadRegisterBufferUshort(
     IN PUSHORT Register,
     IN PUSHORT Buffer,
@@ -825,7 +829,7 @@ ScsiPortReadRegisterBufferUshort(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortReadRegisterBufferUlong(
     IN PULONG Register,
     IN PULONG Buffer,
@@ -833,34 +837,34 @@ ScsiPortReadRegisterBufferUlong(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortStallExecution(
     IN ULONG Delay
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortWritePortUchar(
     IN PUCHAR Port,
     IN UCHAR Value
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortWritePortUshort(
     IN PUSHORT Port,
     IN USHORT Value
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortWritePortUlong(
     IN PULONG Port,
     IN ULONG Value
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortWritePortBufferUchar(
     IN PUCHAR Port,
     IN PUCHAR Buffer,
@@ -868,7 +872,7 @@ ScsiPortWritePortBufferUchar(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortWritePortBufferUshort(
     IN PUSHORT Port,
     IN PUSHORT Buffer,
@@ -876,7 +880,7 @@ ScsiPortWritePortBufferUshort(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortWritePortBufferUlong(
     IN PULONG Port,
     IN PULONG Buffer,
@@ -884,28 +888,28 @@ ScsiPortWritePortBufferUlong(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortWriteRegisterUchar(
     IN PUCHAR Register,
     IN UCHAR Value
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortWriteRegisterUshort(
     IN PUSHORT Register,
     IN USHORT Value
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortWriteRegisterUlong(
     IN PULONG Register,
     IN ULONG Value
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortWriteRegisterBufferUchar(
     IN PUCHAR Register,
     IN PUCHAR Buffer,
@@ -913,7 +917,7 @@ ScsiPortWriteRegisterBufferUchar(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortWriteRegisterBufferUshort(
     IN PUSHORT Register,
     IN PUSHORT Buffer,
@@ -921,7 +925,7 @@ ScsiPortWriteRegisterBufferUshort(
     );
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiPortWriteRegisterBufferUlong(
     IN PULONG Register,
     IN PULONG Buffer,
@@ -929,13 +933,13 @@ ScsiPortWriteRegisterBufferUlong(
     );
 
 SCSIPORT_API
-SCSI_PHYSICAL_ADDRESS
+SCSI_PHYSICAL_ADDRESS DDKAPI
 ScsiPortConvertUlongToPhysicalAddress(
     ULONG UlongAddress
     );
 
 SCSIPORT_API
-ULONG
+ULONG DDKAPI
 ScsiPortConvertPhysicalAddressToUlong(
     SCSI_PHYSICAL_ADDRESS Address
     );
@@ -943,7 +947,7 @@ ScsiPortConvertPhysicalAddressToUlong(
 #define ScsiPortConvertPhysicalAddressToUlong(Address) ((Address).LowPart)
 
 SCSIPORT_API
-BOOLEAN
+BOOLEAN DDKAPI
 ScsiPortValidateRange(
     IN PVOID HwDeviceExtension,
     IN INTERFACE_TYPE BusType,
@@ -956,7 +960,7 @@ ScsiPortValidateRange(
 // begin_ntminitape
 
 SCSIPORT_API
-VOID
+VOID DDKAPI
 ScsiDebugPrint(
     ULONG DebugPrintLevel,
     PCCHAR DebugMessage,