From 1436aea4d5707e672672a11bda72be2c63c936c3 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Sun, 5 Dec 2021 14:54:02 -0800 Subject: MdeModulePkg: Apply uncrustify changes REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the MdeModulePkg package Cc: Andrew Fish Cc: Leif Lindholm Cc: Michael D Kinney Signed-off-by: Michael Kubacki Reviewed-by: Liming Gao --- .../ReportStatusCodeLib.c | 79 +++++++++++----------- 1 file changed, 38 insertions(+), 41 deletions(-) (limited to 'MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.c') diff --git a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.c b/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.c index dc7fcf7a2d..fdda288d33 100644 --- a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.c +++ b/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.c @@ -21,7 +21,6 @@ #include #include - // // Define the maximum extended data size that is supported when a status code is reported. // @@ -56,8 +55,8 @@ InternalGetReportStatusCode ( // // Check gBS just in case ReportStatusCode is called before gBS is initialized. // - if (gBS != NULL && gBS->LocateProtocol != NULL) { - Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID**) &mReportStatusCodeLibStatusCodeProtocol); + if ((gBS != NULL) && (gBS->LocateProtocol != NULL)) { + Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID **)&mReportStatusCodeLibStatusCodeProtocol); if (EFI_ERROR (Status)) { mReportStatusCodeLibStatusCodeProtocol = NULL; } @@ -74,14 +73,15 @@ InternalGetReportStatusCode ( VOID EFIAPI ReportStatusCodeLibVirtualAddressChange ( - IN EFI_EVENT Event, - IN VOID *Context + IN EFI_EVENT Event, + IN VOID *Context ) { if (mReportStatusCodeLibStatusCodeProtocol == NULL) { return; } - EfiConvertPointer (0, (VOID **) &mReportStatusCodeLibStatusCodeProtocol); + + EfiConvertPointer (0, (VOID **)&mReportStatusCodeLibStatusCodeProtocol); } /** @@ -94,8 +94,8 @@ ReportStatusCodeLibVirtualAddressChange ( VOID EFIAPI ReportStatusCodeLibExitBootServices ( - IN EFI_EVENT Event, - IN VOID *Context + IN EFI_EVENT Event, + IN VOID *Context ) { // @@ -121,8 +121,8 @@ ReportStatusCodeLibExitBootServices ( EFI_STATUS EFIAPI ReportStatusCodeLibConstructor ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable ) { EFI_STATUS Status; @@ -217,16 +217,17 @@ ReportStatusCodeLibDestructor ( **/ EFI_STATUS InternalReportStatusCode ( - IN EFI_STATUS_CODE_TYPE Type, - IN EFI_STATUS_CODE_VALUE Value, - IN UINT32 Instance, - IN CONST EFI_GUID *CallerId OPTIONAL, - IN EFI_STATUS_CODE_DATA *Data OPTIONAL + IN EFI_STATUS_CODE_TYPE Type, + IN EFI_STATUS_CODE_VALUE Value, + IN UINT32 Instance, + IN CONST EFI_GUID *CallerId OPTIONAL, + IN EFI_STATUS_CODE_DATA *Data OPTIONAL ) { - if ((ReportProgressCodeEnabled() && ((Type) & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) || - (ReportErrorCodeEnabled() && ((Type) & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) || - (ReportDebugCodeEnabled() && ((Type) & EFI_STATUS_CODE_TYPE_MASK) == EFI_DEBUG_CODE)) { + if ((ReportProgressCodeEnabled () && (((Type) & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE)) || + (ReportErrorCodeEnabled () && (((Type) & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE)) || + (ReportDebugCodeEnabled () && (((Type) & EFI_STATUS_CODE_TYPE_MASK) == EFI_DEBUG_CODE))) + { // // If mReportStatusCodeLibStatusCodeProtocol is NULL, then check if Report Status Code Protocol is available in system. // @@ -244,7 +245,6 @@ InternalReportStatusCode ( return EFI_UNSUPPORTED; } - /** Converts a status code to an 8-bit POST code value. @@ -283,15 +283,16 @@ CodeTypeToPostCode ( // Convert Value to an 8 bit post code // if (((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) || - ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) ) { - *PostCode = (UINT8) ((((Value & EFI_STATUS_CODE_CLASS_MASK) >> 24) << 5) | - (((Value & EFI_STATUS_CODE_SUBCLASS_MASK) >> 16) & 0x1f)); + ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE)) + { + *PostCode = (UINT8)((((Value & EFI_STATUS_CODE_CLASS_MASK) >> 24) << 5) | + (((Value & EFI_STATUS_CODE_SUBCLASS_MASK) >> 16) & 0x1f)); return TRUE; } + return FALSE; } - /** Extracts ASSERT() information from a status code structure. @@ -345,17 +346,18 @@ ReportStatusCodeExtractAssertInfo ( if (((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) && ((CodeType & EFI_STATUS_CODE_SEVERITY_MASK) == EFI_ERROR_UNRECOVERED) && - ((Value & EFI_STATUS_CODE_OPERATION_MASK) == EFI_SW_EC_ILLEGAL_SOFTWARE_STATE)) { + ((Value & EFI_STATUS_CODE_OPERATION_MASK) == EFI_SW_EC_ILLEGAL_SOFTWARE_STATE)) + { AssertData = (EFI_DEBUG_ASSERT_DATA *)(Data + 1); *Filename = (CHAR8 *)(AssertData + 1); *Description = *Filename + AsciiStrLen (*Filename) + 1; *LineNumber = AssertData->LineNumber; return TRUE; } + return FALSE; } - /** Extracts DEBUG() information from a status code structure. @@ -424,13 +426,12 @@ ReportStatusCodeExtractDebugInfo ( // 64-bit aligned is a must, otherwise retrieving 64-bit parameter from BASE_LIST will // cause unalignment exception. // - *Marker = (BASE_LIST) (DebugInfo + 1); + *Marker = (BASE_LIST)(DebugInfo + 1); *Format = (CHAR8 *)(((UINT64 *)*Marker) + 12); return TRUE; } - /** Reports a status code. @@ -462,7 +463,6 @@ ReportStatusCode ( return InternalReportStatusCode (Type, Value, 0, &gEfiCallerIdGuid, NULL); } - /** Reports a status code with a Device Path Protocol as the extended data. @@ -508,7 +508,6 @@ ReportStatusCodeWithDevicePath ( ); } - /** Reports a status code with an extended data buffer. @@ -564,7 +563,6 @@ ReportStatusCodeWithExtendedData ( ); } - /** Reports a status code with full parameters. @@ -630,13 +628,13 @@ ReportStatusCodeEx ( // // Use Buffer instead of allocating if possible. // - StatusCodeData = (EFI_STATUS_CODE_DATA *) StatusCodeBuffer; + StatusCodeData = (EFI_STATUS_CODE_DATA *)StatusCodeBuffer; } else { if (mHaveExitedBootServices) { return EFI_OUT_OF_RESOURCES; } - if (gBS == NULL || gBS->AllocatePool == NULL || gBS->FreePool == NULL) { + if ((gBS == NULL) || (gBS->AllocatePool == NULL) || (gBS->FreePool == NULL)) { return EFI_UNSUPPORTED; } @@ -653,11 +651,12 @@ ReportStatusCodeEx ( // // Fill in the extended data header // - StatusCodeData->HeaderSize = (UINT16) sizeof (EFI_STATUS_CODE_DATA); - StatusCodeData->Size = (UINT16) ExtendedDataSize; + StatusCodeData->HeaderSize = (UINT16)sizeof (EFI_STATUS_CODE_DATA); + StatusCodeData->Size = (UINT16)ExtendedDataSize; if (ExtendedDataGuid == NULL) { ExtendedDataGuid = &gEfiStatusCodeSpecificDataGuid; } + CopyGuid (&StatusCodeData->Type, ExtendedDataGuid); // @@ -673,19 +672,19 @@ ReportStatusCodeEx ( if (CallerId == NULL) { CallerId = &gEfiCallerIdGuid; } + Status = InternalReportStatusCode (Type, Value, Instance, CallerId, StatusCodeData); // // Free the allocated buffer // - if (StatusCodeData != (EFI_STATUS_CODE_DATA *) StatusCodeBuffer) { + if (StatusCodeData != (EFI_STATUS_CODE_DATA *)StatusCodeBuffer) { gBS->FreePool (StatusCodeData); } return Status; } - /** Returns TRUE if status codes of type EFI_PROGRESS_CODE are enabled @@ -704,10 +703,9 @@ ReportProgressCodeEnabled ( VOID ) { - return (BOOLEAN) ((PcdGet8 (PcdReportStatusCodePropertyMask) & REPORT_STATUS_CODE_PROPERTY_PROGRESS_CODE_ENABLED) != 0); + return (BOOLEAN)((PcdGet8 (PcdReportStatusCodePropertyMask) & REPORT_STATUS_CODE_PROPERTY_PROGRESS_CODE_ENABLED) != 0); } - /** Returns TRUE if status codes of type EFI_ERROR_CODE are enabled @@ -726,10 +724,9 @@ ReportErrorCodeEnabled ( VOID ) { - return (BOOLEAN) ((PcdGet8 (PcdReportStatusCodePropertyMask) & REPORT_STATUS_CODE_PROPERTY_ERROR_CODE_ENABLED) != 0); + return (BOOLEAN)((PcdGet8 (PcdReportStatusCodePropertyMask) & REPORT_STATUS_CODE_PROPERTY_ERROR_CODE_ENABLED) != 0); } - /** Returns TRUE if status codes of type EFI_DEBUG_CODE are enabled @@ -748,5 +745,5 @@ ReportDebugCodeEnabled ( VOID ) { - return (BOOLEAN) ((PcdGet8 (PcdReportStatusCodePropertyMask) & REPORT_STATUS_CODE_PROPERTY_DEBUG_CODE_ENABLED) != 0); + return (BOOLEAN)((PcdGet8 (PcdReportStatusCodePropertyMask) & REPORT_STATUS_CODE_PROPERTY_DEBUG_CODE_ENABLED) != 0); } -- cgit v1.2.3