Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Kernel Liteos A
提交
9e9c7b28
K
Kernel Liteos A
项目概览
OpenHarmony
/
Kernel Liteos A
1 年多 前同步成功
通知
464
Star
414
Fork
55
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
4
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel Liteos A
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
4
Issue
4
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
9e9c7b28
编写于
7月 22, 2021
作者:
O
openharmony_ci
提交者:
Gitee
7月 22, 2021
浏览文件
操作
浏览文件
下载
差异文件
!448 fix: Ctrl-C move out of LOS_MAGIC_KEY_ENABLE
Merge pull request !448 from MGY917/Ctrl-C_support
上级
77270dd7
40f239a7
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
6 addition
and
20 deletion
+6
-20
platform/los_magickey.c
platform/los_magickey.c
+6
-12
tools/build/config/debug/mini_qemu_liteos_a_clang.config
tools/build/config/debug/mini_qemu_liteos_a_clang.config
+0
-1
tools/build/config/hispark_aries_release.config
tools/build/config/hispark_aries_release.config
+0
-1
tools/build/config/hispark_taurus_release.config
tools/build/config/hispark_taurus_release.config
+0
-1
tools/build/config/hispark_taurus_release_tee.config
tools/build/config/hispark_taurus_release_tee.config
+0
-1
tools/build/config/ipcamera_hi3516dv300_liteos_release.config
...s/build/config/ipcamera_hi3516dv300_liteos_release.config
+0
-1
tools/build/config/ipcamera_hi3516dv300_liteos_release_tee.config
...ild/config/ipcamera_hi3516dv300_liteos_release_tee.config
+0
-1
tools/build/config/ipcamera_hi3518ev300_liteos_release.config
...s/build/config/ipcamera_hi3518ev300_liteos_release.config
+0
-1
tools/build/config/qemu_arm_virt_debug_shell.config
tools/build/config/qemu_arm_virt_debug_shell.config
+0
-1
未找到文件。
platform/los_magickey.c
浏览文件 @
9e9c7b28
...
...
@@ -66,12 +66,6 @@ STATIC MagicKeyOp g_magicHelpOp = {
.
magicKey
=
0x1a
/* ctrl + z */
};
STATIC
MagicKeyOp
g_magicKillPgrp
=
{
.
opHandler
=
KillPgrp
,
.
helpMsg
=
"Show all magic op key(ctrl+c) "
,
.
magicKey
=
0x03
/* ctrl + c */
};
/*
* NOTICE:Suggest don't use
* ctrl+h/backspace=0x8,
...
...
@@ -87,7 +81,7 @@ STATIC MagicKeyOp *g_magicOpTable[MAGIC_KEY_NUM] = {
&
g_magicPanicOp
,
/* ctrl + p */
&
g_magicTaskShowOp
,
/* ctrl + t */
&
g_magicHelpOp
,
/* ctrl + z */
&
g_magicKillPgrp
/* ctrl + c */
NULL
};
STATIC
VOID
OsMagicHelp
(
VOID
)
...
...
@@ -129,7 +123,11 @@ INT32 CheckMagicKey(CHAR key)
#ifdef LOSCFG_ENABLE_MAGICKEY
INT32
i
;
STATIC
UINT32
magicKeySwitch
=
0
;
if
(
key
==
0x12
)
{
/* ctrl + r */
if
(
key
==
0x03
)
{
/* ctrl + c */
KillPgrp
();
return
0
;
}
else
if
(
key
==
0x12
)
{
/* ctrl + r */
magicKeySwitch
=
~
magicKeySwitch
;
if
(
magicKeySwitch
!=
0
)
{
PRINTK
(
"Magic key on
\n
"
);
...
...
@@ -137,11 +135,7 @@ INT32 CheckMagicKey(CHAR key)
PRINTK
(
"Magic key off
\n
"
);
}
return
1
;
}
else
if
(
key
==
0x03
)
{
/* ctrl + c */
KillPgrp
();
return
0
;
}
if
(
magicKeySwitch
!=
0
)
{
for
(
i
=
0
;
i
<
MAGIC_KEY_NUM
;
i
++
)
{
if
(
g_magicOpTable
[
i
]
!=
NULL
&&
key
==
g_magicOpTable
[
i
]
->
magicKey
)
{
...
...
tools/build/config/debug/mini_qemu_liteos_a_clang.config
浏览文件 @
9e9c7b28
...
...
@@ -10,6 +10,5 @@ LOSCFG_BOARD_CONFIG_PATH="device/qemu/arm_virt/liteos_a/config/board"
# LOSCFG_FS_VFS is not set
# LOSCFG_NET_LWIP_SACK is not set
# LOSCFG_PLATFORM_ADAPT is not set
# LOSCFG_ENABLE_MAGICKEY is not set
# LOSCFG_DRIVERS is not set
# LOSCFG_SECURITY is not set
tools/build/config/hispark_aries_release.config
浏览文件 @
9e9c7b28
...
...
@@ -8,7 +8,6 @@ LOSCFG_FS_VFS_BLOCK_DEVICE=y
LOSCFG_FS_FAT_CACHE_SYNC_THREAD
=
y
LOSCFG_FS_FAT_VIRTUAL_PARTITION
=
y
LOSCFG_ENABLE_OOM_LOOP_TASK
=
y
# LOSCFG_ENABLE_MAGICKEY is not set
LOSCFG_DRIVERS_USB_HOST_XHCI
=
y
LOSCFG_DRIVERS_USB_ETHERNET
=
y
LOSCFG_DRIVERS_USB_WIRELESS
=
y
...
...
tools/build/config/hispark_taurus_release.config
浏览文件 @
9e9c7b28
...
...
@@ -9,7 +9,6 @@ LOSCFG_KERNEL_VDSO=y
LOSCFG_FS_VFS_BLOCK_DEVICE
=
y
LOSCFG_FS_FAT_VIRTUAL_PARTITION
=
y
LOSCFG_ENABLE_OOM_LOOP_TASK
=
y
# LOSCFG_ENABLE_MAGICKEY is not set
LOSCFG_DRIVERS_USB_HOST_XHCI
=
y
LOSCFG_DRIVERS_USB_ETHERNET
=
y
LOSCFG_DRIVERS_USB_WIRELESS
=
y
...
...
tools/build/config/hispark_taurus_release_tee.config
浏览文件 @
9e9c7b28
...
...
@@ -10,7 +10,6 @@ LOSCFG_KERNEL_VDSO=y
LOSCFG_FS_VFS_BLOCK_DEVICE
=
y
LOSCFG_FS_FAT_VIRTUAL_PARTITION
=
y
LOSCFG_ENABLE_OOM_LOOP_TASK
=
y
# LOSCFG_ENABLE_MAGICKEY is not set
LOSCFG_DRIVERS_USB_HOST_XHCI
=
y
LOSCFG_DRIVERS_USB_ETHERNET
=
y
LOSCFG_DRIVERS_USB_WIRELESS
=
y
...
...
tools/build/config/ipcamera_hi3516dv300_liteos_release.config
浏览文件 @
9e9c7b28
...
...
@@ -9,7 +9,6 @@ LOSCFG_FS_VFS_BLOCK_DEVICE=y
LOSCFG_FS_FAT_VIRTUAL_PARTITION
=
y
LOSCFG_NET_LWIP_SACK_2_0
=
y
LOSCFG_ENABLE_OOM_LOOP_TASK
=
y
# LOSCFG_ENABLE_MAGICKEY is not set
LOSCFG_DRIVERS_USB_HOST_XHCI
=
y
LOSCFG_DRIVERS_USB_ETHERNET
=
y
LOSCFG_DRIVERS_USB_WIRELESS
=
y
...
...
tools/build/config/ipcamera_hi3516dv300_liteos_release_tee.config
浏览文件 @
9e9c7b28
...
...
@@ -9,7 +9,6 @@ LOSCFG_FS_VFS_BLOCK_DEVICE=y
LOSCFG_FS_FAT_VIRTUAL_PARTITION
=
y
LOSCFG_NET_LWIP_SACK_2_0
=
y
LOSCFG_ENABLE_OOM_LOOP_TASK
=
y
# LOSCFG_ENABLE_MAGICKEY is not set
LOSCFG_DRIVERS_USB_HOST_XHCI
=
y
LOSCFG_DRIVERS_USB_ETHERNET
=
y
LOSCFG_DRIVERS_USB_WIRELESS
=
y
...
...
tools/build/config/ipcamera_hi3518ev300_liteos_release.config
浏览文件 @
9e9c7b28
...
...
@@ -8,7 +8,6 @@ LOSCFG_FS_FAT_CACHE_SYNC_THREAD=y
LOSCFG_FS_FAT_VIRTUAL_PARTITION
=
y
LOSCFG_NET_LWIP_SACK_2_0
=
y
LOSCFG_ENABLE_OOM_LOOP_TASK
=
y
# LOSCFG_ENABLE_MAGICKEY is not set
LOSCFG_DRIVERS_USB_HOST_XHCI
=
y
LOSCFG_DRIVERS_USB_ETHERNET
=
y
LOSCFG_DRIVERS_USB_WIRELESS
=
y
...
...
tools/build/config/qemu_arm_virt_debug_shell.config
浏览文件 @
9e9c7b28
...
...
@@ -6,7 +6,6 @@ LOSCFG_FS_FAT=y
LOSCFG_FS_FAT_DISK
=
y
LOSCFG_FS_FAT_VIRTUAL_PARTITION
=
y
LOSCFG_FS_VFS_BLOCK_DEVICE
=
y
LOSCFG_ENABLE_MAGICKEY
=
y
LOSCFG_DEBUG_VERSION
=
y
# LOSCFG_SHELL_LK is not set
LOSCFG_USER_INIT_DEBUG
=
y
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录