Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
OpenCorePKG_MOD
提交
6caff2a4
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,发现更多精彩内容 >>
提交
6caff2a4
编写于
5月 10, 2020
作者:
V
vit9696
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
OpenCoreUefiInOut: Fixed `ReconnectOnResChange` reconnecting even without res change
上级
7dac5f8f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
14 deletion
+20
-14
Changelog.md
Changelog.md
+1
-0
Library/OcConsoleLib/OcConsoleLib.c
Library/OcConsoleLib/OcConsoleLib.c
+15
-12
Platform/OpenCore/OpenCoreUefiInOut.c
Platform/OpenCore/OpenCoreUefiInOut.c
+4
-2
未找到文件。
Changelog.md
浏览文件 @
6caff2a4
...
...
@@ -15,6 +15,7 @@ OpenCore Changelog
-
Enforced the use of builtin picker when external fails
-
Fixed warnings for empty NVRAM variables (e.g. rtc-blacklist)
-
Added
`ApplePanic`
to store panic logs on ESP root
-
Fixed
`ReconnectOnResChange`
reconnecting even without res change
#### v0.5.8
-
Fixed invalid CPU object reference in SSDT-PLUG
...
...
Library/OcConsoleLib/OcConsoleLib.c
浏览文件 @
6caff2a4
...
...
@@ -120,7 +120,7 @@ OcSetConsoleResolutionForProtocol (
if
(
ModeNumber
==
GraphicsOutput
->
Mode
->
Mode
)
{
DEBUG
((
DEBUG_INFO
,
"OCC: Current mode matches desired mode %u
\n
"
,
(
UINT32
)
ModeNumber
));
return
EFI_
SUCCESS
;
return
EFI_
ALREADY_STARTED
;
}
//
...
...
@@ -275,15 +275,16 @@ OcSetConsoleResolution (
IN
UINT32
Bpp
OPTIONAL
)
{
EFI_STATUS
Status
;
EFI_STATUS
Result
;
EFI_GRAPHICS_OUTPUT_PROTOCOL
*
GraphicsOutput
;
#ifdef OC_CONSOLE_CHANGE_ALL_RESOLUTIONS
EFI_STATUS
Status
;
UINTN
HandleCount
;
EFI_HANDLE
*
HandleBuffer
;
UINTN
Index
;
Status
=
gBS
->
LocateHandleBuffer
(
Result
=
gBS
->
LocateHandleBuffer
(
ByProtocol
,
&
gEfiGraphicsOutputProtocolGuid
,
NULL
,
...
...
@@ -291,7 +292,9 @@ OcSetConsoleResolution (
&
HandleBuffer
);
if
(
!
EFI_ERROR
(
Status
))
{
if
(
!
EFI_ERROR
(
Result
))
{
Result
=
EFI_NOT_FOUND
;
DEBUG
((
DEBUG_INFO
,
"OCC: Found %u handles with GOP
\n
"
,
(
UINT32
)
HandleCount
));
for
(
Index
=
0
;
Index
<
HandleCount
;
++
Index
)
{
...
...
@@ -308,29 +311,29 @@ OcSetConsoleResolution (
continue
;
}
Status
=
OcSetConsoleResolutionForProtocol
(
GraphicsOutput
,
Width
,
Height
,
Bpp
);
Result
=
OcSetConsoleResolutionForProtocol
(
GraphicsOutput
,
Width
,
Height
,
Bpp
);
}
FreePool
(
HandleBuffer
);
}
else
{
DEBUG
((
DEBUG_INFO
,
"OCC: Failed to find handles with GOP
\n
"
));
DEBUG
((
DEBUG_INFO
,
"OCC: Failed to find handles with GOP
- %r
\n
"
,
Result
));
}
#else
Status
=
gBS
->
HandleProtocol
(
Result
=
gBS
->
HandleProtocol
(
gST
->
ConsoleOutHandle
,
&
gEfiGraphicsOutputProtocolGuid
,
(
VOID
**
)
&
GraphicsOutput
);
if
(
EFI_ERROR
(
Status
))
{
DEBUG
((
DEBUG_WARN
,
"OCC: Missing GOP on ConOut - %r
\n
"
,
Status
));
return
Status
;
if
(
EFI_ERROR
(
Result
))
{
DEBUG
((
DEBUG_WARN
,
"OCC: Missing GOP on ConOut - %r
\n
"
,
Result
));
return
Result
;
}
Status
=
OcSetConsoleResolutionForProtocol
(
GraphicsOutput
,
Width
,
Height
,
Bpp
);
Result
=
OcSetConsoleResolutionForProtocol
(
GraphicsOutput
,
Width
,
Height
,
Bpp
);
#endif
return
Status
;
return
Result
;
}
EFI_STATUS
...
...
Platform/OpenCore/OpenCoreUefiInOut.c
浏览文件 @
6caff2a4
...
...
@@ -227,7 +227,7 @@ OcLoadUefiOutputSupport (
Bpp
);
DEBUG
((
EFI_ERROR
(
Status
)
?
DEBUG_WARN
:
DEBUG_INFO
,
EFI_ERROR
(
Status
)
&&
Status
!=
EFI_ALREADY_STARTED
?
DEBUG_WARN
:
DEBUG_INFO
,
"OC: Changed resolution to %ux%u@%u (max: %d) from %a - %r
\n
"
,
Width
,
Height
,
...
...
@@ -236,6 +236,8 @@ OcLoadUefiOutputSupport (
OC_BLOB_GET
(
&
Config
->
Uefi
.
Output
.
Resolution
),
Status
));
}
else
{
Status
=
EFI_UNSUPPORTED
;
}
if
(
Config
->
Uefi
.
Output
.
DirectGopRendering
)
{
...
...
@@ -255,7 +257,7 @@ OcLoadUefiOutputSupport (
}
}
if
(
Config
->
Uefi
.
Output
.
ReconnectOnResChange
)
{
if
(
Config
->
Uefi
.
Output
.
ReconnectOnResChange
&&
!
EFI_ERROR
(
Status
)
)
{
OcReconnectConsole
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录