Skip to content

Commit b878648

Browse files
makubackimergify[bot]
makubacki
authored and
mergify[bot]
committed
SignedCapsulePkg: Apply uncrustify changes
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the SignedCapsulePkg package Cc: Andrew Fish <[email protected]> Cc: Leif Lindholm <[email protected]> Cc: Michael D Kinney <[email protected]> Signed-off-by: Michael Kubacki <[email protected]> Reviewed-by: Jian J Wang <[email protected]>
1 parent 47d20b5 commit b878648

File tree

15 files changed

+1340
-1219
lines changed

15 files changed

+1340
-1219
lines changed

‎SignedCapsulePkg/Include/Guid/EdkiiSystemFmpCapsule.h

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
88
**/
99

10-
1110
#ifndef __EDKII_SYSTEM_FMP_CAPSULE_GUID_H__
1211
#define __EDKII_SYSTEM_FMP_CAPSULE_GUID_H__
1312

@@ -90,34 +89,34 @@
9089

9190
#pragma pack(1)
9291
typedef struct {
93-
UINT32 Signature;
94-
UINT32 HeaderLength; // Length of EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR, excluding NameString
95-
UINT32 Length; // Length of the data structure, including NameString
92+
UINT32 Signature;
93+
UINT32 HeaderLength; // Length of EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR, excluding NameString
94+
UINT32 Length; // Length of the data structure, including NameString
9695
// Below structure is similar as UEFI EFI_FIRMWARE_MANAGEMENT_PROTOCOL.GetPackageInfo()
97-
UINT32 PackageVersion;
98-
UINT32 PackageVersionNameStringOffset; // Offset from head, CHAR16 string including NULL terminate char
96+
UINT32 PackageVersion;
97+
UINT32 PackageVersionNameStringOffset; // Offset from head, CHAR16 string including NULL terminate char
9998
// Below structure is similar as UEFI EFI_FIRMWARE_IMAGE_DESCRIPTOR
100-
UINT8 ImageIndex;
101-
UINT8 Reserved[3];
102-
EFI_GUID ImageTypeId;
103-
UINT64 ImageId;
104-
UINT32 ImageIdNameStringOffset; // Offset from head, CHAR16 string including NULL terminate char
105-
UINT32 Version;
106-
UINT32 VersionNameStringOffset; // Offset from head, CHAR16 string including NULL terminate char
107-
UINT8 Reserved2[4];
108-
UINT64 Size;
109-
UINT64 AttributesSupported;
110-
UINT64 AttributesSetting;
111-
UINT64 Compatibilities;
112-
UINT32 LowestSupportedImageVersion;
113-
UINT32 LastAttemptVersion;
114-
UINT32 LastAttemptStatus;
115-
UINT8 Reserved3[4];
116-
UINT64 HardwareInstance;
99+
UINT8 ImageIndex;
100+
UINT8 Reserved[3];
101+
EFI_GUID ImageTypeId;
102+
UINT64 ImageId;
103+
UINT32 ImageIdNameStringOffset; // Offset from head, CHAR16 string including NULL terminate char
104+
UINT32 Version;
105+
UINT32 VersionNameStringOffset; // Offset from head, CHAR16 string including NULL terminate char
106+
UINT8 Reserved2[4];
107+
UINT64 Size;
108+
UINT64 AttributesSupported;
109+
UINT64 AttributesSetting;
110+
UINT64 Compatibilities;
111+
UINT32 LowestSupportedImageVersion;
112+
UINT32 LastAttemptVersion;
113+
UINT32 LastAttemptStatus;
114+
UINT8 Reserved3[4];
115+
UINT64 HardwareInstance;
117116
// real string data
118-
//CHAR16 ImageIdNameStr[]; // CHAR16 string including NULL terminate char
119-
//CHAR16 VersionNameStr[]; // CHAR16 string including NULL terminate char
120-
//CHAR16 PackageVersionNameStr[]; // CHAR16 string including NULL terminate char
117+
// CHAR16 ImageIdNameStr[]; // CHAR16 string including NULL terminate char
118+
// CHAR16 VersionNameStr[]; // CHAR16 string including NULL terminate char
119+
// CHAR16 PackageVersionNameStr[]; // CHAR16 string including NULL terminate char
121120
} EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR;
122121
#pragma pack()
123122

@@ -138,8 +137,8 @@ typedef struct {
138137
+----------------------+
139138
**/
140139

141-
extern EFI_GUID gEdkiiSystemFirmwareImageDescriptorFileGuid;
142-
extern EFI_GUID gEdkiiSystemFmpCapsuleConfigFileGuid;
143-
extern EFI_GUID gEdkiiSystemFmpCapsuleDriverFvFileGuid;
140+
extern EFI_GUID gEdkiiSystemFirmwareImageDescriptorFileGuid;
141+
extern EFI_GUID gEdkiiSystemFmpCapsuleConfigFileGuid;
142+
extern EFI_GUID gEdkiiSystemFmpCapsuleDriverFvFileGuid;
144143

145144
#endif

‎SignedCapsulePkg/Include/Library/EdkiiSystemCapsuleLib.h

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
66
77
**/
88

9-
109
#ifndef __EDKII_SYSTEM_CAPSULE_LIB_H__
1110
#define __EDKII_SYSTEM_CAPSULE_LIB_H__
1211

@@ -26,10 +25,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
2625
BOOLEAN
2726
EFIAPI
2827
ExtractSystemFirmwareImageFmpInfo (
29-
IN VOID *SystemFirmwareImage,
30-
IN UINTN SystemFirmwareImageSize,
31-
OUT EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR **ImageFmpInfo,
32-
OUT UINTN *ImageFmpInfoSize
28+
IN VOID *SystemFirmwareImage,
29+
IN UINTN SystemFirmwareImageSize,
30+
OUT EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR **ImageFmpInfo,
31+
OUT UINTN *ImageFmpInfoSize
3332
);
3433

3534
/**
@@ -46,10 +45,10 @@ ExtractSystemFirmwareImageFmpInfo (
4645
BOOLEAN
4746
EFIAPI
4847
ExtractDriverFvImage (
49-
IN VOID *AuthenticatedImage,
50-
IN UINTN AuthenticatedImageSize,
51-
OUT VOID **DriverFvImage,
52-
OUT UINTN *DriverFvImageSize
48+
IN VOID *AuthenticatedImage,
49+
IN UINTN AuthenticatedImageSize,
50+
OUT VOID **DriverFvImage,
51+
OUT UINTN *DriverFvImageSize
5352
);
5453

5554
/**
@@ -66,10 +65,10 @@ ExtractDriverFvImage (
6665
BOOLEAN
6766
EFIAPI
6867
ExtractConfigImage (
69-
IN VOID *AuthenticatedImage,
70-
IN UINTN AuthenticatedImageSize,
71-
OUT VOID **ConfigImage,
72-
OUT UINTN *ConfigImageSize
68+
IN VOID *AuthenticatedImage,
69+
IN UINTN AuthenticatedImageSize,
70+
OUT VOID **ConfigImage,
71+
OUT UINTN *ConfigImageSize
7372
);
7473

7574
/**
@@ -86,10 +85,10 @@ ExtractConfigImage (
8685
BOOLEAN
8786
EFIAPI
8887
ExtractSystemFirmwareImage (
89-
IN VOID *AuthenticatedImage,
90-
IN UINTN AuthenticatedImageSize,
91-
OUT VOID **SystemFirmwareImage,
92-
OUT UINTN *SystemFirmwareImageSize
88+
IN VOID *AuthenticatedImage,
89+
IN UINTN AuthenticatedImageSize,
90+
OUT VOID **SystemFirmwareImage,
91+
OUT UINTN *SystemFirmwareImageSize
9392
);
9493

9594
/**
@@ -107,11 +106,11 @@ ExtractSystemFirmwareImage (
107106
BOOLEAN
108107
EFIAPI
109108
ExtractAuthenticatedImage (
110-
IN VOID *Image,
111-
IN UINTN ImageSize,
112-
OUT UINT32 *LastAttemptStatus,
113-
OUT VOID **AuthenticatedImage,
114-
OUT UINTN *AuthenticatedImageSize
109+
IN VOID *Image,
110+
IN UINTN ImageSize,
111+
OUT UINT32 *LastAttemptStatus,
112+
OUT VOID **AuthenticatedImage,
113+
OUT UINTN *AuthenticatedImageSize
115114
);
116115

117116
/**
@@ -135,14 +134,13 @@ ExtractAuthenticatedImage (
135134
EFI_STATUS
136135
EFIAPI
137136
CapsuleAuthenticateSystemFirmware (
138-
IN VOID *Image,
139-
IN UINTN ImageSize,
140-
IN BOOLEAN ForceVersionMatch,
141-
OUT UINT32 *LastAttemptVersion,
142-
OUT UINT32 *LastAttemptStatus,
143-
OUT VOID **AuthenticatedImage,
144-
OUT UINTN *AuthenticatedImageSize
137+
IN VOID *Image,
138+
IN UINTN ImageSize,
139+
IN BOOLEAN ForceVersionMatch,
140+
OUT UINT32 *LastAttemptVersion,
141+
OUT UINT32 *LastAttemptStatus,
142+
OUT VOID **AuthenticatedImage,
143+
OUT UINTN *AuthenticatedImageSize
145144
);
146145

147146
#endif
148-

‎SignedCapsulePkg/Include/Library/IniParsingLib.h

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
2424
2525
**/
2626

27-
2827
#ifndef __INI_PARSING_LIB_H__
2928
#define __INI_PARSING_LIB_H__
3029

@@ -41,8 +40,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
4140
VOID *
4241
EFIAPI
4342
OpenIniFile (
44-
IN UINT8 *DataBuffer,
45-
IN UINTN BufferSize
43+
IN UINT8 *DataBuffer,
44+
IN UINTN BufferSize
4645
);
4746

4847
/**
@@ -59,10 +58,10 @@ OpenIniFile (
5958
EFI_STATUS
6059
EFIAPI
6160
GetStringFromDataFile (
62-
IN VOID *Context,
63-
IN CHAR8 *SectionName,
64-
IN CHAR8 *EntryName,
65-
OUT CHAR8 **EntryValue
61+
IN VOID *Context,
62+
IN CHAR8 *SectionName,
63+
IN CHAR8 *EntryName,
64+
OUT CHAR8 **EntryValue
6665
);
6766

6867
/**
@@ -79,10 +78,10 @@ GetStringFromDataFile (
7978
EFI_STATUS
8079
EFIAPI
8180
GetGuidFromDataFile (
82-
IN VOID *Context,
83-
IN CHAR8 *SectionName,
84-
IN CHAR8 *EntryName,
85-
OUT EFI_GUID *Guid
81+
IN VOID *Context,
82+
IN CHAR8 *SectionName,
83+
IN CHAR8 *EntryName,
84+
OUT EFI_GUID *Guid
8685
);
8786

8887
/**
@@ -99,10 +98,10 @@ GetGuidFromDataFile (
9998
EFI_STATUS
10099
EFIAPI
101100
GetDecimalUintnFromDataFile (
102-
IN VOID *Context,
103-
IN CHAR8 *SectionName,
104-
IN CHAR8 *EntryName,
105-
OUT UINTN *Data
101+
IN VOID *Context,
102+
IN CHAR8 *SectionName,
103+
IN CHAR8 *EntryName,
104+
OUT UINTN *Data
106105
);
107106

108107
/**
@@ -119,10 +118,10 @@ GetDecimalUintnFromDataFile (
119118
EFI_STATUS
120119
EFIAPI
121120
GetHexUintnFromDataFile (
122-
IN VOID *Context,
123-
IN CHAR8 *SectionName,
124-
IN CHAR8 *EntryName,
125-
OUT UINTN *Data
121+
IN VOID *Context,
122+
IN CHAR8 *SectionName,
123+
IN CHAR8 *EntryName,
124+
OUT UINTN *Data
126125
);
127126

128127
/**
@@ -139,10 +138,10 @@ GetHexUintnFromDataFile (
139138
EFI_STATUS
140139
EFIAPI
141140
GetHexUint64FromDataFile (
142-
IN VOID *Context,
143-
IN CHAR8 *SectionName,
144-
IN CHAR8 *EntryName,
145-
OUT UINT64 *Data
141+
IN VOID *Context,
142+
IN CHAR8 *SectionName,
143+
IN CHAR8 *EntryName,
144+
OUT UINT64 *Data
146145
);
147146

148147
/**
@@ -153,8 +152,7 @@ GetHexUint64FromDataFile (
153152
VOID
154153
EFIAPI
155154
CloseIniFile (
156-
IN VOID *Context
155+
IN VOID *Context
157156
);
158157

159158
#endif
160-

‎SignedCapsulePkg/Include/Library/PlatformFlashAccessLib.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
77
**/
88

9-
109
#ifndef __PLATFORM_FLASH_ACCESS_LIB_H__
1110
#define __PLATFORM_FLASH_ACCESS_LIB_H__
1211

@@ -43,11 +42,11 @@ typedef enum {
4342
EFI_STATUS
4443
EFIAPI
4544
PerformFlashWrite (
46-
IN PLATFORM_FIRMWARE_TYPE FirmwareType,
47-
IN EFI_PHYSICAL_ADDRESS FlashAddress,
48-
IN FLASH_ADDRESS_TYPE FlashAddressType,
49-
IN VOID *Buffer,
50-
IN UINTN Length
45+
IN PLATFORM_FIRMWARE_TYPE FirmwareType,
46+
IN EFI_PHYSICAL_ADDRESS FlashAddress,
47+
IN FLASH_ADDRESS_TYPE FlashAddressType,
48+
IN VOID *Buffer,
49+
IN UINTN Length
5150
);
5251

5352
/**

0 commit comments

Comments
 (0)