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

svn path=/trunk/; revision=69225
This commit is contained in:
Amine Khaldi 2015-09-14 10:33:09 +00:00
parent 116b6a6b6d
commit 3dd1f95aeb
3 changed files with 7 additions and 3 deletions

View file

@ -8035,7 +8035,11 @@ default_no_prep:
} else { } else {
RtlZeroMemory(modeData, sizeof(MODE_POWER_CONDITION_PAGE)); RtlZeroMemory(modeData, sizeof(MODE_POWER_CONDITION_PAGE));
modeData->PageCode = MODE_PAGE_POWER_CONDITION; 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); modeData->PageLength = sizeof(MODE_PAGE_POWER_CONDITION)-sizeof(MODE_PARAMETER_HEADER);
#endif
modeData->Byte3.Fields.Idle = LunExt->PowerState <= StartStop_Power_Idle; modeData->Byte3.Fields.Idle = LunExt->PowerState <= StartStop_Power_Idle;
modeData->Byte3.Fields.Standby = LunExt->PowerState == StartStop_Power_Standby; modeData->Byte3.Fields.Standby = LunExt->PowerState == StartStop_Power_Standby;
Srb->DataTransferLength = sizeof(MODE_POWER_CONDITION_PAGE); Srb->DataTransferLength = sizeof(MODE_POWER_CONDITION_PAGE);

View file

@ -2313,13 +2313,13 @@ UniataAhciEndTransaction(
KdPrint2((" Incomplete command, CI %#x, ACT %#x\n", CI, ACT)); KdPrint2((" Incomplete command, CI %#x, ACT %#x\n", CI, ACT));
KdPrint2((" FIS status %#x, error %#x\n", RCV_FIS[2], RCV_FIS[3])); KdPrint2((" FIS status %#x, error %#x\n", RCV_FIS[2], RCV_FIS[3]));
#if DBG #ifdef _DEBUG
UniataDumpAhciPortRegs(chan); UniataDumpAhciPortRegs(chan);
#endif #endif
if(!UniataAhciAbortOperation(chan)) { if(!UniataAhciAbortOperation(chan)) {
KdPrint2((" Abort failed, need RESET\n")); KdPrint2((" Abort failed, need RESET\n"));
} }
#if DBG #ifdef _DEBUG
UniataDumpAhciPortRegs(chan); UniataDumpAhciPortRegs(chan);
#endif #endif
chan->AhciPrevCI = CI & ~((ULONG)1 << tag); chan->AhciPrevCI = CI & ~((ULONG)1 << tag);

View file

@ -123,7 +123,7 @@ UniataAhciInit(
IN PVOID HwDeviceExtension IN PVOID HwDeviceExtension
); );
#if DBG #ifdef _DEBUG
VOID VOID
NTAPI NTAPI
UniataDumpAhciPortRegs( UniataDumpAhciPortRegs(