Author: tfaber
Date: Sun May 8 08:10:00 2016
New Revision: 71280
URL:
http://svn.reactos.org/svn/reactos?rev=71280&view=rev
Log:
[0.4.1]
- Merge Mark's UniATA compilation fix from r71262
CORE-11157
Modified:
branches/ros-branch-0_4_1/reactos/ (props changed)
branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_ata.cpp
Propchange: branches/ros-branch-0_4_1/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May 8 08:10:00 2016
@@ -20,4 +20,4 @@
/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
/branches/wlan-bringup:54809-54998
-/trunk/reactos:71217,71231-71232,71245,71252
+/trunk/reactos:71217,71231-71232,71245,71252,71262
Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_ata.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver…
==============================================================================
--- branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1]
(original)
+++ branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1]
Sun May 8 08:10:00 2016
@@ -6139,7 +6139,7 @@
} else { // srb->Cdb[0] == SCSIOP_REQUEST_SENSE)
PSENSE_DATA senseData = (PSENSE_DATA) srb->DataBuffer;
-
+ (void)senseData;
KdPrint3((PRINT_PREFIX "AtapiInterrupt: ATAPI command status
%#x\n", status));
if (status == SRB_STATUS_DATA_OVERRUN) {
// Check to see if we at least get mininum number of bytes