Code scrub for IdeBusDxe driver and PeiS3Lib.(undergoing)

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

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
index f4e2e5d6d7b27494e7f86251d445de41168f3b1e..87d466f9d07c8340952c8a446951e00113b8251b 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
@@ -96,7 +96,7 @@ ATAIdentify (
     //\r
     if (!EFI_ERROR (Status)) {\r
 \r
-      IdeDev->pIdData = AtaIdentifyPointer;\r
+      IdeDev->IdData = AtaIdentifyPointer;\r
 \r
       //\r
       // Print ATA Module Name\r
@@ -173,7 +173,7 @@ ATAIdentify (
   //\r
   // Make sure the pIdData will not be freed again.\r
   //\r
-  IdeDev->pIdData = NULL;\r
+  IdeDev->IdData = NULL;\r
 \r
   return EFI_DEVICE_ERROR;\r
 }\r
@@ -212,11 +212,11 @@ AtaAtapi6Identify (
   EFI_LBA           Capacity;\r
   EFI_IDENTIFY_DATA *Atapi6IdentifyStruct;\r
 \r
-  if (IdeDev->pIdData == NULL) {\r
+  if (IdeDev->IdData == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Atapi6IdentifyStruct = IdeDev->pIdData;\r
+  Atapi6IdentifyStruct = IdeDev->IdData;\r
 \r
   if ((Atapi6IdentifyStruct->AtapiData.cmd_set_support_83 & (BIT15 | BIT14)) != 0x4000) {\r
     //\r
@@ -282,11 +282,11 @@ PrintAtaModuleName (
   IN  IDE_BLK_IO_DEV  *IdeDev\r
   )\r
 {\r
-  if (IdeDev->pIdData == NULL) {\r
+  if (IdeDev->IdData == NULL) {\r
     return ;\r
   }\r
 \r
-  SwapStringChars (IdeDev->ModelName, IdeDev->pIdData->AtaData.ModelName, 40);\r
+  SwapStringChars (IdeDev->ModelName, IdeDev->IdData->AtaData.ModelName, 40);\r
   IdeDev->ModelName[40] = 0x00;\r
 }\r
 \r
@@ -1779,13 +1779,13 @@ AtaSMARTSupport (
   //\r
   // Detect if the device supports S.M.A.R.T.\r
   //\r
-  if ((IdeDev->pIdData->AtaData.command_set_supported_83 & 0xc000) != 0x4000) {\r
+  if ((IdeDev->IdData->AtaData.command_set_supported_83 & 0xc000) != 0x4000) {\r
     //\r
     // Data in word 82 is not valid (bit15 shall be zero and bit14 shall be to one)\r
     //\r
     return ;\r
   } else {\r
-    if ((IdeDev->pIdData->AtaData.command_set_supported_82 & 0x0001) != 0x0001) {\r
+    if ((IdeDev->IdData->AtaData.command_set_supported_82 & 0x0001) != 0x0001) {\r
       //\r
       // S.M.A.R.T is not supported by the device\r
       //\r
@@ -1921,12 +1921,12 @@ AtaEnableLongPhysicalSector (
   EFI_ATA_IDENTIFY_DATA  *AtaIdentifyData;\r
   UINT16                 PhyLogicSectorSupport;\r
 \r
-  ASSERT (IdeDev->pIdData != NULL);\r
+  ASSERT (IdeDev->IdData != NULL);\r
   //\r
   // Only valid for ATA device\r
   //\r
-  AtaIdentifyData       = (EFI_ATA_IDENTIFY_DATA *) &IdeDev->pIdData->AtaData;\r
-  if (AtaIdentifyData->config & 0x8000) {\r
+  AtaIdentifyData       = (EFI_ATA_IDENTIFY_DATA *) &IdeDev->IdData->AtaData;\r
+  if ((AtaIdentifyData->config & 0x8000) != 0) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   PhyLogicSectorSupport = AtaIdentifyData->phy_logic_sector_support;\r
@@ -1939,7 +1939,7 @@ AtaEnableLongPhysicalSector (
     //\r
     // Check whether one physical block contains multiple physical blocks\r
     //\r
-    if (PhyLogicSectorSupport & 0x2000) {\r
+    if ((PhyLogicSectorSupport & 0x2000) != 0) {\r
       IdeDev->BlkIo.Media->LogicalBlocksPerPhysicalBlock =\r
         (UINT32) (1 << (PhyLogicSectorSupport & 0x000f));\r
       //\r
@@ -1954,7 +1954,7 @@ AtaEnableLongPhysicalSector (
     // Check logical block size\r
     //\r
     IdeDev->BlkIo.Media->BlockSize = 0x200;\r
-    if (PhyLogicSectorSupport & 0x1000) {\r
+    if ((PhyLogicSectorSupport & 0x1000) != 0) {\r
       IdeDev->BlkIo.Media->BlockSize = (UINT32) (\r
         ((AtaIdentifyData->logic_sector_size_hi << 16) |\r
          AtaIdentifyData->logic_sector_size_lo) * sizeof (UINT16)\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c
index 1f989e72f67dd239865f88942ff3a911fe8ed662..b53f20ee820465ac0f5b963ae7f51ce0033a73a0 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Atapi.c
@@ -259,7 +259,7 @@ ATAPIIdentify (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  IdeDev->pIdData = AtapiIdentifyPointer;\r
+  IdeDev->IdData = AtapiIdentifyPointer;\r
   PrintAtaModuleName (IdeDev);\r
 \r
   //\r
@@ -267,22 +267,22 @@ ATAPIIdentify (
   //\r
   Status = AtapiInquiry (IdeDev);\r
   if (EFI_ERROR (Status)) {\r
-    gBS->FreePool (IdeDev->pIdData);\r
+    gBS->FreePool (IdeDev->IdData);\r
     //\r
     // Make sure the pIdData will not be freed again.\r
     //\r
-    IdeDev->pIdData = NULL;\r
+    IdeDev->IdData = NULL;\r
     return EFI_DEVICE_ERROR;\r
   }\r
   //\r
   // Get media removable info from INQUIRY data.\r
   //\r
-  IdeDev->BlkIo.Media->RemovableMedia = (UINT8) ((IdeDev->pInquiryData->RMB & 0x80) == 0x80);\r
+  IdeDev->BlkIo.Media->RemovableMedia = (UINT8) ((IdeDev->InquiryData->RMB & 0x80) == 0x80);\r
 \r
   //\r
   // Identify device type via INQUIRY data.\r
   //\r
-  switch (IdeDev->pInquiryData->peripheral_type & 0x1f) {\r
+  switch (IdeDev->InquiryData->peripheral_type & 0x1f) {\r
 \r
   //\r
   // Magnetic Disk\r
@@ -338,13 +338,13 @@ ATAPIIdentify (
 \r
   default:\r
     IdeDev->Type = IdeUnknown;\r
-    gBS->FreePool (IdeDev->pIdData);\r
-    gBS->FreePool (IdeDev->pInquiryData);\r
+    gBS->FreePool (IdeDev->IdData);\r
+    gBS->FreePool (IdeDev->InquiryData);\r
     //\r
     // Make sure the pIdData and pInquiryData will not be freed again.\r
     //\r
-    IdeDev->pIdData       = NULL;\r
-    IdeDev->pInquiryData  = NULL;\r
+    IdeDev->IdData       = NULL;\r
+    IdeDev->InquiryData  = NULL;\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -355,13 +355,13 @@ ATAPIIdentify (
 \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
+    gBS->FreePool (IdeDev->IdData);\r
+    gBS->FreePool (IdeDev->InquiryData);\r
     //\r
     // Make sure the pIdData and pInquiryData will not be freed again.\r
     //\r
-    IdeDev->pIdData       = NULL;\r
-    IdeDev->pInquiryData  = NULL;\r
+    IdeDev->IdData       = NULL;\r
+    IdeDev->InquiryData  = NULL;\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
@@ -423,7 +423,7 @@ AtapiInquiry (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  IdeDev->pInquiryData = InquiryData;\r
+  IdeDev->InquiryData = InquiryData;\r
 \r
   return EFI_SUCCESS;\r
 }\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.c
index ed02b38dcfa28ccd228a5c60f897de12338915df..96f1ce3bd8fe2c51a377cdf9f60d6968d1aebb54 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.c
@@ -1368,14 +1368,14 @@ ReleaseIdeResources (
     IdeBlkIoDevice->Cache = NULL;\r
   }\r
 \r
-  if (IdeBlkIoDevice->pIdData != NULL) {\r
-    gBS->FreePool (IdeBlkIoDevice->pIdData);\r
-    IdeBlkIoDevice->pIdData = NULL;\r
+  if (IdeBlkIoDevice->IdData != NULL) {\r
+    gBS->FreePool (IdeBlkIoDevice->IdData);\r
+    IdeBlkIoDevice->IdData = NULL;\r
   }\r
 \r
-  if (IdeBlkIoDevice->pInquiryData != NULL) {\r
-    gBS->FreePool (IdeBlkIoDevice->pInquiryData);\r
-    IdeBlkIoDevice->pInquiryData = NULL;\r
+  if (IdeBlkIoDevice->InquiryData != NULL) {\r
+    gBS->FreePool (IdeBlkIoDevice->InquiryData);\r
+    IdeBlkIoDevice->InquiryData = NULL;\r
   }\r
 \r
   if (IdeBlkIoDevice->ControllerNameTable != NULL) {\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h
index bb2a4a75c3f536fb95ea4b048a1b684227ad287c..bacae8a6cb9b45d105457782abeabbbb17fc9079 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h
@@ -506,7 +506,7 @@ AtaSoftReset (
 \r
   @param  IdeBlkIoDevice TODO: add argument description\r
   @param  MediaId TODO: add argument description\r
-  @param  LBA TODO: add argument description\r
+  @param  Lba TODO: add argument description\r
   @param  BufferSize TODO: add argument description\r
   @param  Buffer TODO: add argument description\r
 \r
@@ -517,7 +517,7 @@ EFI_STATUS
 AtaBlkIoReadBlocks (\r
   IN IDE_BLK_IO_DEV   *IdeBlkIoDevice,\r
   IN UINT32           MediaId,\r
-  IN EFI_LBA          LBA,\r
+  IN EFI_LBA          Lba,\r
   IN UINTN            BufferSize,\r
   OUT VOID            *Buffer\r
   );\r
@@ -527,7 +527,7 @@ AtaBlkIoReadBlocks (
 \r
   @param  IdeBlkIoDevice TODO: add argument description\r
   @param  MediaId TODO: add argument description\r
-  @param  LBA TODO: add argument description\r
+  @param  Lba TODO: add argument description\r
   @param  BufferSize TODO: add argument description\r
   @param  Buffer TODO: add argument description\r
 \r
@@ -538,7 +538,7 @@ EFI_STATUS
 AtaBlkIoWriteBlocks (\r
   IN IDE_BLK_IO_DEV   *IdeBlkIoDevice,\r
   IN UINT32           MediaId,\r
-  IN EFI_LBA          LBA,\r
+  IN EFI_LBA          Lba,\r
   IN UINTN            BufferSize,\r
   OUT VOID            *Buffer\r
   );\r
@@ -751,7 +751,7 @@ AtapiSoftReset (
 \r
   @param  IdeBlkIoDevice TODO: add argument description\r
   @param  MediaId TODO: add argument description\r
-  @param  LBA TODO: add argument description\r
+  @param  Lba TODO: add argument description\r
   @param  BufferSize TODO: add argument description\r
   @param  Buffer TODO: add argument description\r
 \r
@@ -762,7 +762,7 @@ EFI_STATUS
 AtapiBlkIoReadBlocks (\r
   IN IDE_BLK_IO_DEV   *IdeBlkIoDevice,\r
   IN UINT32           MediaId,\r
-  IN EFI_LBA          LBA,\r
+  IN EFI_LBA          Lba,\r
   IN UINTN            BufferSize,\r
   OUT VOID            *Buffer\r
   );\r
@@ -772,7 +772,7 @@ AtapiBlkIoReadBlocks (
 \r
   @param  IdeBlkIoDevice TODO: add argument description\r
   @param  MediaId TODO: add argument description\r
-  @param  LBA TODO: add argument description\r
+  @param  Lba TODO: add argument description\r
   @param  BufferSize TODO: add argument description\r
   @param  Buffer TODO: add argument description\r
 \r
@@ -783,7 +783,7 @@ EFI_STATUS
 AtapiBlkIoWriteBlocks (\r
   IN IDE_BLK_IO_DEV   *IdeBlkIoDevice,\r
   IN UINT32           MediaId,\r
-  IN EFI_LBA          LBA,\r
+  IN EFI_LBA          Lba,\r
   IN UINTN            BufferSize,\r
   OUT VOID            *Buffer\r
   );\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c
index b09bb8a53f3fcb6d1cbb32b82a448d6320c77688..9c7d6e20637fb7bb9e986e8c8538e95dd14c4e64 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c
@@ -413,7 +413,7 @@ IDEBusDriverBindingStart (
     }\r
 \r
     EndIdeDevice = (UINT8) MIN ((MaxDevices - 1), EndIdeDevice);\r
-\r
+    ASSERT (EndIdeDevice < IdeMaxDevice);\r
     //\r
     // Now inform the IDE Controller Init Module. Sept10\r
     //\r
@@ -556,7 +556,7 @@ IDEBusDriverBindingStart (
         //\r
         // Submit identify data to IDE controller init driver\r
         //\r
-        CopyMem (&IdentifyData, IdeBlkIoDevicePtr->pIdData, sizeof (IdentifyData));\r
+        CopyMem (&IdentifyData, IdeBlkIoDevicePtr->IdData, sizeof (IdentifyData));\r
         IdeBusDriverPrivateData->DeviceFound[IdeChannel * 2 + IdeDevice] = TRUE;\r
         IdeInit->SubmitData (IdeInit, IdeChannel, IdeDevice, &IdentifyData);\r
       } else {\r
@@ -611,7 +611,7 @@ IDEBusDriverBindingStart (
       //\r
       // Set best supported PIO mode on this IDE device\r
       //\r
-      if (SupportedModes->PioMode.Mode <= ATA_PIO_MODE_2) {\r
+      if (SupportedModes->PioMode.Mode <= AtaPioMode2) {\r
         TransferMode.ModeCategory = ATA_MODE_CATEGORY_DEFAULT_PIO;\r
       } else {\r
         TransferMode.ModeCategory = ATA_MODE_CATEGORY_FLOW_PIO;\r
@@ -672,9 +672,9 @@ IDEBusDriverBindingStart (
       //\r
       // Init driver parameters\r
       //\r
-      DriveParameters.Sector          = (UINT8) IdeBlkIoDevicePtr->pIdData->AtaData.sectors_per_track;\r
-      DriveParameters.Heads           = (UINT8) (IdeBlkIoDevicePtr->pIdData->AtaData.heads - 1);\r
-      DriveParameters.MultipleSector  = (UINT8) IdeBlkIoDevicePtr->pIdData->AtaData.multi_sector_cmd_max_sct_cnt;\r
+      DriveParameters.Sector          = (UINT8) IdeBlkIoDevicePtr->IdData->AtaData.sectors_per_track;\r
+      DriveParameters.Heads           = (UINT8) (IdeBlkIoDevicePtr->IdData->AtaData.heads - 1);\r
+      DriveParameters.MultipleSector  = (UINT8) IdeBlkIoDevicePtr->IdData->AtaData.multi_sector_cmd_max_sct_cnt;\r
       //\r
       // Set Parameters for the device:\r
       // 1) Init\r
@@ -1307,11 +1307,11 @@ IDEDiskInfoInquiry (
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r
-  if (IdeBlkIoDevice->pInquiryData == NULL) {\r
+  if (IdeBlkIoDevice->InquiryData == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  gBS->CopyMem (InquiryData, IdeBlkIoDevice->pInquiryData, sizeof (ATAPI_INQUIRY_DATA));\r
+  gBS->CopyMem (InquiryData, IdeBlkIoDevice->InquiryData, sizeof (ATAPI_INQUIRY_DATA));\r
   *InquiryDataSize = sizeof (ATAPI_INQUIRY_DATA);\r
 \r
   return EFI_SUCCESS;\r
@@ -1348,11 +1348,11 @@ IDEDiskInfoIdentify (
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r
-  if (IdeBlkIoDevice->pIdData == NULL) {\r
+  if (IdeBlkIoDevice->IdData == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  gBS->CopyMem (IdentifyData, IdeBlkIoDevice->pIdData, sizeof (EFI_IDENTIFY_DATA));\r
+  gBS->CopyMem (IdentifyData, IdeBlkIoDevice->IdData, sizeof (EFI_IDENTIFY_DATA));\r
   *IdentifyDataSize = sizeof (EFI_IDENTIFY_DATA);\r
 \r
   return EFI_SUCCESS;\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
index 1c5b559bd802e34fcfda5f94787b7160c5cbe5e3..092b219503c5a273cf86afc3ba8d053e5f5a76d4 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
@@ -95,8 +95,8 @@ typedef struct {
   IDE_BASE_REGISTERS          *IoPort;\r
   UINT16                      AtapiError;\r
 \r
-  ATAPI_INQUIRY_DATA                *pInquiryData;\r
-  EFI_IDENTIFY_DATA           *pIdData;\r
+  ATAPI_INQUIRY_DATA                *InquiryData;\r
+  EFI_IDENTIFY_DATA           *IdData;\r
   ATA_PIO_MODE                PioMode;\r
   EFI_ATA_MODE                UdmaMode;\r
   CHAR8                       ModelName[41];\r
@@ -315,7 +315,7 @@ IDEBlkIoReset (
 \r
   @param  This TODO: add argument description\r
   @param  MediaId TODO: add argument description\r
-  @param  LBA TODO: add argument description\r
+  @param  Lba TODO: add argument description\r
   @param  BufferSize TODO: add argument description\r
   @param  Buffer TODO: add argument description\r
 \r
@@ -327,7 +327,7 @@ EFIAPI
 IDEBlkIoReadBlocks (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *This,\r
   IN  UINT32                      MediaId,\r
-  IN  EFI_LBA                     LBA,\r
+  IN  EFI_LBA                     Lba,\r
   IN  UINTN                       BufferSize,\r
   OUT VOID                        *Buffer\r
   );\r
@@ -337,7 +337,7 @@ IDEBlkIoReadBlocks (
 \r
   @param  This TODO: add argument description\r
   @param  MediaId TODO: add argument description\r
-  @param  LBA TODO: add argument description\r
+  @param  Lba TODO: add argument description\r
   @param  BufferSize TODO: add argument description\r
   @param  Buffer TODO: add argument description\r
 \r
@@ -349,7 +349,7 @@ EFIAPI
 IDEBlkIoWriteBlocks (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *This,\r
   IN  UINT32                      MediaId,\r
-  IN  EFI_LBA                     LBA,\r
+  IN  EFI_LBA                     Lba,\r
   IN  UINTN                       BufferSize,\r
   IN  VOID                        *Buffer\r
   );\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
index 7071a1e14389fd423225386d6949f6cfc5b47208..7052d3f949c4e8358c1851b0787a1ba92b85c982 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
@@ -52,7 +52,6 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
-  MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec  \r
 \r
@@ -72,15 +71,15 @@
 \r
 \r
 [Guids]\r
-  gEfiDiskInfoIdeInterfaceGuid                  # SOMETIMES_CONSUMED\r
-  gEfiEventExitBootServicesGuid\r
+  gEfiDiskInfoIdeInterfaceGuid                  # CONSUMES  ## GUID\r
+  gEfiEventExitBootServicesGuid                 # CONSUMES  ## Event\r
 \r
 \r
 [Protocols]\r
-  gEfiDiskInfoProtocolGuid                      # PROTOCOL BY_START\r
-  gEfiBlockIoProtocolGuid                       # PROTOCOL BY_START\r
-  gEfiIdeControllerInitProtocolGuid             # PROTOCOL TO_START\r
-  gEfiPciIoProtocolGuid                         # PROTOCOL TO_START\r
-  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
+  gEfiDiskInfoProtocolGuid                      # BY_START\r
+  gEfiBlockIoProtocolGuid                       # BY_START\r
+  gEfiIdeControllerInitProtocolGuid             # TO_START\r
+  gEfiPciIoProtocolGuid                         # TO_START\r
+  gEfiDevicePathProtocolGuid                    # TO_START\r
 \r
 \r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeData.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeData.h
index 47385c71a4bb9e6fa5c9d682fc858f8e7e8eb471..1baf46b6d6addc98e69b70a17e7b1cc0a00acc4b 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeData.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeData.h
@@ -197,35 +197,35 @@ typedef struct {
 #define SETFEATURE        TRUE\r
 #define CLEARFEATURE      FALSE\r
 \r
-//\r
-// PIO mode definition\r
-//\r
-typedef enum {\r
-  ATA_PIO_MODE_BELOW_2,\r
-  ATA_PIO_MODE_2,\r
-  ATA_PIO_MODE_3,\r
-  ATA_PIO_MODE_4\r
+///\r
+/// PIO mode definition\r
+///\r
+typedef enum _ATA_PIO_MODE_ {\r
+  AtaPioModeBelow2,\r
+  AtaPioMode2,\r
+  AtaPioMode3,\r
+  AtaPioMode4\r
 } ATA_PIO_MODE;\r
 \r
 //\r
 // Multi word DMA definition\r
 //\r
-typedef enum {\r
-  ATA_MDMA_MODE_0,\r
-  ATA_MDMA_MODE_1,\r
-  ATA_MDMA_MODE_2\r
+typedef enum _ATA_MDMA_MODE_ {\r
+  AtaMdmaMode0,\r
+  AtaMdmaMode1,\r
+  AtaMdmaMode2\r
 } ATA_MDMA_MODE;\r
 \r
 //\r
 // UDMA mode definition\r
 //\r
-typedef enum {\r
-  ATA_UDMA_MODE_0,\r
-  ATA_UDMA_MODE_1,\r
-  ATA_UDMA_MODE_2,\r
-  ATA_UDMA_MODE_3,\r
-  ATA_UDMA_MODE_4,\r
-  ATA_UDMA_MODE_5\r
+typedef enum _ATA_UDMA_MODE_ {\r
+  AtaUdmaMode0,\r
+  AtaUdmaMode1,\r
+  AtaUdmaMode2,\r
+  AtaUdmaMode3,\r
+  AtaUdmaMode4,\r
+  AtaUdmaMode5\r
 } ATA_UDMA_MODE;\r
 \r
 #define ATA_MODE_CATEGORY_DEFAULT_PIO 0x00\r

diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
index 1d7907ef7f780a02ad616af7bc786fde27a1843a..e4088694be1fe2eb83f9efd8a7a0c5386427844b 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
+++ b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
@@ -1,5 +1,6 @@
 /**@file\r
-  S3 Library. This library class defines a set of methods related do S3 mode\r
+  This library provides API to invoke the S3 resume vector in the APCI Table in S3 resume mode. \r
+  This library instance is only for PEI phase use and the APIs in this instance\r
 \r
 Copyright (c) 2006 - 2008 Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r

diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
index e4851a48d84e7e37bd7e00a5f8f200c99dc22476..76fb867aca2b9f0c453e1f3da9c3a7d8e5da488a 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
+++ b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf
@@ -1,7 +1,8 @@
 #/** @file\r
-#  Graphics Library for UEFI drivers\r
 #\r
-#  This library provides supports for basic graphic functions.\r
+#  This library provides API to invoke the S3 resume vector in the APCI Table in S3 resume mode. \r
+#  This library instance is only for PEI phase use and the APIs in this instance\r
+#\r
 #  Copyright (c) 2006 - 2009, Intel Corporation.\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
@@ -39,11 +40,10 @@
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
 \r
 [LibraryClasses]\r
-  BaseLib\r
   PeiServicesTablePointerLib\r
   DebugLib\r
 \r
 [Ppis]\r
-  gEfiPeiS3ResumePpiGuid                # PPI ALWAYS_CONSUMED\r
+  gEfiPeiS3ResumePpiGuid                # ALWAYS_CONSUMES\r
 \r
 \r