Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
OpenCorePKG_MOD
提交
39f95660
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,发现更多精彩内容 >>
提交
39f95660
编写于
6月 12, 2019
作者:
D
Download-Fritz
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
OcDevicePathLib: Return the number of fixed Apple DP nodes
上级
327d4b7d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
27 addition
and
14 deletion
+27
-14
Include/Library/OcDevicePathLib.h
Include/Library/OcDevicePathLib.h
+3
-2
Library/OcBootManagementLib/DefaultEntryChoice.c
Library/OcBootManagementLib/DefaultEntryChoice.c
+3
-4
Library/OcDevicePathLib/OcDevicePathLib.c
Library/OcDevicePathLib/OcDevicePathLib.c
+21
-8
未找到文件。
Include/Library/OcDevicePathLib.h
浏览文件 @
39f95660
...
...
@@ -143,10 +143,11 @@ TrailedBooterDevicePath (
On output, the device path pointer is modified to
point to the remaining part of the device path.
@returns Whether the device path has been fixed successfully.
@retval -1 DevicePath could not be fixed.
@retval other The number of fixed nodes in DevicePath.
**/
BOOLEA
N
INT
N
OcFixAppleBootDevicePath
(
IN
OUT
EFI_DEVICE_PATH_PROTOCOL
**
DevicePath
);
...
...
Library/OcBootManagementLib/DefaultEntryChoice.c
浏览文件 @
39f95660
...
...
@@ -333,7 +333,7 @@ InternalGetDefaultBootEntry (
OC_BOOT_ENTRY
*
BootEntry
;
EFI_STATUS
Status
;
BOOLEAN
Result
;
INTN
NumPatchedNodes
;
UINT32
BootNextAttributes
;
UINTN
BootNextSize
;
...
...
@@ -475,7 +475,7 @@ InternalGetDefaultBootEntry (
DebugPrintDevicePath
(
DEBUG_INFO
,
"OCB: Default DP pre-fix"
,
UefiDevicePath
);
UefiRemainingDevicePath
=
UefiDevicePath
;
Result
=
OcFixAppleBootDevicePath
(
&
UefiRemainingDevicePath
);
NumPatchedNodes
=
OcFixAppleBootDevicePath
(
&
UefiRemainingDevicePath
);
DebugPrintDevicePath
(
DEBUG_INFO
,
...
...
@@ -488,7 +488,7 @@ InternalGetDefaultBootEntry (
UefiRemainingDevicePath
);
if
(
!
Result
)
{
if
(
NumPatchedNodes
==
-
1
)
{
DEBUG
((
DEBUG_WARN
,
"OCB: Failed to fix the default boot Device Path,
\n
"
));
return
NULL
;
}
...
...
@@ -535,7 +535,6 @@ InternalGetDefaultBootEntry (
&
UefiRemainingDevicePath
,
&
DeviceHandle
);
if
(
EFI_ERROR
(
Status
))
{
continue
;
}
...
...
Library/OcDevicePathLib/OcDevicePathLib.c
浏览文件 @
39f95660
...
...
@@ -220,14 +220,17 @@ TrailedBooterDevicePath (
On output, the device path pointer is modified to
point to the remaining part of the device path.
@returns Whether the device path has been fixed successfully.
@retval -1 DevicePath could not be fixed.
@retval other The number of fixed nodes in DevicePath.
**/
BOOLEA
N
INT
N
OcFixAppleBootDevicePath
(
IN
OUT
EFI_DEVICE_PATH_PROTOCOL
**
DevicePath
)
{
INTN
Result
;
EFI_DEVICE_PATH_PROTOCOL
*
OriginalDevPath
;
EFI_DEV_PATH_PTR
InvalidNode
;
...
...
@@ -246,8 +249,18 @@ OcFixAppleBootDevicePath (
// modified and success is returned.
//
OriginalDevPath
=
*
DevicePath
;
//
// Failure will be returned explicitly within the loop. If this loop is run
// only once, it means the Device Path had already been valid. Hence, Result
// will be 0 on termination. Shall any switch-case continue, which it needs
// to in order to patch subsequent nodes, Result will be incremented.
//
Result
=
-
1
;
while
(
TRUE
)
{
if
(
Result
!=
MAX_INTN
)
{
++
Result
;
}
RemainingDevPath
=
OriginalDevPath
;
gBS
->
LocateDevicePath
(
&
gEfiDevicePathProtocolGuid
,
...
...
@@ -277,7 +290,7 @@ OcFixAppleBootDevicePath (
continue
;
}
return
FALSE
;
return
-
1
;
}
case
MSG_SASEX_DP
:
...
...
@@ -299,7 +312,7 @@ OcFixAppleBootDevicePath (
continue
;
}
return
FALSE
;
return
-
1
;
}
default:
...
...
@@ -325,7 +338,7 @@ OcFixAppleBootDevicePath (
continue
;
}
return
FALSE
;
return
-
1
;
}
case
ACPI_EXTENDED_DP
:
...
...
@@ -351,7 +364,7 @@ OcFixAppleBootDevicePath (
continue
;
}
return
FALSE
;
return
-
1
;
}
default:
...
...
@@ -361,7 +374,7 @@ OcFixAppleBootDevicePath (
}
}
return
TRUE
;
return
Result
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录