Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The profile name variable should be a string array #210

Merged
merged 5 commits into from
Jun 22, 2023
Merged

The profile name variable should be a string array #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06a3698
The profile name should be a string array
kuqin12 Jun 22, 2023
0ddac1b
Fixing the name
kuqin12 Jun 22, 2023
06e60c8
Removed data initializer for some variables
kuqin12 Jun 22, 2023
c239136
Still initialize them
kuqin12 Jun 22, 2023
ce52f2c
Fine... give you one
kuqin12 Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SetupDataPkg/Include/Library/PlatformConfigDataLib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ extern PROFILE gProfileData[];
// this does not count the generic profile, which is not
// in gProfileData, but rather in gKnobData's defaults
extern UINTN gNumProfiles;
extern CHAR8 *gProfileFlavorName;
extern CHAR8 *gProfileFlavorNames[];

#endif // PLATFORM_CONFIG_DATA_LIB_H_
8 changes: 4 additions & 4 deletions SetupDataPkg/Library/PlatformConfigDataLibNull/PlatformConfigDataLibNull.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
#include <Uefi.h>
#include <ConfigStdStructDefs.h>

KNOB_DATA gKnobData = { 0 };
KNOB_DATA gKnobData[1] = { 0 };

UINTN gNumKnobs = 0;

PROFILE gProfileData = { 0 };

CHAR8 *gProfileFlavorName = { 0 };
PROFILE gProfileData[1] = { 0 };

UINTN gNumProfiles = 0;

CHAR8 *gProfileFlavorNames[1] = { NULL };
2 changes: 1 addition & 1 deletion SetupDataPkg/Tools/KnobService.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,7 +1122,7 @@ def generate_profiles(schema, profile_header_path, profile_paths, efi_type, prof

out.write(get_line_ending(efi_type))
out.write(get_type_string("char*", efi_type) + " g{}[PROFILE_COUNT]".format(
naming_convention_filter("_profile_flavor_name", False, efi_type)) + " = {"
naming_convention_filter("_profile_flavor_names", False, efi_type)) + " = {"
)
out.write(get_line_ending(efi_type))
for profile_name in names_list:
Expand Down