public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Zhang, Chao B" <chao.b.zhang@intel.com>
To: edk2-devel@lists.01.org
Cc: dandan.bi@intel.com, Chao Zhang <chao.b.zhang@intel.com>
Subject: [PATCH 1/2] SecuritPkg: Tcg2: Fix coding style issue
Date: Thu,  5 Jan 2017 10:18:03 +0800	[thread overview]
Message-ID: <20170105021803.15968-1-chao.b.zhang@intel.com> (raw)

Fix coding style issue

Cc: Bi Dandan <dandan.bi@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
---
 SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c | 14 +++++++-------
 SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c           | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
index 3e34155..1317dca 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
+++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
@@ -381,7 +381,7 @@ Tcg2RouteConfig (
 /**
   Get HID string of TPM2 ACPI device object
 
-  @param[in]  HID               Points to HID String Buffer.
+  @param[in]  Hid               Points to HID String Buffer.
   @param[in]  Size              HID String size in bytes. Must >= TPM_HID_ACPI_SIZE
 
   @return                       HID String get status.
@@ -389,7 +389,7 @@ Tcg2RouteConfig (
 **/
 EFI_STATUS
 GetTpm2HID(
-   CHAR8 *HID,
+   CHAR8 *Hid,
    UINTN  Size
   )
 {
@@ -401,7 +401,7 @@ GetTpm2HID(
 
   PnpHID = TRUE;
 
-  ZeroMem(HID, Size);
+  ZeroMem(Hid, Size);
 
   //
   // Get Manufacturer ID
@@ -418,13 +418,13 @@ GetTpm2HID(
       //  HID containing PNP ID "NNN####"
       //   NNN is uppercase letter for Vendor ID specified by manufacturer
       //
-      CopyMem(HID, &ManufacturerID, 3);
+      CopyMem(Hid, &ManufacturerID, 3);
     } else {
       //
       //  HID containing ACP ID "NNNN####"
       //   NNNN is uppercase letter for Vendor ID specified by manufacturer
       //
-      CopyMem(HID, &ManufacturerID, 4);
+      CopyMem(Hid, &ManufacturerID, 4);
       PnpHID = FALSE;
     }
   } else {
@@ -441,9 +441,9 @@ GetTpm2HID(
     //   #### is Firmware Version 1
     //
     if (PnpHID) {
-      AsciiSPrint(HID + 3, TPM_HID_PNP_SIZE - 3, "%02d%02d", ((FirmwareVersion1 & 0xFFFF0000) >> 16), (FirmwareVersion1 && 0x0000FFFF));
+      AsciiSPrint(Hid + 3, TPM_HID_PNP_SIZE - 3, "%02d%02d", ((FirmwareVersion1 & 0xFFFF0000) >> 16), (FirmwareVersion1 && 0x0000FFFF));
     } else {
-      AsciiSPrint(HID + 4, TPM_HID_ACPI_SIZE - 4, "%02d%02d", ((FirmwareVersion1 & 0xFFFF0000) >> 16), (FirmwareVersion1 && 0x0000FFFF));
+      AsciiSPrint(Hid + 4, TPM_HID_ACPI_SIZE - 4, "%02d%02d", ((FirmwareVersion1 & 0xFFFF0000) >> 16), (FirmwareVersion1 && 0x0000FFFF));
     }
 
   } else {
diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
index 968f327..3ca6958 100644
--- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
+++ b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
@@ -317,7 +317,7 @@ UpdateHID (
 {
   EFI_STATUS  Status;
   UINT8       *DataPtr;
-  CHAR8       HID[TPM_HID_ACPI_SIZE];
+  CHAR8       Hid[TPM_HID_ACPI_SIZE];
   UINT32      ManufacturerID;
   UINT32      FirmwareVersion1;
   UINT32      FirmwareVersion2;
@@ -328,7 +328,7 @@ UpdateHID (
   //
   // Initialize HID with Default PNP string
   //
-  ZeroMem(HID, TPM_HID_ACPI_SIZE);
+  ZeroMem(Hid, TPM_HID_ACPI_SIZE);
 
   //
   // Get Manufacturer ID
@@ -345,13 +345,13 @@ UpdateHID (
       //  HID containing PNP ID "NNN####"
       //   NNN is uppercase letter for Vendor ID specified by manufacturer
       //
-      CopyMem(HID, &ManufacturerID, 3);
+      CopyMem(Hid, &ManufacturerID, 3);
     } else {
       //
       //  HID containing ACP ID "NNNN####"
       //   NNNN is uppercase letter for Vendor ID specified by manufacturer
       //
-      CopyMem(HID, &ManufacturerID, 4);
+      CopyMem(Hid, &ManufacturerID, 4);
       PnpHID = FALSE;
     }
   } else {
@@ -368,9 +368,9 @@ UpdateHID (
     //   #### is Firmware Version 1
     //
     if (PnpHID) {
-      AsciiSPrint(HID + 3, TPM_HID_PNP_SIZE - 3, "%02d%02d", ((FirmwareVersion1 & 0xFFFF0000) >> 16), (FirmwareVersion1 && 0x0000FFFF));
+      AsciiSPrint(Hid + 3, TPM_HID_PNP_SIZE - 3, "%02d%02d", ((FirmwareVersion1 & 0xFFFF0000) >> 16), (FirmwareVersion1 && 0x0000FFFF));
     } else {
-      AsciiSPrint(HID + 4, TPM_HID_ACPI_SIZE - 4, "%02d%02d", ((FirmwareVersion1 & 0xFFFF0000) >> 16), (FirmwareVersion1 && 0x0000FFFF));
+      AsciiSPrint(Hid + 4, TPM_HID_ACPI_SIZE - 4, "%02d%02d", ((FirmwareVersion1 & 0xFFFF0000) >> 16), (FirmwareVersion1 && 0x0000FFFF));
     }
     
   } else {
@@ -387,14 +387,14 @@ UpdateHID (
        DataPtr += 1) {
     if (AsciiStrCmp((CHAR8 *)DataPtr,  TPM_HID_TAG) == 0) {
       if (PnpHID) {
-        CopyMem(DataPtr, HID, TPM_HID_PNP_SIZE);
+        CopyMem(DataPtr, Hid, TPM_HID_PNP_SIZE);
         //
         // if HID is PNP ID, patch the last byte in HID TAG to Noop
         //
         *(DataPtr + TPM_HID_PNP_SIZE) = AML_NOOP_OP;
       } else {
 
-        CopyMem(DataPtr, HID, TPM_HID_ACPI_SIZE);
+        CopyMem(DataPtr, Hid, TPM_HID_ACPI_SIZE);
       }
       DEBUG((DEBUG_INFO, "TPM2 ACPI _HID is patched to %a\n", DataPtr));
 
-- 
1.9.5.msysgit.1



             reply	other threads:[~2017-01-05  2:18 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-05  2:18 Zhang, Chao B [this message]
2017-01-05  2:44 ` [PATCH 1/2] SecuritPkg: Tcg2: Fix coding style issue Bi, Dandan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170105021803.15968-1-chao.b.zhang@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox