From 8d94a7336b65ca095b7164ec89bd9c848e137639 Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Sat, 7 Jul 2007 01:09:55 +0000
Subject: [PATCH] -some changes to be able to build the driver with PREfast

svn path=/trunk/; revision=27441
---
 reactos/drivers/storage/scsiport/scsiport.c | 23 ++++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/reactos/drivers/storage/scsiport/scsiport.c b/reactos/drivers/storage/scsiport/scsiport.c
index cbfe3f47b4c..357020421a0 100644
--- a/reactos/drivers/storage/scsiport/scsiport.c
+++ b/reactos/drivers/storage/scsiport/scsiport.c
@@ -37,11 +37,18 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+#ifndef NDEBUG
 #define NDEBUG
+#endif NDEBUG
 #include <debug.h>
 
 #include "scsiport_int.h"
 
+#ifdef _MSC_VER
+  #define STDCALL
+  #define DDKAPI
+#endif
+
 ULONG InternalDebugLevel = 0x00;
 
 /* TYPES *********************************************************************/
@@ -1411,7 +1418,7 @@ CreatePortConfig:
           + sizeof(ULONG));
 
       /* Store number of buses there */
-      DeviceExtension->BusesConfig->NumberOfBuses = DeviceExtension->BusNum;
+      DeviceExtension->BusesConfig->NumberOfBuses = (UCHAR)DeviceExtension->BusNum;
 
       /* Scan the adapter for devices */
       SpiScanAdapter(DeviceExtension);
@@ -3306,9 +3313,9 @@ SpiScanAdapter(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension)
                 DeviceExtension->LunExtensionList[Hint] = LunExtension;
 
                 /* Fill Path, Target, Lun fields */
-                LunExtension->PathId = LunInfo->PathId = Bus;
-                LunExtension->TargetId = LunInfo->TargetId = Target;
-                LunExtension->Lun = LunInfo->Lun = Lun;
+                LunExtension->PathId = LunInfo->PathId = (UCHAR)Bus;
+                LunExtension->TargetId = LunInfo->TargetId = (UCHAR) Target;
+                LunExtension->Lun = LunInfo->Lun = (UCHAR)Lun;
 
                 /* Set flag to prevent race conditions */
                 LunExtension->Flags |= SCSI_PORT_SCAN_IN_PROGRESS;
@@ -3395,7 +3402,7 @@ SpiScanAdapter(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension)
             ExFreePool(LunInfo);
 
         /* Sum what we found */
-        BusScanInfo->LogicalUnitsCount += DevicesFound;
+        BusScanInfo->LogicalUnitsCount += (UCHAR) DevicesFound;
         DPRINT("    Found %d devices on bus %d\n", DevicesFound, Bus);
     }
 
@@ -4904,9 +4911,9 @@ SpiBuildDeviceMap (PSCSI_PORT_DEVICE_EXTENSION DeviceExtension,
 	  for (Lun = 0; Lun < SCSI_MAXIMUM_LOGICAL_UNITS; Lun++)
 	    {
 	      LunExtension = SpiGetLunExtension(DeviceExtension,
-						BusNumber,
-						Target,
-						Lun);
+						(UCHAR)BusNumber,
+						(UCHAR)Target,
+						(UCHAR)Lun);
 	      if (LunExtension != NULL)
 		{
 		  if (Target != CurrentTarget)