[akhaldi] 69225: [UNIATA] Get back a ros diff spotted by Thomas and use our debug checks in some more places. CORE-10185

Author: akhaldi
Date: Mon Sep 14 10:33:09 2015
New Revision: 69225

URL: http://svn.reactos.org/svn/reactos?rev=69225&view=rev
Log:
[UNIATA] Get back a ros diff spotted by Thomas and use our debug checks in some more
places. CORE-10185

Modified:
    trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp
    trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp
    trunk/reactos/drivers/storage/ide/uniata/id_sata.h

Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp	[iso-8859-1] Mon Sep 14 10:33:09
2015
@@ -8035,7 +8035,11 @@
             } else {
                 RtlZeroMemory(modeData, sizeof(MODE_POWER_CONDITION_PAGE));
                 modeData->PageCode = MODE_PAGE_POWER_CONDITION;
+#ifdef __REACTOS__
+                modeData->PageLength =
sizeof(MODE_POWER_CONDITION_PAGE)-sizeof(MODE_PARAMETER_HEADER);
+#else
                 modeData->PageLength =
sizeof(MODE_PAGE_POWER_CONDITION)-sizeof(MODE_PARAMETER_HEADER);
+#endif
                 modeData->Byte3.Fields.Idle = LunExt->PowerState <=
StartStop_Power_Idle;
                 modeData->Byte3.Fields.Standby = LunExt->PowerState ==
StartStop_Power_Standby;
                 Srb->DataTransferLength = sizeof(MODE_POWER_CONDITION_PAGE);

Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp	[iso-8859-1] Mon Sep 14 10:33:09
2015
@@ -2313,13 +2313,13 @@
         KdPrint2(("  Incomplete command, CI %#x, ACT %#x\n", CI, ACT));
         KdPrint2(("  FIS status %#x, error %#x\n", RCV_FIS[2], RCV_FIS[3]));
 
-#if DBG
+#ifdef _DEBUG
         UniataDumpAhciPortRegs(chan);
 #endif
         if(!UniataAhciAbortOperation(chan)) {
             KdPrint2(("  Abort failed, need RESET\n"));
         }
-#if DBG
+#ifdef _DEBUG
         UniataDumpAhciPortRegs(chan);
 #endif
         chan->AhciPrevCI = CI & ~((ULONG)1 << tag);

Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/id_sata.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/id_sata.h	[iso-8859-1] Mon Sep 14 10:33:09
2015
@@ -123,7 +123,7 @@
     IN PVOID HwDeviceExtension
     );
 
-#if DBG
+#ifdef _DEBUG
 VOID
 NTAPI
 UniataDumpAhciPortRegs(