[ros-diffs] [cwittich] 27441: -some changes to be able to build the driver with PREfast

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sat Jul  7 05:09:55 2007
New Revision: 27441

URL: http://svn.reactos.org/svn/reactos?rev=27441&view=rev
Log:
-some changes to be able to build the driver with PREfast

Modified:
    trunk/reactos/drivers/storage/scsiport/scsiport.c

Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/scsiport.c?rev=27441&r1=27440&r2=27441&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/scsiport.c (original)
+++ trunk/reactos/drivers/storage/scsiport/scsiport.c Sat Jul  7 05:09:55 2007
@@ -37,10 +37,17 @@
 #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;
 
@@ -1411,7 +1418,7 @@
           + 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 @@
                 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 @@
             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 @@
 	  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)