From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 452C581963 for ; Wed, 4 Jan 2017 18:18:07 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 04 Jan 2017 18:18:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,318,1477983600"; d="scan'208";a="1079321595" Received: from czhan46-mobl1.ccr.corp.intel.com ([10.239.192.252]) by orsmga001.jf.intel.com with ESMTP; 04 Jan 2017 18:18:05 -0800 From: "Zhang, Chao B" To: edk2-devel@lists.01.org Cc: dandan.bi@intel.com, Chao Zhang Date: Thu, 5 Jan 2017 10:18:03 +0800 Message-Id: <20170105021803.15968-1-chao.b.zhang@intel.com> X-Mailer: git-send-email 2.11.0.windows.1 Subject: [PATCH 1/2] SecuritPkg: Tcg2: Fix coding style issue X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2017 02:18:07 -0000 Fix coding style issue Cc: Bi Dandan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Chao Zhang --- 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