* Sync up to trunk head (r65353).

[reactos.git] / drivers / storage / classpnp / xferpkt.c

diff --git a/drivers/storage/classpnp/xferpkt.c b/drivers/storage/classpnp/xferpkt.c
index 99a0847..390afe7 100644 (file)
--- a/drivers/storage/classpnp/xferpkt.c
+++ b/drivers/storage/classpnp/xferpkt.c
@@ -22,7 +22,6 @@ Revision History:
 --*/
 
 #include "classp.h"
-#include "debug.h"
 
 #ifdef ALLOC_PRAGMA
     #pragma alloc_text(PAGE, InitializeTransferPackets)
@@ -107,7 +106,7 @@ NTSTATUS NTAPI InitializeTransferPackets(PDEVICE_OBJECT Fdo)
     while (fdoData->NumFreeTransferPackets < MIN_INITIAL_TRANSFER_PACKETS){
         PTRANSFER_PACKET pkt = NewTransferPacket(Fdo);
         if (pkt){
-            InterlockedIncrement(&fdoData->NumTotalTransferPackets);
+            InterlockedIncrement((PLONG)&fdoData->NumTotalTransferPackets);
             EnqueueFreeTransferPacket(Fdo, pkt);
         }
         else {
@@ -142,9 +141,9 @@ VOID NTAPI DestroyAllTransferPackets(PDEVICE_OBJECT Fdo)
     
     ASSERT(IsListEmpty(&fdoData->DeferredClientIrpList));
 
-    while (pkt = DequeueFreeTransferPacket(Fdo, FALSE)){
+    while ((pkt = DequeueFreeTransferPacket(Fdo, FALSE))){
         DestroyTransferPacket(pkt);
-        InterlockedDecrement(&fdoData->NumTotalTransferPackets);    
+        InterlockedDecrement((PLONG)&fdoData->NumTotalTransferPackets);    
     }
 
     ASSERT(fdoData->NumTotalTransferPackets == 0);
@@ -225,7 +224,7 @@ VOID NTAPI EnqueueFreeTransferPacket(PDEVICE_OBJECT Fdo, PTRANSFER_PACKET Pkt)
     ASSERT(!Pkt->SlistEntry.Next);
 
     InterlockedPushEntrySList(&fdoData->FreeTransferPacketsList, &Pkt->SlistEntry);
-    newNumPkts = InterlockedIncrement(&fdoData->NumFreeTransferPackets);
+    newNumPkts = InterlockedIncrement((PLONG)&fdoData->NumFreeTransferPackets);
     ASSERT(newNumPkts <= fdoData->NumTotalTransferPackets);
 
     /*
@@ -264,7 +263,7 @@ VOID NTAPI EnqueueFreeTransferPacket(PDEVICE_OBJECT Fdo, PTRANSFER_PACKET Pkt)
                 pktToDelete = DequeueFreeTransferPacket(Fdo, FALSE);   
                 if (pktToDelete){
                     SimplePushSlist(&pktList, &pktToDelete->SlistEntry);
-                    InterlockedDecrement(&fdoData->NumTotalTransferPackets);    
+                    InterlockedDecrement((PLONG)&fdoData->NumTotalTransferPackets);    
                 }
                 else {
                     DBGTRACE(ClassDebugTrace, ("Extremely unlikely condition (non-fatal): %d packets dequeued at once for Fdo %p. NumTotalTransferPackets=%d (1).", MaxWorkingSetTransferPackets, Fdo, fdoData->NumTotalTransferPackets));
@@ -273,7 +272,7 @@ VOID NTAPI EnqueueFreeTransferPacket(PDEVICE_OBJECT Fdo, PTRANSFER_PACKET Pkt)
             }
             KeReleaseSpinLock(&fdoData->SpinLock, oldIrql);
 
-            while (slistEntry = SimplePopSlist(&pktList)){
+            while ((slistEntry = SimplePopSlist(&pktList))){
                 pktToDelete = CONTAINING_RECORD(slistEntry, TRANSFER_PACKET, SlistEntry);
                 DestroyTransferPacket(pktToDelete);
             }
@@ -303,7 +302,7 @@ VOID NTAPI EnqueueFreeTransferPacket(PDEVICE_OBJECT Fdo, PTRANSFER_PACKET Pkt)
                 
                 pktToDelete = DequeueFreeTransferPacket(Fdo, FALSE);
                 if (pktToDelete){
-                    InterlockedDecrement(&fdoData->NumTotalTransferPackets);    
+                    InterlockedDecrement((PLONG)&fdoData->NumTotalTransferPackets);    
                 }
                 else {
                     DBGTRACE(ClassDebugTrace, ("Extremely unlikely condition (non-fatal): %d packets dequeued at once for Fdo %p. NumTotalTransferPackets=%d (2).", MinWorkingSetTransferPackets, Fdo, fdoData->NumTotalTransferPackets));
@@ -333,7 +332,7 @@ PTRANSFER_PACKET NTAPI DequeueFreeTransferPacket(PDEVICE_OBJECT Fdo, BOOLEAN All
         slistEntry->Next = NULL;
         pkt = CONTAINING_RECORD(slistEntry, TRANSFER_PACKET, SlistEntry);
         ASSERT(fdoData->NumFreeTransferPackets > 0);
-        InterlockedDecrement(&fdoData->NumFreeTransferPackets);
+        InterlockedDecrement((PLONG)&fdoData->NumFreeTransferPackets);
     }
     else {
         if (AllocIfNeeded){
@@ -345,7 +344,7 @@ PTRANSFER_PACKET NTAPI DequeueFreeTransferPacket(PDEVICE_OBJECT Fdo, BOOLEAN All
              */
             pkt = NewTransferPacket(Fdo);
             if (pkt){
-                InterlockedIncrement(&fdoData->NumTotalTransferPackets);
+                InterlockedIncrement((PLONG)&fdoData->NumTotalTransferPackets);
                 fdoData->DbgPeakNumTransferPackets = max(fdoData->DbgPeakNumTransferPackets, fdoData->NumTotalTransferPackets);
             }
             else {
@@ -720,7 +719,6 @@ VOID NTAPI SetupEjectionTransferPacket(   TRANSFER_PACKET *Pkt,
                                         PIRP OriginalIrp)
 {
     PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Pkt->Fdo->DeviceExtension;
-    PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData;
     PCDB pCdb;
 
     PAGED_CODE();
@@ -766,7 +764,6 @@ VOID NTAPI SetupModeSenseTransferPacket(TRANSFER_PACKET *Pkt,
                                         PIRP OriginalIrp)
 {
     PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Pkt->Fdo->DeviceExtension;
-    PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData;
     PCDB pCdb;
 
     PAGED_CODE();
@@ -815,7 +812,6 @@ VOID NTAPI SetupDriveCapacityTransferPacket(TRANSFER_PACKET *Pkt,
                                             PIRP OriginalIrp)
 {
     PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Pkt->Fdo->DeviceExtension;
-    PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData;
     PCDB pCdb;
 
     RtlZeroMemory(&Pkt->Srb, sizeof(SCSI_REQUEST_BLOCK));