fix Klocwork issues

[mirror_edk2.git] / IntelFrameworkModulePkg / Bus / Pci / IdeBusDxe / Ata.c

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
index 72941e93d4691ec025e062804eb1117e4810563c..25ecedb78b1e6144c4b5c21d1eeb0487b2094c83 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
@@ -63,6 +63,9 @@ ATAIdentify (
   //  the ATA Identify command\r
   //\r
   AtaIdentifyPointer = (EFI_IDENTIFY_DATA *) AllocateZeroPool (sizeof (EFI_IDENTIFY_DATA));\r
+  if (AtaIdentifyPointer == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
 \r
   //\r
   //  use ATA PIO Data In protocol to send ATA Identify command\r
@@ -630,7 +633,7 @@ CheckErrorStatus (
 \r
   DEBUG_CODE_BEGIN ();\r
 \r
-    if (StatusRegister & ATA_STSREG_DWF) {\r
+    if ((StatusRegister & ATA_STSREG_DWF) != 0) {\r
       DEBUG (\r
         (EFI_D_BLKIO,\r
         "CheckErrorStatus()-- %02x : Error : Write Fault\n",\r
@@ -638,7 +641,7 @@ CheckErrorStatus (
         );\r
     }\r
 \r
-    if (StatusRegister & ATA_STSREG_CORR) {\r
+    if ((StatusRegister & ATA_STSREG_CORR) != 0) {\r
       DEBUG (\r
         (EFI_D_BLKIO,\r
         "CheckErrorStatus()-- %02x : Error : Corrected Data\n",\r
@@ -646,10 +649,10 @@ CheckErrorStatus (
         );\r
     }\r
 \r
-    if (StatusRegister & ATA_STSREG_ERR) {\r
+    if ((StatusRegister & ATA_STSREG_ERR) != 0) {\r
       ErrorRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Error);\r
 \r
-      if (ErrorRegister & ATA_ERRREG_BBK) {\r
+      if ((ErrorRegister & ATA_ERRREG_BBK) != 0) {\r
       DEBUG (\r
         (EFI_D_BLKIO,\r
         "CheckErrorStatus()-- %02x : Error : Bad Block Detected\n",\r
@@ -657,7 +660,7 @@ CheckErrorStatus (
         );\r
       }\r
 \r
-      if (ErrorRegister & ATA_ERRREG_UNC) {\r
+      if ((ErrorRegister & ATA_ERRREG_UNC) != 0) {\r
         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Uncorrectable Data\n",\r
@@ -665,7 +668,7 @@ CheckErrorStatus (
           );\r
       }\r
 \r
-      if (ErrorRegister & ATA_ERRREG_MC) {\r
+      if ((ErrorRegister & ATA_ERRREG_MC) != 0) {\r
         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Media Change\n",\r
@@ -673,7 +676,7 @@ CheckErrorStatus (
           );\r
       }\r
 \r
-      if (ErrorRegister & ATA_ERRREG_ABRT) {\r
+      if ((ErrorRegister & ATA_ERRREG_ABRT) != 0) {\r
         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Abort\n",\r
@@ -681,7 +684,7 @@ CheckErrorStatus (
           );\r
       }\r
 \r
-      if (ErrorRegister & ATA_ERRREG_TK0NF) {\r
+      if ((ErrorRegister & ATA_ERRREG_TK0NF) != 0) {\r
         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Track 0 Not Found\n",\r
@@ -689,7 +692,7 @@ CheckErrorStatus (
           );\r
       }\r
 \r
-      if (ErrorRegister & ATA_ERRREG_AMNF) {\r
+      if ((ErrorRegister & ATA_ERRREG_AMNF) != 0) {\r
         DEBUG (\r
           (EFI_D_BLKIO,\r
           "CheckErrorStatus()-- %02x : Error : Address Mark Not Found\n",\r
@@ -1348,7 +1351,7 @@ AtaReadSectorsExt (
   @param[in] *DataBuffer\r
   A pointer to the source buffer for the data.\r
 \r
-  @param[in] Lba\r
+  @param[in] StartLba\r
   The starting logical block address to write onto\r
   the device media.\r
 \r
@@ -1439,7 +1442,7 @@ AtaWriteSectorsExt (
   @param[in] *IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used\r
   to record all the information of the IDE device.\r
 \r
-  @param[in,out] *Buffer  buffer contained data transferred from device to host.\r
+  @param[in, out] *Buffer  buffer contained data transferred from device to host.\r
   @param[in] ByteCount    data size in byte unit of the buffer.\r
   @param[in] AtaCommand   value of the Command Register\r
   @param[in] StartLba     the start LBA of this transaction\r
@@ -1824,6 +1827,9 @@ AtaSMARTSupport (
     // Detect if this feature is enabled\r
     //\r
     TmpAtaIdentifyPointer = (EFI_IDENTIFY_DATA *) AllocateZeroPool (sizeof (EFI_IDENTIFY_DATA));\r
+    if (TmpAtaIdentifyPointer == NULL) {\r
+      return;\r
+    }\r
 \r
     DeviceSelect          = (UINT8) ((IdeDev->Device) << 4);\r
     Status = AtaPioDataIn (\r
@@ -1908,7 +1914,7 @@ AtaSMARTSupport (
   @param  LbaAddress The LBA address in 48-bit mode\r
 \r
   @retval  EFI_SUCCESS Reading succeed\r
-  @retval  EFI_DEVICE_ERROR Error executing commands on this device\r
+  @retval  EFI_DEVICE_ERROR Error executing commands on this device.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -2020,7 +2026,7 @@ AtaCommandIssueExt (
   @param  LbaAddress The LBA address in 48-bit mode\r
 \r
   @retval  EFI_SUCCESS Reading succeed\r
-  @retval  EFI_DEVICE_ERROR Error executing commands on this device\r
+  @retval  EFI_DEVICE_ERROR Error executing commands on this device.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -2493,9 +2499,9 @@ DoAtaUdma (
                         );\r
 \r
     if (UdmaOp == AtaUdmaReadExtOp || UdmaOp == AtaUdmaReadOp) {\r
-      RegisterValue |= BMIC_nREAD;\r
+      RegisterValue |= BMIC_NREAD;\r
     } else {\r
-      RegisterValue &= ~((UINT8) BMIC_nREAD);\r
+      RegisterValue &= ~((UINT8) BMIC_NREAD);\r
     }\r
 \r
     IdeDev->PciIo->Io.Write (\r
@@ -2574,8 +2580,8 @@ DoAtaUdma (
                           1,\r
                           &RegisterValue\r
                           );\r
-      if ((RegisterValue & (BMIS_INTERRUPT | BMIS_ERROR)) || (Count == 0)) {\r
-        if ((RegisterValue & BMIS_ERROR) || (Count == 0)) {\r
+      if (((RegisterValue & (BMIS_INTERRUPT | BMIS_ERROR)) != 0) || (Count == 0)) {\r
+        if (((RegisterValue & BMIS_ERROR) != 0) || (Count == 0)) {\r
                  Status = EFI_DEVICE_ERROR;\r
                  break;\r
         }\r
@@ -2637,7 +2643,7 @@ DoAtaUdma (
                         &RegisterValue\r
                         );\r
 \r
-    if (RegisterValue & BMIS_ERROR) {\r
+    if ((RegisterValue & BMIS_ERROR) != 0) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
 \r