archive-gh-me/OpenCorePkg
1
0
Fork 0
mirror of https://github.com/acidanthera/OpenCorePkg.git synced 2025-12-08 19:25:01 +00:00
Code Issues Projects Releases Wiki Activity

OcConfigurationLib: Fix BlessOverride and rename BootEntries

Browse Source
This commit is contained in:
Download-Fritz 2019-08-04 14:59:19 +02:00
parent 973882c031
commit 545df08f40
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Include/Library/OcConfigurationLib.h
View File

@ -215,15 +215,16 @@
Misc section
**/
#define OC_MISC_BLESS_OVER_ENTRY_FIELDS(_, __) \
#define OC_MISC_BLESS_ARRAY_FIELDS(_, __) \
OC_ARRAY (OC_STRING, _, __)
OC_DECLARE (OC_MISC_BLESS_OVER_ENTRY)
OC_DECLARE (OC_MISC_BLESS_ARRAY)
#define OC_MISC_BOOT_FIELDS(_, __) \
_(BOOLEAN , HideSelf , , FALSE , ()) \
_(BOOLEAN , ShowPicker , , FALSE , ()) \
_(BOOLEAN , UsePicker , , FALSE , ()) \
_(UINT32 , Timeout , , 0 , ()) \
_(OC_MISC_BLESS_ARRAY , BlessOverride , , OC_CONSTR3 (OC_MISC_BLESS_ARRAY, _, __), OC_DESTR (OC_MISC_BLESS_ARRAY)) \
_(OC_STRING , HibernateMode , , OC_STRING_CONSTR ("None", _, __), OC_DESTR (OC_STRING)) \
_(OC_STRING , Resolution , , OC_STRING_CONSTR ("", _, __), OC_DESTR (OC_STRING)) \
_(OC_STRING , ConsoleMode , , OC_STRING_CONSTR ("", _, __), OC_DESTR (OC_STRING)) \
@ -261,12 +262,11 @@
OC_DECLARE (OC_MISC_TOOLS_ARRAY)
#define OC_MISC_CONFIG_FIELDS(_, __) \
_(OC_MISC_BLESS_OVER_ENTRY , BlessOverride , , OC_CONSTR2 (OC_MISC_BLESS_OVER_ENTRY, _, __), OC_DESTR (OC_MISC_BLESS_OVER_ENTRY)) \
_(OC_MISC_BOOT , Boot , , OC_CONSTR2 (OC_MISC_BOOT, _, __) , OC_DESTR (OC_MISC_BOOT)) \
_(OC_MISC_TOOLS_ARRAY , BootEntries , , OC_CONSTR2 (OC_MISC_TOOLS_ARRAY, _, __) , OC_DESTR (OC_MISC_TOOLS_ARRAY)) \
_(OC_MISC_DEBUG , Debug , , OC_CONSTR2 (OC_MISC_DEBUG, _, __) , OC_DESTR (OC_MISC_DEBUG)) \
_(OC_MISC_SECURITY , Security , , OC_CONSTR2 (OC_MISC_SECURITY, _, __) , OC_DESTR (OC_MISC_SECURITY)) \
_(OC_MISC_TOOLS_ARRAY , Tools , , OC_CONSTR2 (OC_MISC_TOOLS_ARRAY, _, __) , OC_DESTR (OC_MISC_TOOLS_ARRAY))
_(OC_MISC_BOOT , Boot , , OC_CONSTR2 (OC_MISC_BOOT, _, __) , OC_DESTR (OC_MISC_BOOT)) \
_(OC_MISC_DEBUG , Debug , , OC_CONSTR2 (OC_MISC_DEBUG, _, __) , OC_DESTR (OC_MISC_DEBUG)) \
_(OC_MISC_SECURITY , Security , , OC_CONSTR2 (OC_MISC_SECURITY, _, __) , OC_DESTR (OC_MISC_SECURITY)) \
_(OC_MISC_TOOLS_ARRAY , Entries , , OC_CONSTR2 (OC_MISC_TOOLS_ARRAY, _, __) , OC_DESTR (OC_MISC_TOOLS_ARRAY)) \
_(OC_MISC_TOOLS_ARRAY , Tools , , OC_CONSTR2 (OC_MISC_TOOLS_ARRAY, _, __) , OC_DESTR (OC_MISC_TOOLS_ARRAY))
OC_DECLARE (OC_MISC_CONFIG)
/**

12
Library/OcConfigurationLib/OcConfigurationLib.c
View File

@ -38,7 +38,7 @@ OC_ARRAY_STRUCTORS (OC_KERNEL_PATCH_ARRAY)
OC_STRUCTORS (OC_KERNEL_QUIRKS, ())
OC_STRUCTORS (OC_KERNEL_CONFIG, ())
OC_STRUCTORS (OC_MISC_BLESS_OVER_ENTRY, ())
OC_ARRAY_STRUCTORS (OC_MISC_BLESS_ARRAY)
OC_STRUCTORS (OC_MISC_BOOT, ())
OC_STRUCTORS (OC_MISC_DEBUG, ())
OC_STRUCTORS (OC_MISC_SECURITY, ())
@ -258,15 +258,12 @@ mKernelConfigurationSchema[] = {
STATIC
OC_SCHEMA
mMiscBlessOverrideEntrySchema = OC_SCHEMA_STRING (NULL);
STATIC
OC_SCHEMA
mMiscBlessOverrideSchema = OC_SCHEMA_ARRAY (NULL, &mMiscBlessOverrideEntrySchema);
mMiscBlessOverrideSchema = OC_SCHEMA_STRING (NULL);
STATIC
OC_SCHEMA
mMiscConfigurationBootSchema[] = {
OC_SCHEMA_ARRAY_IN ("BlessOverride", OC_GLOBAL_CONFIG, Misc.Boot.BlessOverride, &mMiscBlessOverrideSchema),
OC_SCHEMA_STRING_IN ("ConsoleBehaviourOs",OC_GLOBAL_CONFIG, Misc.Boot.ConsoleBehaviourOs),
OC_SCHEMA_STRING_IN ("ConsoleBehaviourUi",OC_GLOBAL_CONFIG, Misc.Boot.ConsoleBehaviourUi),
OC_SCHEMA_STRING_IN ("ConsoleMode", OC_GLOBAL_CONFIG, Misc.Boot.ConsoleMode),
@ -313,10 +310,9 @@ mMiscToolsSchema = OC_SCHEMA_DICT (NULL, mMiscToolsSchemaEntry);
STATIC
OC_SCHEMA
mMiscConfigurationSchema[] = {
OC_SCHEMA_ARRAY_IN ("BlessOverride", OC_GLOBAL_CONFIG, Misc.BlessOverride, &mMiscBlessOverrideSchema),
OC_SCHEMA_DICT ("Boot", mMiscConfigurationBootSchema),
OC_SCHEMA_ARRAY_IN ("BootEntries", OC_GLOBAL_CONFIG, Misc.BootEntries, &mMiscToolsSchema),
OC_SCHEMA_DICT ("Debug", mMiscConfigurationDebugSchema),
OC_SCHEMA_ARRAY_IN ("Entries", OC_GLOBAL_CONFIG, Misc.Entries, &mMiscToolsSchema),
OC_SCHEMA_DICT ("Security", mMiscConfigurationSecuritySchema),
OC_SCHEMA_ARRAY_IN ("Tools", OC_GLOBAL_CONFIG, Misc.Tools, &mMiscToolsSchema),
};