if module doesn't explicitly depend on specific Pci spec, it should include IndustryStandard/Pci.h rather than Pcixxx.h.

Also remove those self-defined "bit(a)" macro, it had been defined as BITx in Base.h.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8994 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 4 insertions, 4 deletions

diff --git a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c
index 8e18910379..43b18113d2 100644
--- a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c
+++ b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c
@@ -822,7 +822,7 @@ Returns:
     //

     // disable Interrupt

     //

-    DeviceControlValue |= bit (1);

+    DeviceControlValue |= BIT1;

     WritePortB (

       AtapiScsiPrivate->PciIo,

       AtapiScsiPrivate->IoPort->Alt.DeviceControl,

@@ -922,7 +922,7 @@ Returns:
   //

   // bit7 and bit5 are both set to 1 for backward compatibility

   //

-  DeviceSelect = (UINT8) (((bit (7) | bit (5)) | (Target << 4)));

+  DeviceSelect = (UINT8) (((BIT7 | BIT5) | (Target << 4)));

   WritePortB (AtapiScsiPrivate->PciIo, AtapiScsiPrivate->IoPort->Head, DeviceSelect);

 

   Command = ATAPI_SOFT_RESET_CMD;

@@ -1336,7 +1336,7 @@ Returns:
     //

     // disable Interrupt

     //

-    DeviceControlValue |= bit (1);

+    DeviceControlValue |= BIT1;

     WritePortB (

       AtapiScsiPrivate->PciIo,

       AtapiScsiPrivate->IoPort->Alt.DeviceControl,

@@ -1438,7 +1438,7 @@ Returns:
   //

   // bit7 and bit5 are both set to 1 for backward compatibility

   //

-  DeviceSelect = (UINT8) (((bit (7) | bit (5)) | (TargetId << 4)));

+  DeviceSelect = (UINT8) ((BIT7 | BIT5) | (TargetId << 4));

   WritePortB (AtapiScsiPrivate->PciIo, AtapiScsiPrivate->IoPort->Head, DeviceSelect);

 

   Command = ATAPI_SOFT_RESET_CMD;