[UNIATA] Update to version 0.47a. CORE-15930

[reactos.git] / drivers / storage / ide / uniata / id_sata.h

diff --git a/drivers/storage/ide/uniata/id_sata.h b/drivers/storage/ide/uniata/id_sata.h
index aa66652..4e74219 100644 (file)
--- a/drivers/storage/ide/uniata/id_sata.h
+++ b/drivers/storage/ide/uniata/id_sata.h
@@ -29,6 +29,9 @@ Notes:
 
 Revision History:
 
+Licence:
+    GPLv2
+
 --*/
 
 #ifndef __UNIATA_SATA__H__
@@ -123,7 +126,7 @@ UniataAhciInit(
     IN PVOID HwDeviceExtension
     );
 
-#if DBG
+#ifdef _DEBUG
 VOID
 NTAPI
 UniataDumpAhciPortRegs(
@@ -289,7 +292,7 @@ UniataAhciReadChannelPort4(
     IN ULONG io_port_ndx
     )
 {
-    ULONG v = AtapiReadPortEx4(NULL, (ULONGIO_PTR)&((chan)->BaseIoAHCI_Port), io_port_ndx);
+    volatile ULONG v = AtapiReadPortEx4(NULL, (ULONGIO_PTR)&((chan)->BaseIoAHCI_Port), io_port_ndx);
     KdPrint3((PRINT_PREFIX "ReadChannelPort4 ch%d[%x] = %x\n", chan->lChannel, io_port_ndx, v));
     return v;
 } // end UniataAhciReadChannelPort4()
@@ -407,8 +410,18 @@ BuildAhciInternalSrb (
     IN ULONG Length = 0
     );
 
-#define UniataAhciChanImplemented(deviceExtension, c) \
-    (((deviceExtension)->AHCI_PI) & (1 << c))
+__inline
+BOOLEAN
+UniataAhciChanImplemented(
+    IN PHW_DEVICE_EXTENSION deviceExtension,
+    IN ULONG c
+    )
+{
+#ifdef _DEBUG
+    KdPrint2((PRINT_PREFIX "imp: %#x & %#x\n", (deviceExtension)->AHCI_PI, (1<<c) ));
+#endif
+    return (((deviceExtension)->AHCI_PI) & ((ULONG)1 << c)) ? TRUE : FALSE;
+} // end UniataAhciChanImplemented()
 
 
 #endif //__UNIATA_SATA__H__