Enable Idebus to use the Atapi.h defined in MdePkg/Include/IndustryStandard

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

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c
index 3c94c87d6f191f5d7ec6ab487a20de0b8878750b..ec546bb6b24b41121e56297db0907aa815bffefa 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c
@@ -72,7 +72,7 @@ ATAIdentify (
             IdeDev,\r
             (VOID *) AtaIdentifyPointer,\r
             sizeof (EFI_IDENTIFY_DATA),\r
             IdeDev,\r
             (VOID *) AtaIdentifyPointer,\r
             sizeof (EFI_IDENTIFY_DATA),\r

-            IDENTIFY_DRIVE_CMD,\r
+            ATA_CMD_IDENTIFY_DRIVE,\r

             DeviceSelect,\r
             0,\r
             0,\r
             DeviceSelect,\r
             0,\r
             0,\r


@@ -191,7 +191,7 @@ AtaAtapi6Identify (
 \r
   Atapi6IdentifyStruct = IdeDev->pIdData;\r
 \r
 \r
   Atapi6IdentifyStruct = IdeDev->pIdData;\r
 \r

-  if ((Atapi6IdentifyStruct->AtapiData.cmd_set_support_83 & bit10) == 0) {\r
+  if ((Atapi6IdentifyStruct->AtapiData.cmd_set_support_83 & BIT10) == 0) {\r

     //\r
     // The device dosn't support 48 bit addressing\r
     //\r
     //\r
     // The device dosn't support 48 bit addressing\r
     //\r


@@ -347,7 +347,7 @@ AtaPioDataIn (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r

-  if (AtaCommand == SET_FEATURES_CMD) {\r
+  if (AtaCommand == ATA_CMD_SET_FEATURES) {\r

     IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Feature, 0x03);\r
   }\r
 \r
     IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Feature, 0x03);\r
   }\r
 \r


@@ -599,7 +599,7 @@ CheckErrorStatus (
 \r
   DEBUG_CODE_BEGIN ();\r
 \r
 \r
   DEBUG_CODE_BEGIN ();\r
 \r

-    if (StatusRegister & DWF) {\r
+    if (StatusRegister & ATA_STSREG_DWF) {\r

       DEBUG (\r
         (EFI_D_BLKIO,\r
         "CheckErrorStatus()-- %02x : Error : Write Fault\n",\r
       DEBUG (\r
         (EFI_D_BLKIO,\r
         "CheckErrorStatus()-- %02x : Error : Write Fault\n",\r


@@ -607,7 +607,7 @@ CheckErrorStatus (
         );\r
     }\r
 \r
         );\r
     }\r
 \r

-    if (StatusRegister & CORR) {\r
+    if (StatusRegister & ATA_STSREG_CORR) {\r

       DEBUG (\r
         (EFI_D_BLKIO,\r
         "CheckErrorStatus()-- %02x : Error : Corrected Data\n",\r
       DEBUG (\r
         (EFI_D_BLKIO,\r
         "CheckErrorStatus()-- %02x : Error : Corrected Data\n",\r


@@ -615,10 +615,10 @@ CheckErrorStatus (
         );\r
     }\r
 \r
         );\r
     }\r
 \r

-    if (StatusRegister & ERR) {\r
+    if (StatusRegister & ATA_STSREG_ERR) {\r

       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r
 \r
       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r
 \r

-      if (ErrorRegister & BBK_ERR) {\r
+      if (ErrorRegister & ATA_ERRREG_BBK) {\r

       DEBUG (\r
         (EFI_D_BLKIO,\r
         "CheckErrorStatus()-- %02x : Error : Bad Block Detected\n",\r
       DEBUG (\r
         (EFI_D_BLKIO,\r
         "CheckErrorStatus()-- %02x : Error : Bad Block Detected\n",\r


@@ -626,7 +626,7 @@ CheckErrorStatus (
         );\r
       }\r
 \r
         );\r
       }\r
 \r

-      if (ErrorRegister & UNC_ERR) {\r
+      if (ErrorRegister & ATA_ERRREG_UNC) {\r

         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Uncorrectable Data\n",\r
         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Uncorrectable Data\n",\r


@@ -634,7 +634,7 @@ CheckErrorStatus (
           );\r
       }\r
 \r
           );\r
       }\r
 \r

-      if (ErrorRegister & MC_ERR) {\r
+      if (ErrorRegister & ATA_ERRREG_MC) {\r

         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Media Change\n",\r
         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Media Change\n",\r


@@ -642,7 +642,7 @@ CheckErrorStatus (
           );\r
       }\r
 \r
           );\r
       }\r
 \r

-      if (ErrorRegister & ABRT_ERR) {\r
+      if (ErrorRegister & ATA_ERRREG_ABRT) {\r

         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Abort\n",\r
         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Abort\n",\r


@@ -650,7 +650,7 @@ CheckErrorStatus (
           );\r
       }\r
 \r
           );\r
       }\r
 \r

-      if (ErrorRegister & TK0NF_ERR) {\r
+      if (ErrorRegister & ATA_ERRREG_TK0NF) {\r

         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Track 0 Not Found\n",\r
         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Track 0 Not Found\n",\r


@@ -658,7 +658,7 @@ CheckErrorStatus (
           );\r
       }\r
 \r
           );\r
       }\r
 \r

-      if (ErrorRegister & AMNF_ERR) {\r
+      if (ErrorRegister & ATA_ERRREG_AMNF) {\r

         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Address Mark Not Found\n",\r
         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Address Mark Not Found\n",\r


@@ -669,7 +669,7 @@ CheckErrorStatus (
 \r
   DEBUG_CODE_END ();\r
 \r
 \r
   DEBUG_CODE_END ();\r
 \r

-  if ((StatusRegister & (ERR | DWF | CORR)) == 0) {\r
+  if ((StatusRegister & (ATA_STSREG_ERR | ATA_STSREG_DWF | ATA_STSREG_CORR)) == 0) {\r

     return EFI_SUCCESS;\r
   }\r
 \r
     return EFI_SUCCESS;\r
   }\r
 \r


@@ -725,7 +725,7 @@ AtaReadSectors (
   //\r
   // Using ATA Read Sector(s) command (opcode=0x20) with PIO DATA IN protocol\r
   //\r
   //\r
   // Using ATA Read Sector(s) command (opcode=0x20) with PIO DATA IN protocol\r
   //\r

-  AtaCommand      = READ_SECTORS_CMD;\r
+  AtaCommand      = ATA_CMD_READ_SECTORS;\r

 \r
 \r
   BlocksRemaining = NumberOfBlocks;\r
 \r
 \r
   BlocksRemaining = NumberOfBlocks;\r


@@ -843,7 +843,7 @@ AtaWriteSectors (
   //\r
   // Using Write Sector(s) command (opcode=0x30) with PIO DATA OUT protocol\r
   //\r
   //\r
   // Using Write Sector(s) command (opcode=0x30) with PIO DATA OUT protocol\r
   //\r

-  AtaCommand      = WRITE_SECTORS_CMD;\r
+  AtaCommand      = ATA_CMD_WRITE_SECTORS;\r

 \r
   BlocksRemaining = NumberOfBlocks;\r
 \r
 \r
   BlocksRemaining = NumberOfBlocks;\r
 \r


@@ -936,12 +936,12 @@ AtaSoftReset (
   //\r
   // set SRST bit to initiate soft reset\r
   //\r
   //\r
   // set SRST bit to initiate soft reset\r
   //\r

-  DeviceControl |= SRST;\r
+  DeviceControl |= ATA_CTLREG_SRST;\r

 \r
   //\r
   // disable Interrupt\r
   //\r
 \r
   //\r
   // disable Interrupt\r
   //\r

-  DeviceControl |= bit1;\r
+  DeviceControl |= BIT1;\r

 \r
   IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Alt.DeviceControl, DeviceControl);\r
 \r
 \r
   IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Alt.DeviceControl, DeviceControl);\r
 \r


@@ -1259,7 +1259,7 @@ AtaReadSectorsExt (
   //\r
   // Using ATA "Read Sectors Ext" command(opcode=0x24) with PIO DATA IN protocol\r
   //\r
   //\r
   // Using ATA "Read Sectors Ext" command(opcode=0x24) with PIO DATA IN protocol\r
   //\r

-  AtaCommand      = READ_SECTORS_EXT_CMD;\r
+  AtaCommand      = ATA_CMD_READ_SECTORS_EXT;\r

   Buffer          = DataBuffer;\r
   BlocksRemaining = NumberOfBlocks;\r
   Lba64           = StartLba;\r
   Buffer          = DataBuffer;\r
   BlocksRemaining = NumberOfBlocks;\r
   Lba64           = StartLba;\r


@@ -1347,7 +1347,7 @@ AtaWriteSectorsExt (
   //\r
   // Using ATA "Write Sectors Ext" cmd(opcode=0x24) with PIO DATA OUT protocol\r
   //\r
   //\r
   // Using ATA "Write Sectors Ext" cmd(opcode=0x24) with PIO DATA OUT protocol\r
   //\r

-  AtaCommand      = WRITE_SECTORS_EXT_CMD;\r
+  AtaCommand      = ATA_CMD_WRITE_SECTORS_EXT;\r

   Lba64           = StartLba;\r
   Buffer          = DataBuffer;\r
   BlocksRemaining = NumberOfBlocks;\r
   Lba64           = StartLba;\r
   Buffer          = DataBuffer;\r
   BlocksRemaining = NumberOfBlocks;\r


@@ -1471,7 +1471,7 @@ AtaPioDataInExt (
   //\r
   // Fill feature register if needed\r
   //\r
   //\r
   // Fill feature register if needed\r
   //\r

-  if (AtaCommand == SET_FEATURES_CMD) {\r
+  if (AtaCommand == ATA_CMD_SET_FEATURES) {\r

     IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Feature, 0x03);\r
   }\r
 \r
     IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Feature, 0x03);\r
   }\r
 \r


@@ -1633,7 +1633,7 @@ AtaPioDataOutExt (
   //\r
   // Fill feature register if needed\r
   //\r
   //\r
   // Fill feature register if needed\r
   //\r

-  if (AtaCommand == SET_FEATURES_CMD) {\r
+  if (AtaCommand == ATA_CMD_SET_FEATURES) {\r

     IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Feature, 0x03);\r
   }\r
 \r
     IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Feature, 0x03);\r
   }\r
 \r


@@ -1781,7 +1781,7 @@ AtaSMARTSupport (
     Device = (UINT8) ((IdeDev->Device << 4) | 0xe0);\r
     Status = AtaNonDataCommandIn (\r
               IdeDev,\r
     Device = (UINT8) ((IdeDev->Device << 4) | 0xe0);\r
     Status = AtaNonDataCommandIn (\r
               IdeDev,\r

-              ATA_SMART_CMD,\r
+              ATA_CMD_SMART,\r

               Device,\r
               ATA_SMART_ENABLE_OPERATION,\r
               0,\r
               Device,\r
               ATA_SMART_ENABLE_OPERATION,\r
               0,\r


@@ -1799,7 +1799,7 @@ AtaSMARTSupport (
               IdeDev,\r
               (VOID *) TmpAtaIdentifyPointer,\r
               sizeof (EFI_IDENTIFY_DATA),\r
               IdeDev,\r
               (VOID *) TmpAtaIdentifyPointer,\r
               sizeof (EFI_IDENTIFY_DATA),\r

-              IDENTIFY_DRIVE_CMD,\r
+              ATA_CMD_IDENTIFY_DRIVE,\r

               DeviceSelect,\r
               0,\r
               0,\r
               DeviceSelect,\r
               0,\r
               0,\r


@@ -1820,7 +1820,7 @@ AtaSMARTSupport (
       //\r
       AtaNonDataCommandIn (\r
         IdeDev,\r
       //\r
       AtaNonDataCommandIn (\r
         IdeDev,\r

-        ATA_SMART_CMD,\r
+        ATA_CMD_SMART,\r

         Device,\r
         ATA_SMART_RETURN_STATUS,\r
         0,\r
         Device,\r
         ATA_SMART_RETURN_STATUS,\r
         0,\r


@@ -2273,24 +2273,24 @@ DoAtaUdma (
 \r
   switch (UdmaOp) {\r
   case AtaUdmaReadOp:\r
 \r
   switch (UdmaOp) {\r
   case AtaUdmaReadOp:\r

-    MaxDmaCommandSectors = MAX_DMA_COMMAND_SECTORS;\r
+    MaxDmaCommandSectors = ATAPI_MAX_DMA_CMD_SECTORS;\r

     PciIoProtocolOp      = EfiPciIoOperationBusMasterWrite;\r
     PciIoProtocolOp      = EfiPciIoOperationBusMasterWrite;\r

-    AtaCommand           = READ_DMA_CMD;\r
+    AtaCommand           = ATA_CMD_READ_DMA;\r

     break;\r
   case AtaUdmaReadExtOp:\r
     break;\r
   case AtaUdmaReadExtOp:\r

-    MaxDmaCommandSectors = MAX_DMA_EXT_COMMAND_SECTORS;\r
+    MaxDmaCommandSectors = ATAPI_MAX_DMA_EXT_CMD_SECTORS;\r

     PciIoProtocolOp      = EfiPciIoOperationBusMasterWrite;\r
     PciIoProtocolOp      = EfiPciIoOperationBusMasterWrite;\r

-    AtaCommand           = READ_DMA_EXT_CMD;\r
+    AtaCommand           = ATA_CMD_READ_DMA_EXT;\r

     break;\r
   case AtaUdmaWriteOp:\r
     break;\r
   case AtaUdmaWriteOp:\r

-    MaxDmaCommandSectors = MAX_DMA_COMMAND_SECTORS;\r
+    MaxDmaCommandSectors = ATAPI_MAX_DMA_CMD_SECTORS;\r

     PciIoProtocolOp      = EfiPciIoOperationBusMasterRead;\r
     PciIoProtocolOp      = EfiPciIoOperationBusMasterRead;\r

-    AtaCommand           = WRITE_DMA_CMD;\r
+    AtaCommand           = ATA_CMD_WRITE_DMA;\r

     break;\r
   case AtaUdmaWriteExtOp:\r
     break;\r
   case AtaUdmaWriteExtOp:\r

-    MaxDmaCommandSectors = MAX_DMA_EXT_COMMAND_SECTORS;\r
+    MaxDmaCommandSectors = ATAPI_MAX_DMA_EXT_CMD_SECTORS;\r

     PciIoProtocolOp      = EfiPciIoOperationBusMasterRead;\r
     PciIoProtocolOp      = EfiPciIoOperationBusMasterRead;\r

-    AtaCommand           = WRITE_DMA_EXT_CMD;\r
+    AtaCommand           = ATA_CMD_WRITE_DMA_EXT;\r

     break;\r
   default:\r
     return EFI_UNSUPPORTED;\r
     break;\r
   default:\r
     return EFI_UNSUPPORTED;\r


@@ -2617,7 +2617,7 @@ DoAtaUdma (
   // Disable interrupt of Select device\r
   //\r
   IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Alt.DeviceControl);\r
   // Disable interrupt of Select device\r
   //\r
   IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Alt.DeviceControl);\r

-  DeviceControl |= IEN_L;\r
+  DeviceControl |= ATA_CTLREG_IEN_L;\r

   IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Alt.DeviceControl, DeviceControl);\r
 \r
   return EFI_SUCCESS;\r
   IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Alt.DeviceControl, DeviceControl);\r
 \r
   return EFI_SUCCESS;\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c
index 27f7f999fa407ebe28e9b5e60877774f1327d099..2609591c0c768a82b290987f676afcf239101202 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c
@@ -91,11 +91,11 @@ LS120GetMediaStatus (
   //\r
   StatusValue = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r
 \r
   //\r
   StatusValue = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r
 \r

-  if (StatusValue & bit1) {\r
+  if (StatusValue & BIT1) {\r

     return EFI_NO_MEDIA;\r
   }\r
 \r
     return EFI_NO_MEDIA;\r
   }\r
 \r

-  if (StatusValue & bit6) {\r
+  if (StatusValue & BIT6) {\r

     return EFI_WRITE_PROTECTED;\r
   } else {\r
     return EFI_SUCCESS;\r
     return EFI_WRITE_PROTECTED;\r
   } else {\r
     return EFI_SUCCESS;\r


@@ -248,7 +248,7 @@ ATAPIIdentify (
             IdeDev,\r
             (VOID *) AtapiIdentifyPointer,\r
             sizeof (EFI_IDENTIFY_DATA),\r
             IdeDev,\r
             (VOID *) AtapiIdentifyPointer,\r
             sizeof (EFI_IDENTIFY_DATA),\r

-            ATAPI_IDENTIFY_DEVICE_CMD,\r
+            ATA_CMD_IDENTIFY_DEVICE,\r

             DeviceSelect,\r
             0,\r
             0,\r
             DeviceSelect,\r
             0,\r
             0,\r


@@ -355,7 +355,7 @@ ATAPIIdentify (
   //\r
   IdeDev->SenseDataNumber = 20;\r
 \r
   //\r
   IdeDev->SenseDataNumber = 20;\r
 \r

-  IdeDev->SenseData = AllocatePool (IdeDev->SenseDataNumber * sizeof (REQUEST_SENSE_DATA));\r
+  IdeDev->SenseData = AllocatePool (IdeDev->SenseDataNumber * sizeof (ATAPI_REQUEST_SENSE_DATA));\r

   if (IdeDev->SenseData == NULL) {\r
     gBS->FreePool (IdeDev->pIdData);\r
     gBS->FreePool (IdeDev->pInquiryData);\r
   if (IdeDev->SenseData == NULL) {\r
     gBS->FreePool (IdeDev->pIdData);\r
     gBS->FreePool (IdeDev->pInquiryData);\r


@@ -395,17 +395,17 @@ AtapiInquiry (
 {\r
   ATAPI_PACKET_COMMAND  Packet;\r
   EFI_STATUS            Status;\r
 {\r
   ATAPI_PACKET_COMMAND  Packet;\r
   EFI_STATUS            Status;\r

-  INQUIRY_DATA          *InquiryData;\r
+  ATAPI_INQUIRY_DATA          *InquiryData;\r

 \r
   //\r
   // prepare command packet for the ATAPI Inquiry Packet Command.\r
   //\r
   ZeroMem (&Packet, sizeof (ATAPI_PACKET_COMMAND));\r
 \r
   //\r
   // prepare command packet for the ATAPI Inquiry Packet Command.\r
   //\r
   ZeroMem (&Packet, sizeof (ATAPI_PACKET_COMMAND));\r

-  Packet.Inquiry.opcode             = INQUIRY;\r
+  Packet.Inquiry.opcode             = ATA_CMD_INQUIRY;\r

   Packet.Inquiry.page_code          = 0;\r
   Packet.Inquiry.page_code          = 0;\r

-  Packet.Inquiry.allocation_length  = sizeof (INQUIRY_DATA);\r
+  Packet.Inquiry.allocation_length  = sizeof (ATAPI_INQUIRY_DATA);\r

 \r
 \r

-  InquiryData                       = AllocatePool (sizeof (INQUIRY_DATA));\r
+  InquiryData                       = AllocatePool (sizeof (ATAPI_INQUIRY_DATA));\r

   if (InquiryData == NULL) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
   if (InquiryData == NULL) {\r
     return EFI_DEVICE_ERROR;\r
   }\r


@@ -417,7 +417,7 @@ AtapiInquiry (
             IdeDev,\r
             &Packet,\r
             (UINT16 *) InquiryData,\r
             IdeDev,\r
             &Packet,\r
             (UINT16 *) InquiryData,\r

-            sizeof (INQUIRY_DATA),\r
+            sizeof (ATAPI_INQUIRY_DATA),\r

             ATAPITIMEOUT\r
             );\r
   if (EFI_ERROR (Status)) {\r
             ATAPITIMEOUT\r
             );\r
   if (EFI_ERROR (Status)) {\r


@@ -488,7 +488,7 @@ AtapiPacketCommandIn (
   IDEWritePortB (\r
     IdeDev->PciIo,\r
     IdeDev->IoPort->Head,\r
   IDEWritePortB (\r
     IdeDev->PciIo,\r
     IdeDev->IoPort->Head,\r

-    (UINT8) ((IdeDev->Device << 4) | DEFAULT_CMD)  // DEFAULT_CMD: 0xa0 (1010,0000)\r
+    (UINT8) ((IdeDev->Device << 4) | ATA_DEFAULT_CMD)  // DEFAULT_CMD: 0xa0 (1010,0000)\r

     );\r
 \r
   //\r
     );\r
 \r
   //\r


@@ -497,31 +497,31 @@ AtapiPacketCommandIn (
   IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Feature, 0x00);\r
 \r
   //\r
   IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Feature, 0x00);\r
 \r
   //\r

-  // set the transfersize to MAX_ATAPI_BYTE_COUNT to let the device\r
+  // set the transfersize to ATAPI_MAX_BYTE_COUNT to let the device\r

   // determine how many data should be transferred.\r
   //\r
   IDEWritePortB (\r
     IdeDev->PciIo,\r
     IdeDev->IoPort->CylinderLsb,\r
   // determine how many data should be transferred.\r
   //\r
   IDEWritePortB (\r
     IdeDev->PciIo,\r
     IdeDev->IoPort->CylinderLsb,\r

-    (UINT8) (MAX_ATAPI_BYTE_COUNT & 0x00ff)\r
+    (UINT8) (ATAPI_MAX_BYTE_COUNT & 0x00ff)\r

     );\r
   IDEWritePortB (\r
     IdeDev->PciIo,\r
     IdeDev->IoPort->CylinderMsb,\r
     );\r
   IDEWritePortB (\r
     IdeDev->PciIo,\r
     IdeDev->IoPort->CylinderMsb,\r

-    (UINT8) (MAX_ATAPI_BYTE_COUNT >> 8)\r
+    (UINT8) (ATAPI_MAX_BYTE_COUNT >> 8)\r

     );\r
 \r
   //\r
     );\r
 \r
   //\r

-  //  DEFAULT_CTL:0x0a (0000,1010)\r
+  //  ATA_DEFAULT_CTL:0x0a (0000,1010)\r

   //  Disable interrupt\r
   //\r
   //  Disable interrupt\r
   //\r

-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Alt.DeviceControl, DEFAULT_CTL);\r
+  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Alt.DeviceControl, ATA_DEFAULT_CTL);\r

 \r
   //\r
   // Send Packet command to inform device\r
   // that the following data bytes are command packet.\r
   //\r
 \r
   //\r
   // Send Packet command to inform device\r
   // that the following data bytes are command packet.\r
   //\r

-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Command, PACKET_CMD);\r
+  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Command, ATA_CMD_PACKET);\r

 \r
   Status = DRQReady (IdeDev, ATAPITIMEOUT);\r
   if (EFI_ERROR (Status)) {\r
 \r
   Status = DRQReady (IdeDev, ATAPITIMEOUT);\r
   if (EFI_ERROR (Status)) {\r


@@ -603,7 +603,7 @@ AtapiPacketCommandOut (
   IDEWritePortB (\r
     IdeDev->PciIo,\r
     IdeDev->IoPort->Head,\r
   IDEWritePortB (\r
     IdeDev->PciIo,\r
     IdeDev->IoPort->Head,\r

-    (UINT8) ((IdeDev->Device << 4) | DEFAULT_CMD)   // DEFAULT_CMD: 0xa0 (1010,0000)\r
+    (UINT8) ((IdeDev->Device << 4) | ATA_DEFAULT_CMD)   // ATA_DEFAULT_CMD: 0xa0 (1010,0000)\r

     );\r
 \r
   //\r
     );\r
 \r
   //\r


@@ -612,31 +612,31 @@ AtapiPacketCommandOut (
   IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Feature, 0x00);\r
 \r
   //\r
   IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Feature, 0x00);\r
 \r
   //\r

-  // set the transfersize to MAX_ATAPI_BYTE_COUNT to\r
+  // set the transfersize to ATAPI_MAX_BYTE_COUNT to\r

   // let the device determine how many data should be transferred.\r
   //\r
   IDEWritePortB (\r
     IdeDev->PciIo,\r
     IdeDev->IoPort->CylinderLsb,\r
   // let the device determine how many data should be transferred.\r
   //\r
   IDEWritePortB (\r
     IdeDev->PciIo,\r
     IdeDev->IoPort->CylinderLsb,\r

-    (UINT8) (MAX_ATAPI_BYTE_COUNT & 0x00ff)\r
+    (UINT8) (ATAPI_MAX_BYTE_COUNT & 0x00ff)\r

     );\r
   IDEWritePortB (\r
     IdeDev->PciIo,\r
     IdeDev->IoPort->CylinderMsb,\r
     );\r
   IDEWritePortB (\r
     IdeDev->PciIo,\r
     IdeDev->IoPort->CylinderMsb,\r

-    (UINT8) (MAX_ATAPI_BYTE_COUNT >> 8)\r
+    (UINT8) (ATAPI_MAX_BYTE_COUNT >> 8)\r

     );\r
 \r
   //\r
   //  DEFAULT_CTL:0x0a (0000,1010)\r
   //  Disable interrupt\r
   //\r
     );\r
 \r
   //\r
   //  DEFAULT_CTL:0x0a (0000,1010)\r
   //  Disable interrupt\r
   //\r

-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Alt.DeviceControl, DEFAULT_CTL);\r
+  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Alt.DeviceControl, ATA_DEFAULT_CTL);\r

 \r
   //\r
   // Send Packet command to inform device\r
   // that the following data bytes are command packet.\r
   //\r
 \r
   //\r
   // Send Packet command to inform device\r
   // that the following data bytes are command packet.\r
   //\r

-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Command, PACKET_CMD);\r
+  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Command, ATA_CMD_PACKET);\r

 \r
   Status = DRQReady2 (IdeDev, ATAPITIMEOUT);\r
   if (EFI_ERROR (Status)) {\r
 \r
   Status = DRQReady2 (IdeDev, ATAPITIMEOUT);\r
   if (EFI_ERROR (Status)) {\r


@@ -826,7 +826,7 @@ AtapiTestUnitReady (
   // fill command packet\r
   //\r
   ZeroMem (&Packet, sizeof (ATAPI_PACKET_COMMAND));\r
   // fill command packet\r
   //\r
   ZeroMem (&Packet, sizeof (ATAPI_PACKET_COMMAND));\r

-  Packet.TestUnitReady.opcode = TEST_UNIT_READY;\r
+  Packet.TestUnitReady.opcode = ATA_CMD_TEST_UNIT_READY;\r

 \r
   //\r
   // send command packet\r
 \r
   //\r
   // send command packet\r


@@ -879,20 +879,20 @@ AtapiRequestSense (
   )\r
 {\r
   EFI_STATUS            Status;\r
   )\r
 {\r
   EFI_STATUS            Status;\r

-  REQUEST_SENSE_DATA    *Sense;\r
+  ATAPI_REQUEST_SENSE_DATA    *Sense;\r

   UINT16                *Ptr;\r
   BOOLEAN               FetchSenseData;\r
   ATAPI_PACKET_COMMAND  Packet;\r
 \r
   *SenseCounts = 0;\r
 \r
   UINT16                *Ptr;\r
   BOOLEAN               FetchSenseData;\r
   ATAPI_PACKET_COMMAND  Packet;\r
 \r
   *SenseCounts = 0;\r
 \r

-  ZeroMem (IdeDev->SenseData, sizeof (REQUEST_SENSE_DATA) * (IdeDev->SenseDataNumber));\r
+  ZeroMem (IdeDev->SenseData, sizeof (ATAPI_REQUEST_SENSE_DATA) * (IdeDev->SenseDataNumber));\r

   //\r
   // fill command packet for Request Sense Packet Command\r
   //\r
   ZeroMem (&Packet, sizeof (ATAPI_PACKET_COMMAND));\r
   //\r
   // fill command packet for Request Sense Packet Command\r
   //\r
   ZeroMem (&Packet, sizeof (ATAPI_PACKET_COMMAND));\r

-  Packet.RequestSence.opcode            = REQUEST_SENSE;\r
-  Packet.RequestSence.allocation_length = sizeof (REQUEST_SENSE_DATA);\r
+  Packet.RequestSence.opcode            = ATA_CMD_REQUEST_SENSE;\r
+  Packet.RequestSence.allocation_length = sizeof (ATAPI_REQUEST_SENSE_DATA);\r

 \r
   //\r
   // initialize pointer\r
 \r
   //\r
   // initialize pointer\r


@@ -904,7 +904,7 @@ AtapiRequestSense (
   //\r
   for (FetchSenseData = TRUE; FetchSenseData;) {\r
 \r
   //\r
   for (FetchSenseData = TRUE; FetchSenseData;) {\r
 \r

-    Sense = (REQUEST_SENSE_DATA *) Ptr;\r
+    Sense = (ATAPI_REQUEST_SENSE_DATA *) Ptr;\r

 \r
     //\r
     // send out Request Sense Packet Command and get one Sense data form device\r
 \r
     //\r
     // send out Request Sense Packet Command and get one Sense data form device\r


@@ -913,7 +913,7 @@ AtapiRequestSense (
               IdeDev,\r
               &Packet,\r
               Ptr,\r
               IdeDev,\r
               &Packet,\r
               Ptr,\r

-              sizeof (REQUEST_SENSE_DATA),\r
+              sizeof (ATAPI_REQUEST_SENSE_DATA),\r

               ATAPITIMEOUT\r
               );\r
     //\r
               ATAPITIMEOUT\r
               );\r
     //\r


@@ -934,11 +934,11 @@ AtapiRequestSense (
     // In this case, dead loop occurs if we don't have a gatekeeper. 20 is\r
     // supposed to be large enough for any ATAPI device.\r
     //\r
     // In this case, dead loop occurs if we don't have a gatekeeper. 20 is\r
     // supposed to be large enough for any ATAPI device.\r
     //\r

-    if ((Sense->sense_key != SK_NO_SENSE) && ((*SenseCounts) < 20)) {\r
+    if ((Sense->sense_key != ATA_SK_NO_SENSE) && ((*SenseCounts) < 20)) {\r

       //\r
       // Ptr is word-based pointer\r
       //\r
       //\r
       // Ptr is word-based pointer\r
       //\r

-      Ptr += (sizeof (REQUEST_SENSE_DATA) + 1) >> 1;\r
+      Ptr += (sizeof (ATAPI_REQUEST_SENSE_DATA) + 1) >> 1;\r

 \r
     } else {\r
       //\r
 \r
     } else {\r
       //\r


@@ -989,8 +989,8 @@ AtapiReadCapacity (
   //\r
   // used for capacity data returned from ATAPI device\r
   //\r
   //\r
   // used for capacity data returned from ATAPI device\r
   //\r

-  READ_CAPACITY_DATA        Data;\r
-  READ_FORMAT_CAPACITY_DATA FormatData;\r
+  ATAPI_READ_CAPACITY_DATA        Data;\r
+  ATAPI_READ_FORMAT_CAPACITY_DATA FormatData;\r

 \r
   *SenseCount = 0;\r
 \r
 \r
   *SenseCount = 0;\r
 \r


@@ -1000,12 +1000,12 @@ AtapiReadCapacity (
   if (IdeDev->Type == IdeCdRom) {\r
 \r
     ZeroMem (&Packet, sizeof (ATAPI_PACKET_COMMAND));\r
   if (IdeDev->Type == IdeCdRom) {\r
 \r
     ZeroMem (&Packet, sizeof (ATAPI_PACKET_COMMAND));\r

-    Packet.Inquiry.opcode = READ_CAPACITY;\r
+    Packet.Inquiry.opcode = ATA_CMD_READ_CAPACITY;\r

     Status = AtapiPacketCommandIn (\r
                IdeDev,\r
                &Packet,\r
                (UINT16 *) &Data,\r
     Status = AtapiPacketCommandIn (\r
                IdeDev,\r
                &Packet,\r
                (UINT16 *) &Data,\r

-               sizeof (READ_CAPACITY_DATA),\r
+               sizeof (ATAPI_READ_CAPACITY_DATA),\r

                ATAPITIMEOUT\r
                );\r
 \r
                ATAPITIMEOUT\r
                );\r
 \r


@@ -1014,13 +1014,13 @@ AtapiReadCapacity (
     // Type == IdeMagnetic\r
     //\r
     ZeroMem (&Packet, sizeof (ATAPI_PACKET_COMMAND));\r
     // Type == IdeMagnetic\r
     //\r
     ZeroMem (&Packet, sizeof (ATAPI_PACKET_COMMAND));\r

-    Packet.ReadFormatCapacity.opcode                = READ_FORMAT_CAPACITY;\r
+    Packet.ReadFormatCapacity.opcode                = ATA_CMD_READ_FORMAT_CAPACITY;\r

     Packet.ReadFormatCapacity.allocation_length_lo  = 12;\r
     Status = AtapiPacketCommandIn (\r
                IdeDev,\r
                &Packet,\r
                (UINT16 *) &FormatData,\r
     Packet.ReadFormatCapacity.allocation_length_lo  = 12;\r
     Status = AtapiPacketCommandIn (\r
                IdeDev,\r
                &Packet,\r
                (UINT16 *) &FormatData,\r

-               sizeof (READ_FORMAT_CAPACITY_DATA),\r
+               sizeof (ATAPI_READ_FORMAT_CAPACITY_DATA),\r

                ATAPITIMEOUT\r
                );\r
   }\r
                ATAPITIMEOUT\r
                );\r
   }\r


@@ -1408,7 +1408,7 @@ AtapiReadSectors (
 {\r
 \r
   ATAPI_PACKET_COMMAND  Packet;\r
 {\r
 \r
   ATAPI_PACKET_COMMAND  Packet;\r

-  READ10_CMD            *Read10Packet;\r
+  ATAPI_READ10_CMD            *Read10Packet;\r

   EFI_STATUS            Status;\r
   UINTN                 BlocksRemaining;\r
   UINT32                Lba32;\r
   EFI_STATUS            Status;\r
   UINTN                 BlocksRemaining;\r
   UINT32                Lba32;\r


@@ -1451,7 +1451,7 @@ AtapiReadSectors (
     // fill the Packet data structure\r
     //\r
 \r
     // fill the Packet data structure\r
     //\r
 \r

-    Read10Packet->opcode = READ_10;\r
+    Read10Packet->opcode = ATA_CMD_READ_10;\r

 \r
     //\r
     // Lba0 ~ Lba3 specify the start logical block address of the data transfer.\r
 \r
     //\r
     // Lba0 ~ Lba3 specify the start logical block address of the data transfer.\r


@@ -1533,7 +1533,7 @@ AtapiWriteSectors (
 {\r
 \r
   ATAPI_PACKET_COMMAND  Packet;\r
 {\r
 \r
   ATAPI_PACKET_COMMAND  Packet;\r

-  READ10_CMD            *Read10Packet;\r
+  ATAPI_READ10_CMD            *Read10Packet;\r

 \r
   EFI_STATUS            Status;\r
   UINTN                 BlocksRemaining;\r
 \r
   EFI_STATUS            Status;\r
   UINTN                 BlocksRemaining;\r


@@ -1578,7 +1578,7 @@ AtapiWriteSectors (
     //\r
     // Command code is WRITE_10.\r
     //\r
     //\r
     // Command code is WRITE_10.\r
     //\r

-    Read10Packet->opcode = WRITE_10;\r
+    Read10Packet->opcode = ATA_CMD_WRITE_10;\r

 \r
     //\r
     // Lba0 ~ Lba3 specify the start logical block address of the data transfer.\r
 \r
     //\r
     // Lba0 ~ Lba3 specify the start logical block address of the data transfer.\r


@@ -1653,10 +1653,10 @@ AtapiSoftReset (
   // for ATAPI device, no need to wait DRDY ready after device selecting.\r
   // (bit7 and bit5 are both set to 1 for backward compatibility)\r
   //\r
   // for ATAPI device, no need to wait DRDY ready after device selecting.\r
   // (bit7 and bit5 are both set to 1 for backward compatibility)\r
   //\r

-  DeviceSelect = (UINT8) (((bit7 | bit5) | (IdeDev->Device << 4)));\r
+  DeviceSelect = (UINT8) (((BIT7 | BIT5) | (IdeDev->Device << 4)));\r

   IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Head, DeviceSelect);\r
 \r
   IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Head, DeviceSelect);\r
 \r

-  Command = ATAPI_SOFT_RESET_CMD;\r
+  Command = ATA_CMD_SOFT_RESET;\r

   IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Command, Command);\r
 \r
   //\r
   IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Command, Command);\r
 \r
   //\r


@@ -1998,7 +1998,7 @@ ParseSenseData (
   OUT SENSE_RESULT      *Result\r
   )\r
 {\r
   OUT SENSE_RESULT      *Result\r
   )\r
 {\r

-  REQUEST_SENSE_DATA      *SenseData;\r
+  ATAPI_REQUEST_SENSE_DATA      *SenseData;\r

 \r
   if (SenseCount == 0) {\r
     return EFI_INVALID_PARAMETER;\r
 \r
   if (SenseCount == 0) {\r
     return EFI_INVALID_PARAMETER;\r


@@ -2011,19 +2011,19 @@ ParseSenseData (
   *Result   = SenseOtherSense;\r
 \r
   switch (SenseData->sense_key) {\r
   *Result   = SenseOtherSense;\r
 \r
   switch (SenseData->sense_key) {\r

-  case SK_NO_SENSE:\r
+  case ATA_SK_NO_SENSE:\r

     *Result = SenseNoSenseKey;\r
     break;\r
     *Result = SenseNoSenseKey;\r
     break;\r

-  case SK_NOT_READY:\r
+  case ATA_SK_NOT_READY:\r

     switch (SenseData->addnl_sense_code) {\r
     switch (SenseData->addnl_sense_code) {\r

-    case ASC_NO_MEDIA:\r
+    case ATA_ASC_NO_MEDIA:\r

       *Result = SenseNoMedia;\r
       break;\r
       *Result = SenseNoMedia;\r
       break;\r

-    case ASC_MEDIA_UPSIDE_DOWN:\r
+    case ATA_ASC_MEDIA_UPSIDE_DOWN:\r

       *Result = SenseMediaError;\r
       break;\r
       *Result = SenseMediaError;\r
       break;\r

-    case ASC_NOT_READY:\r
-      if (SenseData->addnl_sense_code_qualifier == ASCQ_IN_PROGRESS) {\r
+    case ATA_ASC_NOT_READY:\r
+      if (SenseData->addnl_sense_code_qualifier == ATA_ASCQ_IN_PROGRESS) {\r

         *Result = SenseDeviceNotReadyNeedRetry;\r
       } else {\r
         *Result = SenseDeviceNotReadyNoRetry;\r
         *Result = SenseDeviceNotReadyNeedRetry;\r
       } else {\r
         *Result = SenseDeviceNotReadyNoRetry;\r


@@ -2031,17 +2031,17 @@ ParseSenseData (
       break;\r
     }\r
     break;\r
       break;\r
     }\r
     break;\r

-  case SK_UNIT_ATTENTION:\r
-    if (SenseData->addnl_sense_code == ASC_MEDIA_CHANGE) {\r
+  case ATA_SK_UNIT_ATTENTION:\r
+    if (SenseData->addnl_sense_code == ATA_ASC_MEDIA_CHANGE) {\r

       *Result = SenseMediaChange;\r
     }\r
     break;\r
       *Result = SenseMediaChange;\r
     }\r
     break;\r

-  case SK_MEDIUM_ERROR:\r
+  case ATA_SK_MEDIUM_ERROR:\r

     switch (SenseData->addnl_sense_code) {\r
     switch (SenseData->addnl_sense_code) {\r

-    case ASC_MEDIA_ERR1:\r
-    case ASC_MEDIA_ERR2:\r
-    case ASC_MEDIA_ERR3:\r
-    case ASC_MEDIA_ERR4:\r
+    case ATA_ASC_MEDIA_ERR1:\r
+    case ATA_ASC_MEDIA_ERR2:\r
+    case ATA_ASC_MEDIA_ERR3:\r
+    case ATA_ASC_MEDIA_ERR4:\r

       *Result = SenseMediaError;\r
       break;\r
     }\r
       *Result = SenseMediaError;\r
       break;\r
     }\r


@@ -2071,12 +2071,12 @@ AtapiReadPendingData (
   UINT16    TempWordBuffer;\r
 \r
   AltRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Alt.AltStatus);\r
   UINT16    TempWordBuffer;\r
 \r
   AltRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Alt.AltStatus);\r

-  if ((AltRegister & BSY) == BSY) {\r
+  if ((AltRegister & ATA_STSREG_BSY) == ATA_STSREG_BSY) {\r

     return EFI_NOT_READY;\r
   }\r
     return EFI_NOT_READY;\r
   }\r

-  if ((AltRegister & (BSY | DRQ)) == DRQ) {\r
+  if ((AltRegister & (ATA_STSREG_BSY | ATA_STSREG_DRQ)) == ATA_STSREG_DRQ) {\r

     TempWordBuffer = IDEReadPortB (IdeDev->PciIo,IdeDev->IoPort->Alt.AltStatus);\r
     TempWordBuffer = IDEReadPortB (IdeDev->PciIo,IdeDev->IoPort->Alt.AltStatus);\r

-    while ((TempWordBuffer & (BSY | DRQ)) == DRQ) {\r
+    while ((TempWordBuffer & (ATA_STSREG_BSY | ATA_STSREG_DRQ)) == ATA_STSREG_DRQ) {\r

       IDEReadPortWMultiple (\r
         IdeDev->PciIo,\r
         IdeDev->IoPort->Data, \r
       IDEReadPortWMultiple (\r
         IdeDev->PciIo,\r
         IdeDev->IoPort->Data, \r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ide.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ide.c
index 4b4a8ef0a355cfe798d31b2dfba5eba993bd3f28..a69c72e9e4870d717a6a51ff7561702cad2bf183 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ide.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/ide.c
@@ -315,8 +315,8 @@ GetIdeRegistersBaseAddr (
     //\r
     // The BARs should be of IO type\r
     //\r
     //\r
     // The BARs should be of IO type\r
     //\r

-    if ((PciData.Device.Bar[0] & bit0) == 0 ||\r
-        (PciData.Device.Bar[1] & bit0) == 0) {\r
+    if ((PciData.Device.Bar[0] & BIT0) == 0 ||\r
+        (PciData.Device.Bar[1] & BIT0) == 0) {\r

       return EFI_UNSUPPORTED;\r
     }\r
 \r
       return EFI_UNSUPPORTED;\r
     }\r
 \r


@@ -337,8 +337,8 @@ GetIdeRegistersBaseAddr (
     //\r
     // The BARs should be of IO type\r
     //\r
     //\r
     // The BARs should be of IO type\r
     //\r

-    if ((PciData.Device.Bar[2] & bit0) == 0 ||\r
-        (PciData.Device.Bar[3] & bit0) == 0) {\r
+    if ((PciData.Device.Bar[2] & BIT0) == 0 ||\r
+        (PciData.Device.Bar[3] & BIT0) == 0) {\r

       return EFI_UNSUPPORTED;\r
     }\r
 \r
       return EFI_UNSUPPORTED;\r
     }\r
 \r


@@ -709,8 +709,8 @@ DetectIDEController (
   // NOTE: This workaround doesn't apply to ATAPI.\r
   //\r
   if (MasterDeviceExist && SlaveDeviceExist &&\r
   // NOTE: This workaround doesn't apply to ATAPI.\r
   //\r
   if (MasterDeviceExist && SlaveDeviceExist &&\r

-      (StatusReg & DRDY) == 0               &&\r
-      (InitStatusReg & DRDY) == 0           &&\r
+      (StatusReg & ATA_STSREG_DRDY) == 0               &&\r
+      (InitStatusReg & ATA_STSREG_DRDY) == 0           &&\r

       MasterDeviceType == SlaveDeviceType   &&\r
       SlaveDeviceType != ATAPI_DEVICE_TYPE) {\r
     SlaveDeviceExist = FALSE;\r
       MasterDeviceType == SlaveDeviceType   &&\r
       SlaveDeviceType != ATAPI_DEVICE_TYPE) {\r
     SlaveDeviceExist = FALSE;\r


@@ -768,14 +768,14 @@ DRQClear (
     //\r
     // wait for BSY == 0 and DRQ == 0\r
     //\r
     //\r
     // wait for BSY == 0 and DRQ == 0\r
     //\r

-    if ((StatusRegister & (DRQ | BSY)) == 0) {\r
+    if ((StatusRegister & (ATA_STSREG_DRQ | ATA_STSREG_BSY)) == 0) {\r

       break;\r
     }\r
 \r
       break;\r
     }\r
 \r

-    if ((StatusRegister & (BSY | ERR)) == ERR) {\r
+    if ((StatusRegister & (ATA_STSREG_BSY | ATA_STSREG_ERR)) == ATA_STSREG_ERR) {\r

 \r
       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r
 \r
       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r

-      if ((ErrorRegister & ABRT_ERR) == ABRT_ERR) {\r
+      if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r

         return EFI_ABORTED;\r
       }\r
     }\r
         return EFI_ABORTED;\r
       }\r
     }\r


@@ -842,14 +842,14 @@ DRQClear2 (
     //\r
     //  wait for BSY == 0 and DRQ == 0\r
     //\r
     //\r
     //  wait for BSY == 0 and DRQ == 0\r
     //\r

-    if ((AltRegister & (DRQ | BSY)) == 0) {\r
+    if ((AltRegister & (ATA_STSREG_DRQ | ATA_STSREG_BSY)) == 0) {\r

       break;\r
     }\r
 \r
       break;\r
     }\r
 \r

-    if ((AltRegister & (BSY | ERR)) == ERR) {\r
+    if ((AltRegister & (ATA_STSREG_BSY | ATA_STSREG_ERR)) == ATA_STSREG_ERR) {\r

 \r
       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r
 \r
       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r

-      if ((ErrorRegister & ABRT_ERR) == ABRT_ERR) {\r
+      if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r

         return EFI_ABORTED;\r
       }\r
     }\r
         return EFI_ABORTED;\r
       }\r
     }\r


@@ -921,14 +921,14 @@ DRQReady (
     //\r
     //  BSY==0,DRQ==1\r
     //\r
     //\r
     //  BSY==0,DRQ==1\r
     //\r

-    if ((StatusRegister & (BSY | DRQ)) == DRQ) {\r
+    if ((StatusRegister & (ATA_STSREG_BSY | ATA_STSREG_DRQ)) == ATA_STSREG_DRQ) {\r

       break;\r
     }\r
 \r
       break;\r
     }\r
 \r

-    if ((StatusRegister & (BSY | ERR)) == ERR) {\r
+    if ((StatusRegister & (ATA_STSREG_BSY | ATA_STSREG_ERR)) == ATA_STSREG_ERR) {\r

 \r
       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r
 \r
       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r

-      if ((ErrorRegister & ABRT_ERR) == ABRT_ERR) {\r
+      if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r

         return EFI_ABORTED;\r
       }\r
     }\r
         return EFI_ABORTED;\r
       }\r
     }\r


@@ -998,14 +998,14 @@ DRQReady2 (
     //\r
     // BSY == 0 , DRQ == 1\r
     //\r
     //\r
     // BSY == 0 , DRQ == 1\r
     //\r

-    if ((AltRegister & (BSY | DRQ)) == DRQ) {\r
+    if ((AltRegister & (ATA_STSREG_BSY | ATA_STSREG_DRQ)) == ATA_STSREG_DRQ) {\r

       break;\r
     }\r
 \r
       break;\r
     }\r
 \r

-    if ((AltRegister & (BSY | ERR)) == ERR) {\r
+    if ((AltRegister & (ATA_STSREG_BSY | ATA_STSREG_ERR)) == ATA_STSREG_ERR) {\r

 \r
       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r
 \r
       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r

-      if ((ErrorRegister & ABRT_ERR) == ABRT_ERR) {\r
+      if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r

         return EFI_ABORTED;\r
       }\r
     }\r
         return EFI_ABORTED;\r
       }\r
     }\r


@@ -1064,7 +1064,7 @@ WaitForBSYClear (
   do {\r
 \r
     StatusRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Status);\r
   do {\r
 \r
     StatusRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Status);\r

-    if ((StatusRegister & BSY) == 0x00) {\r
+    if ((StatusRegister & ATA_STSREG_BSY) == 0x00) {\r

       break;\r
     }\r
 \r
       break;\r
     }\r
 \r


@@ -1124,7 +1124,7 @@ WaitForBSYClear2 (
   Delay = (UINT32) (((TimeoutInMilliSeconds * STALL_1_MILLI_SECOND) / 30) + 1);\r
   do {\r
     AltRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Alt.AltStatus);\r
   Delay = (UINT32) (((TimeoutInMilliSeconds * STALL_1_MILLI_SECOND) / 30) + 1);\r
   do {\r
     AltRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Alt.AltStatus);\r

-    if ((AltRegister & BSY) == 0x00) {\r
+    if ((AltRegister & ATA_STSREG_BSY) == 0x00) {\r

       break;\r
     }\r
 \r
       break;\r
     }\r
 \r


@@ -1188,14 +1188,14 @@ DRDYReady (
     //\r
     //  BSY == 0 , DRDY == 1\r
     //\r
     //\r
     //  BSY == 0 , DRDY == 1\r
     //\r

-    if ((StatusRegister & (DRDY | BSY)) == DRDY) {\r
+    if ((StatusRegister & (ATA_STSREG_DRDY | ATA_STSREG_BSY)) == ATA_STSREG_DRDY) {\r

       break;\r
     }\r
 \r
       break;\r
     }\r
 \r

-    if ((StatusRegister & (BSY | ERR)) == ERR) {\r
+    if ((StatusRegister & (ATA_STSREG_BSY | ATA_STSREG_ERR)) == ATA_STSREG_ERR) {\r

 \r
       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r
 \r
       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r

-      if ((ErrorRegister & ABRT_ERR) == ABRT_ERR) {\r
+      if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r

         return EFI_ABORTED;\r
       }\r
     }\r
         return EFI_ABORTED;\r
       }\r
     }\r


@@ -1259,14 +1259,14 @@ DRDYReady2 (
     //\r
     //  BSY == 0 , DRDY == 1\r
     //\r
     //\r
     //  BSY == 0 , DRDY == 1\r
     //\r

-    if ((AltRegister & (DRDY | BSY)) == DRDY) {\r
+    if ((AltRegister & (ATA_STSREG_DRDY | ATA_STSREG_BSY)) == ATA_STSREG_DRDY) {\r

       break;\r
     }\r
 \r
       break;\r
     }\r
 \r

-    if ((AltRegister & (BSY | ERR)) == ERR) {\r
+    if ((AltRegister & (ATA_STSREG_BSY | ATA_STSREG_ERR)) == ATA_STSREG_ERR) {\r

 \r
       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r
 \r
       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r

-      if ((ErrorRegister & ABRT_ERR) == ABRT_ERR) {\r
+      if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r

         return EFI_ABORTED;\r
       }\r
     }\r
         return EFI_ABORTED;\r
       }\r
     }\r


@@ -1293,7 +1293,7 @@ DRDYReady2 (
   name by sending ATA command called ATA Identify Command or ATAPI\r
   Identify Command to the specified IDE device. The module name returned\r
   is a string of ASCII characters: the first character is bit8--bit15\r
   name by sending ATA command called ATA Identify Command or ATAPI\r
   Identify Command to the specified IDE device. The module name returned\r
   is a string of ASCII characters: the first character is bit8--bit15\r

-  of the first word, the second character is bit0--bit7 of the first word\r
+  of the first word, the second character is BIT0--bit7 of the first word\r

   and so on. Thus the string can not be print directly before it is\r
   preprocessed by this func to change the order of characters in\r
   each word in the string.\r
   and so on. Thus the string can not be print directly before it is\r
   preprocessed by this func to change the order of characters in\r
   each word in the string.\r


@@ -1424,7 +1424,7 @@ SetDeviceTransferMode (
   //\r
   Status = AtaNonDataCommandIn (\r
             IdeDev,\r
   //\r
   Status = AtaNonDataCommandIn (\r
             IdeDev,\r

-            SET_FEATURES_CMD,\r
+            ATA_CMD_SET_FEATURES,\r

             DeviceSelect,\r
             0x03,\r
             SectorCount,\r
             DeviceSelect,\r
             0x03,\r
             SectorCount,\r


@@ -1507,10 +1507,10 @@ AtaNonDataCommandIn (
 \r
   //\r
   // Wait for command completion\r
 \r
   //\r
   // Wait for command completion\r

-  // For ATA_SMART_CMD, we may need more timeout to let device\r
+  // For ATAPI_SMART_CMD, we may need more timeout to let device\r

   // adjust internal states.\r
   //\r
   // adjust internal states.\r
   //\r

-  if (AtaCommand == ATA_SMART_CMD) {\r
+  if (AtaCommand == ATA_CMD_SMART) {\r

     Status = WaitForBSYClear (IdeDev, ATASMARTTIMEOUT);\r
   } else {\r
     Status = WaitForBSYClear (IdeDev, ATATIMEOUT);\r
     Status = WaitForBSYClear (IdeDev, ATASMARTTIMEOUT);\r
   } else {\r
     Status = WaitForBSYClear (IdeDev, ATATIMEOUT);\r


@@ -1520,7 +1520,7 @@ AtaNonDataCommandIn (
   }\r
 \r
   StatusRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Status);\r
   }\r
 \r
   StatusRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Status);\r

-  if ((StatusRegister & ERR) == ERR) {\r
+  if ((StatusRegister & ATA_STSREG_ERR) == ATA_STSREG_ERR) {\r

     //\r
     // Failed to execute command, abort operation\r
     //\r
     //\r
     // Failed to execute command, abort operation\r
     //\r


@@ -1639,7 +1639,7 @@ AtaNonDataCommandInExt (
   }\r
 \r
   StatusRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Status);\r
   }\r
 \r
   StatusRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Status);\r

-  if ((StatusRegister & ERR) == ERR) {\r
+  if ((StatusRegister & ATA_STSREG_ERR) == ATA_STSREG_ERR) {\r

     //\r
     // Failed to execute command, abort operation\r
     //\r
     //\r
     // Failed to execute command, abort operation\r
     //\r


@@ -1678,7 +1678,7 @@ SetDriveParameters (
   //\r
   Status = AtaNonDataCommandIn (\r
             IdeDev,\r
   //\r
   Status = AtaNonDataCommandIn (\r
             IdeDev,\r

-            INIT_DRIVE_PARAM_CMD,\r
+            ATA_CMD_INIT_DRIVE_PARAM,\r

             (UINT8) (DeviceSelect + DriveParameters->Heads),\r
             0,\r
             DriveParameters->Sector,\r
             (UINT8) (DeviceSelect + DriveParameters->Heads),\r
             0,\r
             DriveParameters->Sector,\r


@@ -1692,7 +1692,7 @@ SetDriveParameters (
   //\r
   Status = AtaNonDataCommandIn (\r
             IdeDev,\r
   //\r
   Status = AtaNonDataCommandIn (\r
             IdeDev,\r

-            SET_MULTIPLE_MODE_CMD,\r
+            ATA_CMD_SET_MULTIPLE_MODE,\r

             DeviceSelect,\r
             0,\r
             DriveParameters->MultipleSector,\r
             DeviceSelect,\r
             0,\r
             DriveParameters->MultipleSector,\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
index 6a43d9cd80e212a0ca594a3ff508e75e6eed330d..58300447524a881697c469797895b47ea2958150 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
@@ -1264,8 +1264,8 @@ IDEDiskInfoInquiry (
 \r
   IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_DISK_INFO_THIS (This);\r
 \r
 \r
   IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_DISK_INFO_THIS (This);\r
 \r

-  if (*InquiryDataSize < sizeof (INQUIRY_DATA)) {\r
-    *InquiryDataSize = sizeof (INQUIRY_DATA);\r
+  if (*InquiryDataSize < sizeof (ATAPI_INQUIRY_DATA)) {\r
+    *InquiryDataSize = sizeof (ATAPI_INQUIRY_DATA);\r

     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r


@@ -1273,8 +1273,8 @@ IDEDiskInfoInquiry (
     return EFI_NOT_FOUND;\r
   }\r
 \r
     return EFI_NOT_FOUND;\r
   }\r
 \r

-  gBS->CopyMem (InquiryData, IdeBlkIoDevice->pInquiryData, sizeof (INQUIRY_DATA));\r
-  *InquiryDataSize = sizeof (INQUIRY_DATA);\r
+  gBS->CopyMem (InquiryData, IdeBlkIoDevice->pInquiryData, sizeof (ATAPI_INQUIRY_DATA));\r
+  *InquiryDataSize = sizeof (ATAPI_INQUIRY_DATA);\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.h
index c9f11ef44c5ff53e3ac8d71e6098eeba92157472..13fa1b51309519e34dc524a0b209ca822262a36a 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.h
@@ -89,12 +89,12 @@ typedef struct {
   IDE_BASE_REGISTERS          *IoPort;\r
   UINT16                      AtapiError;\r
 \r
   IDE_BASE_REGISTERS          *IoPort;\r
   UINT16                      AtapiError;\r
 \r

-  INQUIRY_DATA                *pInquiryData;\r
+  ATAPI_INQUIRY_DATA                *pInquiryData;\r

   EFI_IDENTIFY_DATA           *pIdData;\r
   ATA_PIO_MODE                PioMode;\r
   EFI_ATA_MODE                UdmaMode;\r
   CHAR8                       ModelName[41];\r
   EFI_IDENTIFY_DATA           *pIdData;\r
   ATA_PIO_MODE                PioMode;\r
   EFI_ATA_MODE                UdmaMode;\r
   CHAR8                       ModelName[41];\r

-  REQUEST_SENSE_DATA          *SenseData;\r
+  ATAPI_REQUEST_SENSE_DATA          *SenseData;\r

   UINT8                       SenseDataNumber;\r
   UINT8                       *Cache;\r
 \r
   UINT8                       SenseDataNumber;\r
   UINT8                       *Cache;\r
 \r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idedata.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idedata.h
index 277e74fcc085f534ed2b7f62399cfba4a8772dcc..83a42af6b132d46a0d5f7db4c06ed584f8503571 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idedata.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idedata.h
@@ -15,41 +15,7 @@
 #ifndef _IDE_DATA_H\r
 #define _IDE_DATA_H\r
 \r
 #ifndef _IDE_DATA_H\r
 #define _IDE_DATA_H\r
 \r

-//\r
-// bit definition\r
-//\r
-#define bit0  (1 << 0)\r
-#define bit1  (1 << 1)\r
-#define bit2  (1 << 2)\r
-#define bit3  (1 << 3)\r
-#define bit4  (1 << 4)\r
-#define bit5  (1 << 5)\r
-#define bit6  (1 << 6)\r
-#define bit7  (1 << 7)\r
-#define bit8  (1 << 8)\r
-#define bit9  (1 << 9)\r
-#define bit10 (1 << 10)\r
-#define bit11 (1 << 11)\r
-#define bit12 (1 << 12)\r
-#define bit13 (1 << 13)\r
-#define bit14 (1 << 14)\r
-#define bit15 (1 << 15)\r
-#define bit16 (1 << 16)\r
-#define bit17 (1 << 17)\r
-#define bit18 (1 << 18)\r
-#define bit19 (1 << 19)\r
-#define bit20 (1 << 20)\r
-#define bit21 (1 << 21)\r
-#define bit22 (1 << 22)\r
-#define bit23 (1 << 23)\r
-#define bit24 (1 << 24)\r
-#define bit25 (1 << 25)\r
-#define bit26 (1 << 26)\r
-#define bit27 (1 << 27)\r
-#define bit28 (1 << 28)\r
-#define bit29 (1 << 29)\r
-#define bit30 (1 << 30)\r
-#define bit31 (1 << 31)\r
+#include <IndustryStandard/Atapi.h>\r

 \r
 //\r
 // common constants\r
 \r
 //\r
 // common constants\r


@@ -144,67 +110,19 @@ typedef struct {
 // Bit definitions in Programming Interface byte of the Class Code field\r
 // in PCI IDE controller's Configuration Space\r
 //\r
 // Bit definitions in Programming Interface byte of the Class Code field\r
 // in PCI IDE controller's Configuration Space\r
 //\r

-#define IDE_PRIMARY_OPERATING_MODE            bit0\r
-#define IDE_PRIMARY_PROGRAMMABLE_INDICATOR    bit1\r
-#define IDE_SECONDARY_OPERATING_MODE          bit2\r
-#define IDE_SECONDARY_PROGRAMMABLE_INDICATOR  bit3\r
-\r
-//\r
-// IDE registers bit definitions\r
-//\r
-\r
-//\r
-// Err Reg\r
-//\r
-#define BBK_ERR   bit7  /* Bad block detected */\r
-#define UNC_ERR   bit6  /* Uncorrectable Data */\r
-#define MC_ERR    bit5  /* Media Change */\r
-#define IDNF_ERR  bit4  /* ID Not Found */\r
-#define MCR_ERR   bit3  /* Media Change Requested */\r
-#define ABRT_ERR  bit2  /* Aborted Command */\r
-#define TK0NF_ERR bit1  /* Track 0 Not Found */\r
-#define AMNF_ERR  bit0  /* Address Mark Not Found */\r
+#define IDE_PRIMARY_OPERATING_MODE            BIT0\r
+#define IDE_PRIMARY_PROGRAMMABLE_INDICATOR    BIT1\r
+#define IDE_SECONDARY_OPERATING_MODE          BIT2\r
+#define IDE_SECONDARY_PROGRAMMABLE_INDICATOR  BIT3\r

 \r
 \r

-//\r
-// Device/Head Reg\r
-//\r
-#define LBA_MODE  bit6\r
-#define DEV       bit4\r
-#define HS3       bit3\r
-#define HS2       bit2\r
-#define HS1       bit1\r
-#define HS0       bit0\r
-#define CHS_MODE  (0)\r
-#define DRV0      (0)\r
-#define DRV1      (1)\r
-#define MST_DRV   DRV0\r
-#define SLV_DRV   DRV1\r
-\r
-//\r
-// Status Reg\r
-//\r
-#define BSY   bit7  /* Controller Busy */\r
-#define DRDY  bit6  /* Drive Ready */\r
-#define DWF   bit5  /* Drive Write Fault */\r
-#define DSC   bit4  /* Disk Seek Complete */\r
-#define DRQ   bit3  /* Data Request */\r
-#define CORR  bit2  /* Corrected Data */\r
-#define IDX   bit1  /* Index */\r
-#define ERR   bit0  /* Error */\r
-\r
-//\r
-// Device Control Reg\r
-//\r
-#define SRST  bit2  /* Software Reset */\r
-#define IEN_L bit1  /* Interrupt Enable #*/\r

 \r
 //\r
 // Bus Master Reg\r
 //\r
 \r
 //\r
 // Bus Master Reg\r
 //\r

-#define BMIC_nREAD      bit3\r
-#define BMIC_START      bit0\r
-#define BMIS_INTERRUPT  bit2\r
-#define BMIS_ERROR      bit1\r
+#define BMIC_nREAD      BIT3\r
+#define BMIC_START      BIT0\r
+#define BMIS_INTERRUPT  BIT2\r
+#define BMIS_ERROR      BIT1\r

 \r
 #define BMICP_OFFSET    0x00\r
 #define BMISP_OFFSET    0x02\r
 \r
 #define BMICP_OFFSET    0x00\r
 #define BMISP_OFFSET    0x02\r


@@ -256,205 +174,6 @@ typedef struct {
 //\r
 #define ATASMARTTIMEOUT   10000\r
 \r
 //\r
 #define ATASMARTTIMEOUT   10000\r
 \r

-//\r
-// ATA Commands Code\r
-//\r
-#define ATA_INITIALIZE_DEVICE 0x91\r
-\r
-//\r
-// Class 1\r
-//\r
-#define IDENTIFY_DRIVE_CMD          0xec\r
-#define READ_BUFFER_CMD             0xe4\r
-#define READ_SECTORS_CMD            0x20\r
-#define READ_SECTORS_WITH_RETRY_CMD 0x21\r
-#define READ_LONG_CMD               0x22\r
-#define READ_LONG_WITH_RETRY_CMD    0x23\r
-//\r
-// Class 1 - Atapi6 enhanced commands\r
-//\r
-#define READ_SECTORS_EXT_CMD  0x24\r
-\r
-//\r
-// Class 2\r
-//\r
-#define FORMAT_TRACK_CMD              0x50\r
-#define WRITE_BUFFER_CMD              0xe8\r
-#define WRITE_SECTORS_CMD             0x30\r
-#define WRITE_SECTORS_WITH_RETRY_CMD  0x31\r
-#define WRITE_LONG_CMD                0x32\r
-#define WRITE_LONG_WITH_RETRY_CMD     0x33\r
-#define WRITE_VERIFY_CMD              0x3c\r
-//\r
-// Class 2 - Atapi6 enhanced commands\r
-//\r
-#define WRITE_SECTORS_EXT_CMD 0x34\r
-\r
-//\r
-// Class 3\r
-//\r
-#define ACK_MEDIA_CHANGE_CMD        0xdb\r
-#define BOOT_POST_BOOT_CMD          0xdc\r
-#define BOOT_PRE_BOOT_CMD           0xdd\r
-#define CHECK_POWER_MODE_CMD        0x98\r
-#define CHECK_POWER_MODE_CMD_ALIAS  0xe5\r
-#define DOOR_LOCK_CMD               0xde\r
-#define DOOR_UNLOCK_CMD             0xdf\r
-#define EXEC_DRIVE_DIAG_CMD         0x90\r
-#define IDLE_CMD_ALIAS              0x97\r
-#define IDLE_CMD                    0xe3\r
-#define IDLE_IMMEDIATE_CMD          0x95\r
-#define IDLE_IMMEDIATE_CMD_ALIAS    0xe1\r
-#define INIT_DRIVE_PARAM_CMD        0x91\r
-#define RECALIBRATE_CMD             0x10  /* aliased to 1x */\r
-#define READ_DRIVE_STATE_CMD        0xe9\r
-#define SET_MULTIPLE_MODE_CMD       0xC6\r
-#define READ_DRIVE_STATE_CMD        0xe9\r
-#define READ_VERIFY_CMD             0x40\r
-#define READ_VERIFY_WITH_RETRY_CMD  0x41\r
-#define SEEK_CMD                    0x70  /* aliased to 7x */\r
-#define SET_FEATURES_CMD            0xef\r
-#define STANDBY_CMD                 0x96\r
-#define STANDBY_CMD_ALIAS           0xe2\r
-#define STANDBY_IMMEDIATE_CMD       0x94\r
-#define STANDBY_IMMEDIATE_CMD_ALIAS 0xe0\r
-\r
-//\r
-// Class 4\r
-//\r
-#define READ_DMA_CMD              0xc8\r
-#define READ_DMA_WITH_RETRY_CMD   0xc9\r
-#define READ_DMA_EXT_CMD          0x25\r
-#define WRITE_DMA_CMD             0xca\r
-#define WRITE_DMA_WITH_RETRY_CMD  0xcb\r
-#define WRITE_DMA_EXT_CMD         0x35\r
-\r
-//\r
-// Class 5\r
-//\r
-#define READ_MULTIPLE_CMD         0xc4\r
-#define REST_CMD                  0xe7\r
-#define RESTORE_DRIVE_STATE_CMD   0xea\r
-#define SET_SLEEP_MODE_CMD        0x99\r
-#define SET_SLEEP_MODE_CMD_ALIAS  0xe6\r
-#define WRITE_MULTIPLE_CMD        0xc5\r
-#define WRITE_SAME_CMD            0xe9\r
-\r
-//\r
-// Class 6 - Host protected area access feature set\r
-//\r
-#define READ_NATIVE_MAX_ADDRESS_CMD 0xf8\r
-#define SET_MAX_ADDRESS_CMD         0xf9\r
-\r
-//\r
-// Class 6 - ATA/ATAPI-6 enhanced commands\r
-//\r
-#define READ_NATIVE_MAX_ADDRESS_EXT_CMD 0x27\r
-#define SET_MAX_ADDRESS_CMD_EXT         0x37\r
-\r
-//\r
-// Class 6 - SET_MAX related sub command (in feature register)\r
-//\r
-#define PARTIES_SET_MAX_ADDRESS_SUB_CMD 0x00\r
-#define PARTIES_SET_PASSWORD_SUB_CMD    0x01\r
-#define PARTIES_LOCK_SUB_CMD            0x02\r
-#define PARTIES_UNLOCK_SUB_CMD          0x03\r
-#define PARTIES_FREEZE_SUB_CMD          0x04\r
-\r
-//\r
-// S.M.A.R.T\r
-//\r
-#define ATA_SMART_CMD               0xb0\r
-#define ATA_CONSTANT_C2             0xc2\r
-#define ATA_CONSTANT_4F             0x4f\r
-#define ATA_SMART_ENABLE_OPERATION  0xd8\r
-#define ATA_SMART_RETURN_STATUS     0xda\r
-\r
-//\r
-// Error codes for Exec Drive Diag\r
-//\r
-#define DRIV_DIAG_NO_ERROR          (0x01)\r
-#define DRIV_DIAG_FORMATTER_ERROR   (0x02)\r
-#define DRIV_DIAG_DATA_BUFFER_ERROR (0x03)\r
-#define DRIV_DIAG_ECC_CKT_ERRROR    (0x04)\r
-#define DRIV_DIAG_UP_ERROR          (0x05)\r
-#define DRIV_DIAG_SLAVE_DRV_ERROR   (0x80)  /* aliased to 0x8x */\r
-\r
-//\r
-// Codes for Format Track\r
-//\r
-#define FORMAT_GOOD_SECTOR            (0x00)\r
-#define FORMAT_SUSPEND_ALLOC          (0x01)\r
-#define FORMAT_REALLOC_SECTOR         (0x02)\r
-#define FORMAT_MARK_SECTOR_DEFECTIVE  (0x03)\r
-\r
-//\r
-// IDE_IDENTIFY bits\r
-// config bits :\r
-//\r
-#define ID_CONFIG_RESERVED0                             bit0\r
-#define ID_CONFIG_HARD_SECTORED_DRIVE                   bit1\r
-#define ID_CONFIG_SOFT_SECTORED_DRIVE                   bit2\r
-#define ID_CONFIG_NON_MFM                               bit3\r
-#define ID_CONFIG_15uS_HEAD_SWITCHING                   bit4\r
-#define ID_CONFIG_SPINDLE_MOTOR_CONTROL                 bit5\r
-#define ID_CONFIG_HARD_DRIVE                            bit6\r
-#define ID_CONFIG_CHANGEABLE_MEDIUM                     bit7\r
-#define ID_CONFIG_DATA_RATE_TO_5MHZ                     bit8\r
-#define ID_CONFIG_DATA_RATE_5_TO_10MHZ                  bit9\r
-#define ID_CONFIG_DATA_RATE_ABOVE_10MHZ                 bit10\r
-#define ID_CONFIG_MOTOR_SPEED_TOLERANCE_ABOVE_0_5_PERC  bit11\r
-#define ID_CONFIG_DATA_CLK_OFFSET_AVAIL                 bit12\r
-#define ID_CONFIG_TRACK_OFFSET_AVAIL                    bit13\r
-#define ID_CONFIG_SPEED_TOLERANCE_GAP_NECESSARY         bit14\r
-#define ID_CONFIG_RESERVED1                             bit15\r
-\r
-#define ID_DOUBLE_WORD_IO_POSSIBLE                      bit01\r
-#define ID_LBA_SUPPORTED                                bit9\r
-#define ID_DMA_SUPPORTED                                bit8\r
-\r
-#define SET_FEATURE_ENABLE_8BIT_TRANSFER                (0x01)\r
-#define SET_FEATURE_ENABLE_WRITE_CACHE                  (0x02)\r
-#define SET_FEATURE_TRANSFER_MODE                       (0x03)\r
-#define SET_FEATURE_WRITE_SAME_WRITE_SPECIFIC_AREA      (0x22)\r
-#define SET_FEATURE_DISABLE_RETRIES                     (0x33)\r
-//\r
-// for Read & Write Longs\r
-//\r
-#define SET_FEATURE_VENDOR_SPEC_ECC_LENGTH                          (0x44)\r
-#define SET_FEATURE_PLACE_NO_OF_CACHE_SEGMENTS_IN_SECTOR_NO_REG     (0x54)\r
-#define SET_FEATURE_DISABLE_READ_AHEAD                              (0x55)\r
-#define SET_FEATURE_MAINTAIN_PARAM_AFTER_RESET                      (0x66)\r
-#define SET_FEATURE_DISABLE_ECC                                     (0x77)\r
-#define SET_FEATURE_DISABLE_8BIT_TRANSFER                           (0x81)\r
-#define SET_FEATURE_DISABLE_WRITE_CACHE                             (0x82)\r
-#define SET_FEATURE_ENABLE_ECC                                      (0x88)\r
-#define SET_FEATURE_ENABLE_RETRIES                                  (0x99)\r
-#define SET_FEATURE_ENABLE_READ_AHEAD                               (0xaa)\r
-#define SET_FEATURE_SET_SECTOR_CNT_REG_AS_NO_OF_READ_AHEAD_SECTORS  (0xab)\r
-#define SET_FEATURE_ALLOW_REST_MODE                                 (0xac)\r
-//\r
-// for Read & Write Longs\r
-//\r
-#define SET_FEATURE_4BYTE_ECC                           (0xbb)\r
-#define SET_FEATURE_DEFALUT_FEATURES_ON_SOFTWARE_RESET  (0xcc)\r
-#define SET_FEATURE_WRITE_SAME_TO_WRITE_ENTIRE_MEDIUM   (0xdd)\r
-\r
-#define BLOCK_TRANSFER_MODE                             (0x00)\r
-#define SINGLE_WORD_DMA_TRANSFER_MODE                   (0x10)\r
-#define MULTI_WORD_DMA_TRANSFER_MODE                    (0x20)\r
-#define TRANSFER_MODE_MASK                              (0x07)  // 3 LSBs\r
-\r
-//\r
-// Drive 0 - Head 0\r
-//\r
-#define DEFAULT_DRIVE (0x00)\r
-#define DEFAULT_CMD   (0xa0)\r
-//\r
-// default content of device control register, disable INT\r
-//\r
-#define DEFAULT_CTL                 (0x0a)\r
-#define DEFAULT_IDE_BM_IO_BASE_ADR  (0xffa0)\r

 \r
 //\r
 // ATAPI6 related data structure definition\r
 \r
 //\r
 // ATAPI6 related data structure definition\r


@@ -465,320 +184,19 @@ typedef struct {
 //\r
 #define MAX_28BIT_ADDRESSING_CAPACITY 0xfffffff\r
 \r
 //\r
 #define MAX_28BIT_ADDRESSING_CAPACITY 0xfffffff\r
 \r

-//\r
-// Move the IDENTIFY section to DXE\Protocol\IdeControllerInit\r
-//\r
-\r
-//\r
-// ATAPI Command\r
-//\r
-#define ATAPI_SOFT_RESET_CMD      0x08\r
-#define ATAPI_PACKET_CMD          0xA0\r
-#define PACKET_CMD                0xA0\r
-#define ATAPI_IDENTIFY_DEVICE_CMD 0xA1\r
-#define ATAPI_SERVICE_CMD         0xA2\r
-\r
-//\r
-// ATAPI Packet Command\r
-//\r

 #pragma pack(1)\r
 \r
 #pragma pack(1)\r
 \r

-typedef struct {\r
-  UINT8 opcode;\r
-  UINT8 reserved_1;\r
-  UINT8 reserved_2;\r
-  UINT8 reserved_3;\r
-  UINT8 reserved_4;\r
-  UINT8 reserved_5;\r
-  UINT8 reserved_6;\r
-  UINT8 reserved_7;\r
-  UINT8 reserved_8;\r
-  UINT8 reserved_9;\r
-  UINT8 reserved_10;\r
-  UINT8 reserved_11;\r
-} TEST_UNIT_READY_CMD;\r
-\r
-typedef struct {\r
-  UINT8 opcode;\r
-  UINT8 reserved_1 : 4;\r
-  UINT8 lun : 4;\r
-  UINT8 page_code;\r
-  UINT8 reserved_3;\r
-  UINT8 allocation_length;\r
-  UINT8 reserved_5;\r
-  UINT8 reserved_6;\r
-  UINT8 reserved_7;\r
-  UINT8 reserved_8;\r
-  UINT8 reserved_9;\r
-  UINT8 reserved_10;\r
-  UINT8 reserved_11;\r
-} INQUIRY_CMD;\r
-\r
-typedef struct {\r
-  UINT8 opcode;\r
-  UINT8 reserved_1 : 4;\r
-  UINT8 lun : 4;\r
-  UINT8 reserved_2;\r
-  UINT8 reserved_3;\r
-  UINT8 allocation_length;\r
-  UINT8 reserved_5;\r
-  UINT8 reserved_6;\r
-  UINT8 reserved_7;\r
-  UINT8 reserved_8;\r
-  UINT8 reserved_9;\r
-  UINT8 reserved_10;\r
-  UINT8 reserved_11;\r
-} REQUEST_SENSE_CMD;\r
-\r
-typedef struct {\r
-  UINT8 opcode;\r
-  UINT8 reserved_1 : 4;\r
-  UINT8 lun : 4;\r
-  UINT8 page_code : 4;\r
-  UINT8 page_control : 4;\r
-  UINT8 reserved_3;\r
-  UINT8 reserved_4;\r
-  UINT8 reserved_5;\r
-  UINT8 reserved_6;\r
-  UINT8 parameter_list_length_hi;\r
-  UINT8 parameter_list_length_lo;\r
-  UINT8 reserved_9;\r
-  UINT8 reserved_10;\r
-  UINT8 reserved_11;\r
-} MODE_SENSE_CMD;\r
-\r
-typedef struct {\r
-  UINT8 opcode;\r
-  UINT8 reserved_1 : 5;\r
-  UINT8 lun : 3;\r
-  UINT8 Lba0;\r
-  UINT8 Lba1;\r
-  UINT8 Lba2;\r
-  UINT8 Lba3;\r
-  UINT8 reserved_6;\r
-  UINT8 TranLen0;\r
-  UINT8 TranLen1;\r
-  UINT8 reserved_9;\r
-  UINT8 reserved_10;\r
-  UINT8 reserved_11;\r
-} READ10_CMD;\r
-\r
-typedef struct {\r
-  UINT8 opcode;\r
-  UINT8 reserved_1;\r
-  UINT8 reserved_2;\r
-  UINT8 reserved_3;\r
-  UINT8 reserved_4;\r
-  UINT8 reserved_5;\r
-  UINT8 reserved_6;\r
-  UINT8 allocation_length_hi;\r
-  UINT8 allocation_length_lo;\r
-  UINT8 reserved_9;\r
-  UINT8 reserved_10;\r
-  UINT8 reserved_11;\r
-} READ_FORMAT_CAP_CMD;\r
-\r
-typedef union {\r
-  UINT16              Data16[6];\r
-  TEST_UNIT_READY_CMD TestUnitReady;\r
-  READ10_CMD          Read10;\r
-  REQUEST_SENSE_CMD   RequestSence;\r
-  INQUIRY_CMD         Inquiry;\r
-  MODE_SENSE_CMD      ModeSense;\r
-  READ_FORMAT_CAP_CMD ReadFormatCapacity;\r
-} ATAPI_PACKET_COMMAND;\r
-\r

 typedef struct {\r
   UINT32  RegionBaseAddr;\r
   UINT16  ByteCount;\r
   UINT16  EndOfTable;\r
 } IDE_DMA_PRD;\r
 \r
 typedef struct {\r
   UINT32  RegionBaseAddr;\r
   UINT16  ByteCount;\r
   UINT16  EndOfTable;\r
 } IDE_DMA_PRD;\r
 \r

-#define MAX_DMA_EXT_COMMAND_SECTORS 0x10000\r
-#define MAX_DMA_COMMAND_SECTORS     0x100\r
-\r

 #pragma pack()\r
 \r
 #pragma pack()\r
 \r

-//\r
-// Packet Command Code\r
-//\r
-#define TEST_UNIT_READY             0x00\r
-#define REZERO                      0x01\r
-#define REQUEST_SENSE               0x03\r
-#define FORMAT_UNIT                 0x04\r
-#define REASSIGN_BLOCKS             0x07\r
-#define INQUIRY                     0x12\r
-#define START_STOP_UNIT             0x1B\r
-#define PREVENT_ALLOW_MEDIA_REMOVAL 0x1E\r
-#define READ_FORMAT_CAPACITY        0x23\r
-#define OLD_FORMAT_UNIT             0x24\r
-#define READ_CAPACITY               0x25\r
-#define READ_10                     0x28\r
-#define WRITE_10                    0x2A\r
-#define SEEK                        0x2B\r
-#define SEND_DIAGNOSTICS            0x3D\r
-#define WRITE_VERIFY                0x2E\r
-#define VERIFY                      0x2F\r
-#define READ_DEFECT_DATA            0x37\r
-#define WRITE_BUFFER                0x38\r
-#define READ_BUFFER                 0x3C\r
-#define READ_LONG                   0x3E\r
-#define WRITE_LONG                  0x3F\r
-#define MODE_SELECT                 0x55\r
-#define MODE_SENSE                  0x5A\r
-#define READ_12                     0xA8\r
-#define WRITE_12                    0xAA\r
-#define MAX_ATAPI_BYTE_COUNT        (0xfffe)\r
-\r
-//\r
-// Sense Key\r
-//\r
-#define REQUEST_SENSE_ERROR (0x70)\r
-#define SK_NO_SENSE         (0x0)\r
-#define SK_RECOVERY_ERROR   (0x1)\r
-#define SK_NOT_READY        (0x2)\r
-#define SK_MEDIUM_ERROR     (0x3)\r
-#define SK_HARDWARE_ERROR   (0x4)\r
-#define SK_ILLEGAL_REQUEST  (0x5)\r
-#define SK_UNIT_ATTENTION   (0x6)\r
-#define SK_DATA_PROTECT     (0x7)\r
-#define SK_BLANK_CHECK      (0x8)\r
-#define SK_VENDOR_SPECIFIC  (0x9)\r
-#define SK_RESERVED_A       (0xA)\r
-#define SK_ABORT            (0xB)\r
-#define SK_RESERVED_C       (0xC)\r
-#define SK_OVERFLOW         (0xD)\r
-#define SK_MISCOMPARE       (0xE)\r
-#define SK_RESERVED_F       (0xF)\r
-\r
-//\r
-// Additional Sense Codes\r
-//\r
-#define ASC_NOT_READY                   (0x04)\r
-#define ASC_MEDIA_ERR1                  (0x10)\r
-#define ASC_MEDIA_ERR2                  (0x11)\r
-#define ASC_MEDIA_ERR3                  (0x14)\r
-#define ASC_MEDIA_ERR4                  (0x30)\r
-#define ASC_MEDIA_UPSIDE_DOWN           (0x06)\r
-#define ASC_INVALID_CMD                 (0x20)\r
-#define ASC_LBA_OUT_OF_RANGE            (0x21)\r
-#define ASC_INVALID_FIELD               (0x24)\r
-#define ASC_WRITE_PROTECTED             (0x27)\r
-#define ASC_MEDIA_CHANGE                (0x28)\r
-#define ASC_RESET                       (0x29)  /* Power On Reset or Bus Reset occurred */\r
-#define ASC_ILLEGAL_FIELD               (0x26)\r
-#define ASC_NO_MEDIA                    (0x3A)\r
-#define ASC_ILLEGAL_MODE_FOR_THIS_TRACK (0x64)\r
-\r
-//\r
-// Additional Sense Code Qualifier\r
-//\r
-#define ASCQ_IN_PROGRESS  (0x01)\r
-\r

 #define SETFEATURE        TRUE\r
 #define CLEARFEATURE      FALSE\r
 \r
 #define SETFEATURE        TRUE\r
 #define CLEARFEATURE      FALSE\r
 \r

-//\r
-//  ATAPI Data structure\r
-//\r
-#pragma pack(1)\r
-\r
-typedef struct {\r
-  UINT8 peripheral_type;\r
-  UINT8 RMB;\r
-  UINT8 version;\r
-  UINT8 response_data_format;\r
-  UINT8 addnl_length;\r
-  UINT8 reserved_5;\r
-  UINT8 reserved_6;\r
-  UINT8 reserved_7;\r
-  UINT8 vendor_info[8];\r
-  UINT8 product_id[12];\r
-  UINT8 eeprom_product_code[4];\r
-  UINT8 firmware_rev_level[4];\r
-  UINT8 firmware_sub_rev_level[1];\r
-  UINT8 reserved_37;\r
-  UINT8 reserved_38;\r
-  UINT8 reserved_39;\r
-  UINT8 max_capacity_hi;\r
-  UINT8 max_capacity_mid;\r
-  UINT8 max_capacity_lo;\r
-  UINT8 reserved_43_95[95 - 43 + 1];\r
-} INQUIRY_DATA;\r
-\r
-typedef struct {\r
-  UINT8 peripheral_type;\r
-  UINT8 RMB;\r
-  UINT8 version;\r
-  UINT8 response_data_format;\r
-  UINT8 addnl_length;\r
-  UINT8 reserved_5;\r
-  UINT8 reserved_6;\r
-  UINT8 reserved_7;\r
-  UINT8 vendor_info[8];\r
-  UINT8 product_id[16];\r
-  UINT8 product_revision_level[4];\r
-  UINT8 vendor_specific[20];\r
-  UINT8 reserved_56_95[40];\r
-} CDROM_INQUIRY_DATA;\r
-\r
-typedef struct {\r
-  UINT8 error_code : 7;\r
-  UINT8 valid : 1;\r
-  UINT8 reserved_1;\r
-  UINT8 sense_key : 4;\r
-  UINT8 reserved_21 : 1;\r
-  UINT8 ILI : 1;\r
-  UINT8 reserved_22 : 2;\r
-  UINT8 vendor_specific_3;\r
-  UINT8 vendor_specific_4;\r
-  UINT8 vendor_specific_5;\r
-  UINT8 vendor_specific_6;\r
-  UINT8 addnl_sense_length;           // n - 7\r
-  UINT8 vendor_specific_8;\r
-  UINT8 vendor_specific_9;\r
-  UINT8 vendor_specific_10;\r
-  UINT8 vendor_specific_11;\r
-  UINT8 addnl_sense_code;             // mandatory\r
-  UINT8 addnl_sense_code_qualifier;   // mandatory\r
-  UINT8 field_replaceable_unit_code;  // optional\r
-  UINT8 reserved_15;\r
-  UINT8 reserved_16;\r
-  UINT8 reserved_17;\r
-  //\r
-  // Followed by additional sense bytes     : FIXME\r
-  //\r
-} REQUEST_SENSE_DATA;\r
-\r
-typedef struct {\r
-  UINT8 LastLba3;\r
-  UINT8 LastLba2;\r
-  UINT8 LastLba1;\r
-  UINT8 LastLba0;\r
-  UINT8 BlockSize3;\r
-  UINT8 BlockSize2;\r
-  UINT8 BlockSize1;\r
-  UINT8 BlockSize0;\r
-} READ_CAPACITY_DATA;\r
-\r
-typedef struct {\r
-  UINT8 reserved_0;\r
-  UINT8 reserved_1;\r
-  UINT8 reserved_2;\r
-  UINT8 Capacity_Length;\r
-  UINT8 LastLba3;\r
-  UINT8 LastLba2;\r
-  UINT8 LastLba1;\r
-  UINT8 LastLba0;\r
-  UINT8 DesCode : 2;\r
-  UINT8 reserved_9 : 6;\r
-  UINT8 BlockSize2;\r
-  UINT8 BlockSize1;\r
-  UINT8 BlockSize0;\r
-} READ_FORMAT_CAPACITY_DATA;\r
-\r
-#pragma pack()\r
-\r

 //\r
 // PIO mode definition\r
 //\r
 //\r
 // PIO mode definition\r
 //\r


@@ -848,46 +266,46 @@ typedef struct {
 //\r
 // Slave IDE Timing Register Enable\r
 //\r
 //\r
 // Slave IDE Timing Register Enable\r
 //\r

-#define SITRE bit14\r
+#define SITRE BIT14\r

 \r
 //\r
 // DMA Timing Enable Only Select 1\r
 //\r
 \r
 //\r
 // DMA Timing Enable Only Select 1\r
 //\r

-#define DTE1  bit7\r
+#define DTE1  BIT7\r

 \r
 //\r
 // Pre-fetch and Posting Enable Select 1\r
 //\r
 \r
 //\r
 // Pre-fetch and Posting Enable Select 1\r
 //\r

-#define PPE1  bit6\r
+#define PPE1  BIT6\r

 \r
 //\r
 // IORDY Sample Point Enable Select 1\r
 //\r
 \r
 //\r
 // IORDY Sample Point Enable Select 1\r
 //\r

-#define IE1 bit5\r
+#define IE1 BIT5\r

 \r
 //\r
 // Fast Timing Bank Drive Select 1\r
 //\r
 \r
 //\r
 // Fast Timing Bank Drive Select 1\r
 //\r

-#define TIME1 bit4\r
+#define TIME1 BIT4\r

 \r
 //\r
 // DMA Timing Enable Only Select 0\r
 //\r
 \r
 //\r
 // DMA Timing Enable Only Select 0\r
 //\r

-#define DTE0  bit3\r
+#define DTE0  BIT3\r

 \r
 //\r
 // Pre-fetch and Posting Enable Select 0\r
 //\r
 \r
 //\r
 // Pre-fetch and Posting Enable Select 0\r
 //\r

-#define PPE0  bit2\r
+#define PPE0  BIT2\r

 \r
 //\r
 // IOREY Sample Point Enable Select 0\r
 //\r
 \r
 //\r
 // IOREY Sample Point Enable Select 0\r
 //\r

-#define IE0 bit1\r
+#define IE0 BIT1\r

 \r
 //\r
 // Fast Timing Bank Drive Select 0\r
 //\r
 \r
 //\r
 // Fast Timing Bank Drive Select 0\r
 //\r

-#define TIME0 bit0\r
+#define TIME0 BIT0\r

 \r
 #endif\r
 \r
 #endif\r