#include "AtapiPassThru.h"\r
\r
\r
-static SCSI_COMMAND_SET gEndTable = { 0xff, (DATA_DIRECTION) 0xff };\r
+SCSI_COMMAND_SET gEndTable = { 0xff, (DATA_DIRECTION) 0xff };\r
\r
///\r
/// This table contains all the supported ATAPI commands.\r
///\r
-static SCSI_COMMAND_SET gSupportedATAPICommands[] = {\r
+SCSI_COMMAND_SET gSupportedATAPICommands[] = {\r
{ OP_INQUIRY, DataIn },\r
{ OP_LOAD_UNLOAD_CD, NoData },\r
{ OP_MECHANISM_STATUS, DataIn },\r
return EFI_UNSUPPORTED;\r
}\r
\r
- if (Pci.Hdr.ClassCode[2] != PCI_CLASS_MASS_STORAGE || Pci.Hdr.ClassCode[1] != PCI_CLASS_IDE) {\r
+ if (Pci.Hdr.ClassCode[2] != PCI_CLASS_MASS_STORAGE || Pci.Hdr.ClassCode[1] != PCI_CLASS_MASS_STORAGE_IDE) {\r
\r
Status = EFI_UNSUPPORTED;\r
}\r
//\r
// disable Interrupt\r
//\r
- DeviceControlValue |= bit (1);\r
+ DeviceControlValue |= BIT1;\r
WritePortB (\r
AtapiScsiPrivate->PciIo,\r
AtapiScsiPrivate->IoPort->Alt.DeviceControl,\r
//\r
// bit7 and bit5 are both set to 1 for backward compatibility\r
//\r
- DeviceSelect = (UINT8) (((bit (7) | bit (5)) | (Target << 4)));\r
+ DeviceSelect = (UINT8) (((BIT7 | BIT5) | (Target << 4)));\r
WritePortB (AtapiScsiPrivate->PciIo, AtapiScsiPrivate->IoPort->Head, DeviceSelect);\r
\r
Command = ATAPI_SOFT_RESET_CMD;\r
//\r
// disable Interrupt\r
//\r
- DeviceControlValue |= bit (1);\r
+ DeviceControlValue |= BIT1;\r
WritePortB (\r
AtapiScsiPrivate->PciIo,\r
AtapiScsiPrivate->IoPort->Alt.DeviceControl,\r
//\r
// bit7 and bit5 are both set to 1 for backward compatibility\r
//\r
- DeviceSelect = (UINT8) (((bit (7) | bit (5)) | (TargetId << 4)));\r
+ DeviceSelect = (UINT8) ((BIT7 | BIT5) | (TargetId << 4));\r
WritePortB (AtapiScsiPrivate->PciIo, AtapiScsiPrivate->IoPort->Head, DeviceSelect);\r
\r
Command = ATAPI_SOFT_RESET_CMD;\r