Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
OpenCorePKG_MOD
提交
14c792ae
O
OpenCorePKG_MOD
项目概览
btwise
/
OpenCorePKG_MOD
通知
26
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
OpenCorePKG_MOD
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
14c792ae
编写于
7月 20, 2022
作者:
M
MikeBeaton
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
OcStringLib: Use OC_STRING_FORMAT consistently
上级
9dd5ad1a
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
23 addition
and
23 deletion
+23
-23
Library/OcBootManagementLib/BootArguments.c
Library/OcBootManagementLib/BootArguments.c
+3
-3
Library/OcLogAggregatorLib/OcLog.c
Library/OcLogAggregatorLib/OcLog.c
+1
-1
Platform/OpenLinuxBoot/Autodetect.c
Platform/OpenLinuxBoot/Autodetect.c
+8
-8
Platform/OpenLinuxBoot/LoaderEntry.c
Platform/OpenLinuxBoot/LoaderEntry.c
+2
-2
Platform/OpenLinuxBoot/OpenLinuxBoot.c
Platform/OpenLinuxBoot/OpenLinuxBoot.c
+3
-3
Platform/ResetNvramEntry/ResetNvramEntry.c
Platform/ResetNvramEntry/ResetNvramEntry.c
+2
-2
Staging/AudioDxe/AudioDxe.c
Staging/AudioDxe/AudioDxe.c
+4
-4
未找到文件。
Library/OcBootManagementLib/BootArguments.c
浏览文件 @
14c792ae
...
...
@@ -434,7 +434,7 @@ OcParseLoadOptions (
return
EFI_NOT_FOUND
;
}
Status
=
OcParseVars
(
LoadedImage
->
LoadOptions
,
ParsedVars
,
TRUE
);
Status
=
OcParseVars
(
LoadedImage
->
LoadOptions
,
ParsedVars
,
OcStringFormatUnicode
);
if
(
Status
==
EFI_INVALID_PARAMETER
)
{
DEBUG
((
DEBUG_ERROR
,
"OCB: Failed to parse LoadOptions (%p:%u)
\n
"
,
LoadedImage
->
LoadOptions
,
LoadedImage
->
LoadOptionsSize
));
...
...
@@ -680,7 +680,7 @@ OcParsedVarsGetUnicodeStr (
OUT
CHAR16
**
Value
)
{
return
OcParsedVarsGetStr
(
ParsedVars
,
Name
,
(
VOID
**
)
Value
,
TRUE
);
return
OcParsedVarsGetStr
(
ParsedVars
,
Name
,
(
VOID
**
)
Value
,
OcStringFormatUnicode
);
}
BOOLEAN
...
...
@@ -690,7 +690,7 @@ OcParsedVarsGetAsciiStr (
OUT
CHAR8
**
Value
)
{
return
OcParsedVarsGetStr
(
ParsedVars
,
Name
,
(
VOID
**
)
Value
,
FALSE
);
return
OcParsedVarsGetStr
(
ParsedVars
,
Name
,
(
VOID
**
)
Value
,
OcStringFormatAscii
);
}
BOOLEAN
...
...
Library/OcLogAggregatorLib/OcLog.c
浏览文件 @
14c792ae
...
...
@@ -722,7 +722,7 @@ OcConfigureLogProtocol (
++
LogModules
;
}
Private
->
FlexFilters
=
OcStringSplit
(
LogModules
,
L','
,
FALSE
);
Private
->
FlexFilters
=
OcStringSplit
(
LogModules
,
L','
,
OcStringFormatAscii
);
}
Handle
=
NULL
;
...
...
Platform/OpenLinuxBoot/Autodetect.c
浏览文件 @
14c792ae
...
...
@@ -269,7 +269,7 @@ LoadOsRelease (
"LNX: Reading %s
\n
"
,
OS_RELEASE_FILE
));
Status
=
OcParseVars
(
mEtcOsReleaseFileContents
,
&
mEtcOsReleaseOptions
,
FALSE
);
Status
=
OcParseVars
(
mEtcOsReleaseFileContents
,
&
mEtcOsReleaseOptions
,
OcStringFormatAscii
);
if
(
EFI_ERROR
(
Status
))
{
FreePool
(
mEtcOsReleaseFileContents
);
mEtcOsReleaseFileContents
=
NULL
;
...
...
@@ -320,7 +320,7 @@ LoadDefaultGrub (
"LNX: Reading %s
\n
"
,
GRUB_DEFAULT_FILE
));
Status
=
OcParseVars
(
mEtcDefaultGrubFileContents
,
&
mEtcDefaultGrubOptions
,
FALSE
);
Status
=
OcParseVars
(
mEtcDefaultGrubFileContents
,
&
mEtcDefaultGrubOptions
,
OcStringFormatAscii
);
if
(
EFI_ERROR
(
Status
))
{
FreePool
(
mEtcDefaultGrubFileContents
);
mEtcDefaultGrubFileContents
=
NULL
;
...
...
@@ -589,7 +589,7 @@ AutodetectBootOptions (
""
,
mCurrentPartuuidAutoOpts
));
Status
=
AddOption
(
Options
,
mCurrentPartuuidAutoOpts
,
TRUE
);
Status
=
AddOption
(
Options
,
mCurrentPartuuidAutoOpts
,
OcStringFormatUnicode
);
return
Status
;
}
...
...
@@ -601,7 +601,7 @@ AutodetectBootOptions (
"+"
,
mCurrentPartuuidAutoOptsPlus
));
Status
=
AddOption
(
Options
,
mCurrentPartuuidAutoOptsPlus
,
TRUE
);
Status
=
AddOption
(
Options
,
mCurrentPartuuidAutoOptsPlus
,
OcStringFormatUnicode
);
if
(
EFI_ERROR
(
Status
))
{
return
Status
;
}
...
...
@@ -620,7 +620,7 @@ AutodetectBootOptions (
mGlobalAutoOpts
));
Status
=
AddOption
(
Options
,
mGlobalAutoOpts
,
TRUE
);
Status
=
AddOption
(
Options
,
mGlobalAutoOpts
,
OcStringFormatUnicode
);
return
Status
;
}
else
if
(
mGlobalAutoOptsPlus
)
{
DEBUG
((
...
...
@@ -630,7 +630,7 @@ AutodetectBootOptions (
mGlobalAutoOptsPlus
));
Status
=
AddOption
(
Options
,
mGlobalAutoOptsPlus
,
TRUE
);
Status
=
AddOption
(
Options
,
mGlobalAutoOptsPlus
,
OcStringFormatUnicode
);
if
(
EFI_ERROR
(
Status
))
{
return
Status
;
}
...
...
@@ -682,7 +682,7 @@ AutodetectBootOptions (
));
if
(
AsciiStrValue
[
0
]
!=
'\0'
)
{
Status
=
InsertOption
(
InsertIndex
,
Options
,
AsciiStrValue
,
FALSE
);
Status
=
InsertOption
(
InsertIndex
,
Options
,
AsciiStrValue
,
OcStringFormatAscii
);
if
(
EFI_ERROR
(
Status
))
{
return
Status
;
}
...
...
@@ -744,7 +744,7 @@ AutodetectBootOptions (
"LNX: Adding
\"
%a
\"\n
"
,
AddRxOption
));
Status
=
InsertOption
(
InsertIndex
,
Options
,
AddRxOption
,
FALSE
);
Status
=
InsertOption
(
InsertIndex
,
Options
,
AddRxOption
,
OcStringFormatAscii
);
}
return
Status
;
...
...
Platform/OpenLinuxBoot/LoaderEntry.c
浏览文件 @
14c792ae
...
...
@@ -696,14 +696,14 @@ HasRootOption (
return
TRUE
;
}
Status
=
OcParseVars
(
OptionCopy
,
&
ParsedVars
,
FALSE
);
Status
=
OcParseVars
(
OptionCopy
,
&
ParsedVars
,
OcStringFormatAscii
);
if
(
EFI_ERROR
(
Status
))
{
DEBUG
((
DEBUG_WARN
,
"LNX: Error parsing Options[%u]=<%a> - %r
\n
"
,
Index
,
*
Option
,
Status
));
FreePool
(
OptionCopy
);
return
TRUE
;
}
HasRoot
=
OcHasParsedVar
(
ParsedVars
,
"root"
,
FALSE
);
HasRoot
=
OcHasParsedVar
(
ParsedVars
,
"root"
,
OcStringFormatAscii
);
FreePool
(
ParsedVars
);
FreePool
(
OptionCopy
);
...
...
Platform/OpenLinuxBoot/OpenLinuxBoot.c
浏览文件 @
14c792ae
...
...
@@ -298,9 +298,9 @@ UefiMain (
if
(
!
EFI_ERROR
(
Status
))
{
AddBootFlags
=
0
;
RemoveBootFlags
=
0
;
OcParsedVarsGetInt
(
mParsedLoadOptions
,
L"flags"
,
&
gLinuxBootFlags
,
TRUE
);
OcParsedVarsGetInt
(
mParsedLoadOptions
,
L"flags+"
,
&
AddBootFlags
,
TRUE
);
OcParsedVarsGetInt
(
mParsedLoadOptions
,
L"flags-"
,
&
RemoveBootFlags
,
TRUE
);
OcParsedVarsGetInt
(
mParsedLoadOptions
,
L"flags"
,
&
gLinuxBootFlags
,
OcStringFormatUnicode
);
OcParsedVarsGetInt
(
mParsedLoadOptions
,
L"flags+"
,
&
AddBootFlags
,
OcStringFormatUnicode
);
OcParsedVarsGetInt
(
mParsedLoadOptions
,
L"flags-"
,
&
RemoveBootFlags
,
OcStringFormatUnicode
);
gLinuxBootFlags
|=
AddBootFlags
;
gLinuxBootFlags
&=
~
RemoveBootFlags
;
}
else
{
...
...
Platform/ResetNvramEntry/ResetNvramEntry.c
浏览文件 @
14c792ae
...
...
@@ -166,8 +166,8 @@ UefiMain (
Status
=
OcParseLoadOptions
(
LoadedImage
,
&
ParsedLoadOptions
);
if
(
!
EFI_ERROR
(
Status
))
{
mPreserveBoot
=
OcHasParsedVar
(
ParsedLoadOptions
,
L"--preserve-boot"
,
TRUE
);
mUseApple
=
OcHasParsedVar
(
ParsedLoadOptions
,
L"--apple"
,
TRUE
);
mPreserveBoot
=
OcHasParsedVar
(
ParsedLoadOptions
,
L"--preserve-boot"
,
OcStringFormatUnicode
);
mUseApple
=
OcHasParsedVar
(
ParsedLoadOptions
,
L"--apple"
,
OcStringFormatUnicode
);
OcFlexArrayFree
(
&
ParsedLoadOptions
);
}
else
{
...
...
Staging/AudioDxe/AudioDxe.c
浏览文件 @
14c792ae
...
...
@@ -97,17 +97,17 @@ AudioDxeInit (
Status
=
OcParseLoadOptions
(
LoadedImage
,
&
ParsedLoadOptions
);
if
(
!
EFI_ERROR
(
Status
))
{
gRestoreNoSnoop
=
OcHasParsedVar
(
ParsedLoadOptions
,
L"--restore-nosnoop"
,
TRUE
);
gRestoreNoSnoop
=
OcHasParsedVar
(
ParsedLoadOptions
,
L"--restore-nosnoop"
,
OcStringFormatUnicode
);
Status
=
OcParsedVarsGetInt
(
ParsedLoadOptions
,
L"--gpio-setup"
,
&
gGpioSetupStageMask
,
TRUE
);
if
((
Status
==
EFI_NOT_FOUND
)
&&
OcHasParsedVar
(
ParsedLoadOptions
,
L"--gpio-setup"
,
TRUE
))
{
Status
=
OcParsedVarsGetInt
(
ParsedLoadOptions
,
L"--gpio-setup"
,
&
gGpioSetupStageMask
,
OcStringFormatUnicode
);
if
((
Status
==
EFI_NOT_FOUND
)
&&
OcHasParsedVar
(
ParsedLoadOptions
,
L"--gpio-setup"
,
OcStringFormatUnicode
))
{
gGpioSetupStageMask
=
GPIO_SETUP_STAGE_ALL
;
}
DEBUG
((
DEBUG_INFO
,
"HDA: GPIO setup stages 0x%X, restore NSNPEN %d
\n
"
,
gGpioSetupStageMask
,
gRestoreNoSnoop
));
if
(
gGpioSetupStageMask
!=
GPIO_SETUP_STAGE_NONE
)
{
OcParsedVarsGetInt
(
ParsedLoadOptions
,
L"--gpio-pins"
,
&
gGpioPinMask
,
TRUE
);
OcParsedVarsGetInt
(
ParsedLoadOptions
,
L"--gpio-pins"
,
&
gGpioPinMask
,
OcStringFormatUnicode
);
DEBUG
((
DEBUG_INFO
,
"HDA: GPIO pin mask 0x%X%a
\n
"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录