diff options
| author | Zhang, Chao B <chao.b.zhang@intel.com> | 2017-01-05 10:11:07 +0800 |
|---|---|---|
| committer | Zhang, Chao B <chao.b.zhang@intel.com> | 2017-01-05 10:47:03 +0800 |
| commit | 3304abc101a19735c29d8b48a270576e72e7049e (patch) | |
| tree | 65c6584453f5f0a153158ea83ed66c780b0a43bd /SecurityPkg/Tcg | |
| parent | a6e0e994d0e855f7f65f6fb7e113f061e0b9a242 (diff) | |
| download | edk2-3304abc101a19735c29d8b48a270576e72e7049e.tar.gz edk2-3304abc101a19735c29d8b48a270576e72e7049e.tar.bz2 edk2-3304abc101a19735c29d8b48a270576e72e7049e.zip | |
SecuritPkg: Tcg2: Fix coding style issue
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>
Reviewed-by: Bi Dandan <dandan.bi@intel.com>
Diffstat (limited to 'SecurityPkg/Tcg')
| -rw-r--r-- | SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c | 14 | ||||
| -rw-r--r-- | 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 3e341559b4..1317dca3d9 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 968f32710d..3ca6958a6e 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));
|