Commit Graph

425 Commits

Author SHA1 Message Date
openharmony_ci
2a73894de0 !382 修复 codex告警。
Merge pull request !382 from pef/oh2.2-beta2
2021-11-08 01:27:27 +00:00
pef
923c05cd89 修复codex告警。
【背景】
1.components\fs\fs.c,g_fs判空顺序错误
2.components\shell\src\cmds\task_shellcmd.c,参数多余
3.components\shell\src\cmds\vfs_shellcmd.c,遗漏内存释放
4.kal\posix\src\pthread_mutex.c,timeout计算可能溢出

【修改方案】
1.调换g_fs判空顺序
2.去掉多余的参数
3.return前添加free函数
4.修改timeout计算方法防止溢出

【影响】
无

Change-Id: Ib6d56c92a0be01ca49222148c341db18afe72544
Signed-off-by: pef <cyd1997@126.com>
2021-11-06 08:02:41 +00:00
openharmony_ci
a55fd7c6d1 !284 M核编译配置修改同步
Merge pull request !284 from wangchen/gn_beta2
2021-08-24 07:05:51 +00:00
wangchen
df4557ff41 fix: 完善M核编译配置选项同步
【背景】同步主线修改

【修改方案】
1,同步主线修改

【影响】
对现有的产品编译不会有影响。

re #I46Y1G
Signed-off-by: wangchen <253227059@qq.com>
2021-08-24 10:54:08 +08:00
openharmony_ci
73723d73ac !280 M33平台GCC环境下TZ增加默认选项适配(同步master修改至beta2)
Merge pull request !280 from wangchen/tz_beta2
2021-08-23 06:17:06 +00:00
wangchen
6b8290e37c 【背景】M33平台GCC环境下TZ默认开启TZ。
【修改方案】
1,在M33平台下增加默认选项及开关
2,删除build.gn编译tz的部分,该部分由使用者编译在安全态
3,修改tz初始化的一个问题

【影响】
对现有的产品编译不会有影响。

re #I46R1C
Signed-off-by: wangchen <253227059@qq.com>
2021-08-23 10:44:30 +08:00
openharmony_ci
a4bea97b8b !276 fix: 删除延时节点后,存在时间无法有效刷新的场景
Merge pull request !276 from zhushengle/OpenHarmony-2.2-Beta2
2021-08-23 02:14:39 +00:00
openharmony_ci
d89faf63a2 !274 解决中断操作等接口头文件位置变更,引入的编译问题
Merge pull request !274 from JerryH/cherry-pick-1629421054
2021-08-20 06:37:50 +00:00
zhushengle
b035f5bf7c fix: 删除延时节点后,存在时间无法有效刷新的场景
Signed-off-by: zhushengle <zhushengle@huawei.com>
Change-Id: I0ce80252db6fd6ff8621ee87df0a7ecb12a1843f
2021-08-20 09:12:11 +08:00
JerryH
b0d7e9fc04 fixed 013a953 from https://gitee.com/JerryH1011/kernel_liteos_m/pulls/270
fix: 修复中断操作接口头文件位置变更,导致的编译错误

close #I4665Z

Signed-off-by: JerryH <huangjieliang@huawei.com>
Change-Id: I5596179dea198dfe571420a7640abb00587abee1
2021-08-20 00:57:34 +00:00
openharmony_ci
e21e3d5d1f !262 宏LOSCFG_SUPPORT_FATFS在fs.c中存在使用问题,导致无fatfs的情况下,编译出错
Merge pull request !262 from zhangfanfan2/cherry-pick-1628674821
2021-08-12 02:00:14 +00:00
zhangfanfan2
124dd73f79 fixed c1614ce from https://gitee.com/zhangfanfan2/kernel_liteos_m/pulls/261
fix: 宏LOSCFG_SUPPORT_FATFS在fs.c中存在使用问题,导致无fatfs的情况下,编译出错

代码中使用#ifdef LOSCFG_SUPPORT_FATFS控制业务逻辑,但LOSCFG_SUPPORT_FATFS的
默认定义为:#define LOSCFG_SUPPORT_FATFS 0,这样#ifdef LOSCFG_SUPPORT_FATFS控制
的逻辑一定会被编译。修改方式:使用的地方统一为#if的形式

close: #I44XNR

Signed-off-by: zff <zhangfanfan2@huawei.com>
2021-08-11 09:40:22 +00:00
openharmony_ci
fef2e372ff !255 新增OAT配置文件,用作oat扫描
Merge pull request !255 from SimonLi/cherry-pick-1628506091
2021-08-09 10:58:34 +00:00
openharmony_ci
d46d13e655 !255 新增OAT配置文件,用作oat扫描
Merge pull request !255 from SimonLi/cherry-pick-1628506091
2021-08-09 10:58:34 +00:00
SimonLi
90d798ae8a fixed f644571 from https://gitee.com/kkup180/kernel_liteos_m/pulls/252
chore(oat): 新增OAT配置文件,用作oat扫描

Signed-off-by: SimonLi <likailong@huawei.com>
2021-08-09 10:48:12 +00:00
openharmony_ci
1ee52d1e1f !254 license修复挑单到2.2beta2
Merge pull request !254 from lnlan/tobeta2.2_0809
2021-08-09 08:49:31 +00:00
openharmony_ci
724e7fa786 !254 license修复挑单到2.2beta2
Merge pull request !254 from lnlan/tobeta2.2_0809
2021-08-09 08:49:30 +00:00
lnlan
078adec486 style:修改 liteos_a unittest 测试文件的 licence 注释
【背景】解除告警
【修改方案】
 格式化修改告警文件的文件头注释格式

re #I44497

Signed-off-by: lanleinan <lanleinan@163.com>
Change-Id: Id2d61deb9d9a14d5e29b915c3a64c75e11e12eda
2021-08-09 08:20:47 +00:00
openharmony_ci
d0e0bb5934 !248 同步master到beta2.2
Merge pull request !248 from lnlan/to_beta2.2
2021-08-04 08:53:22 +00:00
silen
9e8ae74620 fix: timer qemu 头文件缺失
Change-Id: I763ee6f0d013d84f36da9a7cb6d369f3d02e6c45
Signed-off-by: silen <wuyunjie@huawei.com>
2021-08-04 07:59:33 +00:00
wangchen
0d5a1ce9be fix: M核代码告警清零
【背景】定期M核代码告警清零。

【修改方案】
根据工具扫描结果,对代码告警进行更改。

【影响】
对现有的产品编译不会有影响。

re #I4386N
Signed-off-by: wangchen <253227059@qq.com>
2021-08-04 07:59:25 +00:00
silen
2a7b31018f fix: open shell & fix qemu compile
Change-Id: Ia7488c02db7a41e0f681d008882b7c2721e6b207
Signed-off-by: silen <wuyunjie@huawei.com>
2021-08-04 07:59:17 +00:00
wangchen
54db6c8e7e fix: trustzone 中断适配
【背景】当前无法使用 trustzone。

【修改方案】
由于tz需要使用svc中断,因此删除之前使用的HalExcSvcCall的地方,改为HalSVCHandler

【影响】
对现有的产品编译不会有影响。

re #I42TFV
Signed-off-by: wangchen <253227059@qq.com>
2021-08-04 07:59:07 +00:00
lnlan
ef186b476e feat(kernel): 补充获取最高、最低优先级接口
【背景】
补充获取最高、最低优先级接口
【修改方案】
pthread补充这两个接口
int sched_get_priority_min(int policy)
int sched_get_priority_max(int policy)
【影响】
对现有的产品编译不会有影响。

re #I42HM7

Signed-off-by: lnlanc <lanleinan@163.com>
Change-Id: Id2ffc07e606ad497e8036f45dab1fa6a5ba981b3
2021-08-04 07:58:58 +00:00
silen
72cb77e14f fix: ping cmd compile fail
Change-Id: I692de82275b8da03ac51b493b2f74148c96574d0
Signed-off-by: silen <wuyunjie@huawei.com>
2021-08-04 07:58:16 +00:00
openharmony_ci
d5e46ad863 !229 los_swtmr.h不满足自包含要求对los_config.h存在依赖,但未包含los_config.h
Merge pull request !229 from zhangfanfan2/master
OpenHarmony-v2.2-Beta2
2021-07-20 08:09:27 +00:00
YOUR_NAME
ad8e96a00f fix: los_swtmr.h不满足自包含要求对los_config.h存在依赖,但未包含los_config.h
close: #I40DHM

Signed-off-by: zff <zhangfanfan2@huawei.com>
Change-Id: I6903d2ece13ab0a4aadbc65f737c5f5a0f0a357a
2021-07-20 14:23:40 +08:00
openharmony_ci
b3481b1fa1 !228 fix: 修复L0的cpup功能失效,恢复功能。
Merge pull request !228 from give-me-five/master
2021-07-19 13:40:49 +00:00
silen
c842251bab fix: cpup funciton repair
Change-Id: I42951b0c0aa16267b6a86a0e95929ae4dccf28ad
Signed-off-by: silen <wuyunjie@huawei.com>
2021-07-19 14:44:03 +08:00
openharmony_ci
ba27241b02 !226 fix: L0 shell去除冗余头文件及优化代码
Merge pull request !226 from give-me-five/master
2021-07-19 02:15:52 +00:00
openharmony_ci
0526c14017 !224 feat: 新增LOSCFG_BASE_CORE_TSK_SWITCH_HOOK 宏定义配置
Merge pull request !224 from zhushengle/task
2021-07-19 01:37:43 +00:00
silen
fd2227e5c8 fix: l0 shell adapt new master
Change-Id: Ia4e0c848b76e8fda7c5a2f9e1b2246b2a09947a4
Signed-off-by: silen <wuyunjie@huawei.com>
2021-07-17 19:54:44 +08:00
zhushengle
39efd6fb30 feat: 新增LOSCFG_BASE_CORE_TSK_SWITCH_HOOK 宏定义配置
优化原任务切换对外函数钩子调用为通过宏定义实现

Close #I40Q9O

Change-Id: Ie5ab75d04e2a63cb992be968d25e876fd91ee591
Signed-off-by: zhushengle <zhushengle@huawei.com>
2021-07-15 09:44:03 +08:00
openharmony_ci
f2466c4165 !223 fix: task命令的打印偏位,以及copyright遗漏
Merge pull request !223 from give-me-five/master
2021-07-15 01:37:55 +00:00
silen
ad15bbd6a4 fix: 修复task命令格式错误,增加copyright
Change-Id: Ib573f981b2a83ab6f75741dd4a670c0ef3adf3f8
Signed-off-by: silen <wuyunjie@huawei.com>
2021-07-14 16:27:30 +08:00
openharmony_ci
bbce405227 !218 feat: L0 新增shell功能,增加命令ls cd等
Merge pull request !218 from give-me-five/master
2021-07-14 03:33:18 +00:00
openharmony_ci
c7b91d7a31 !222 优化arm9调度汇编代码,任务执行默认system模式,解决多种模式使用混乱问题
Merge pull request !222 from JerryH/arm9
2021-07-14 03:11:52 +00:00
silen
97283b7c5d feat: add L0 shell function
Change-Id: I7f10bd365455c32006c22a9f6e2368fe6c229a6a
Signed-off-by: silen <wuyunjie@huawei.com>
2021-07-13 22:04:30 +08:00
JerryH1011
97b5b0837b feat: Support arm9 fiq swi mode and using system mode.
close: #I3WLCN

Change-Id: Id14c4e903ca3c3271faf2ecdf6791163ac93b9a8
Signed-off-by: JerryH1011 <huangjieliang@huawei.com>
2021-07-13 20:23:21 +08:00
openharmony_ci
73a99977de !215 [待合并]fix: 清理残留无效的trace代码
Merge pull request !215 from Zhaotianyu/0708trace_delete
2021-07-13 09:01:57 +00:00
arvinzzz
3c48951857 fix: 清理残留无效的trace代码
1. 删除残留无用的trace代码
2. 调整los_error.h中失效的错误类型定义
3. 整理los_config.h中的特性控制宏

close: #I3ZMB4
Signed-off-by: arvinzzz <zhaotianyu9@huawei.com>
Change-Id: I9f03c486b54ae66308f0dac1aa003dd2a5ef5b84
2021-07-13 11:31:32 +08:00
openharmony_ci
453f91d09c !216 m核增加getifaddrs接口
Merge pull request !216 from 刘建东/master
2021-07-12 06:37:18 +00:00
YOUR_NAME
948501ac73 feat: provide getifaddrs for liteos_m
provide getifaddrs for liteos_m

close: #I400S5

Signed-off-by: liujiandong <liujiandong1@huawei.com>
2021-07-12 10:49:33 +08:00
openharmony_ci
1ab9813256 !205 L0 LiteOS-M支持ARM9架构
Merge pull request !205 from JerryH/master
2021-07-12 00:44:56 +00:00
JerryH1011
6d7c9dfe59 feat: Support arm9
close: #I3WLCN

Change-Id: Id8e3ce9a9a7749cb27b52562e6d506803b38d9af
Signed-off-by: JerryH1011 <huangjieliang@huawei.com>
2021-07-12 06:39:24 +08:00
openharmony_ci
bf045e3eba !213 消除编译告警
Merge pull request !213 from x_xiny/master
2021-07-09 08:37:18 +00:00
x_xiny
d8c8c22666 fix:消除编译告警
【背景】
 消除编译告警

【修改方案】
 消除编译告警

 re #I3ZC1R

 Change-Id: If5748c7ed420a9ff822c20ffb17dee2815e9bddc

 Signed-off-by: x-xiny <1301913191@qq.com>

Change-Id: Id78631543b0c41f11e1c3594200a3ad43543bbf5
2021-07-09 10:05:31 +08:00
openharmony_ci
cda85bf1b0 !214 删除README中多余的changelog信息
Merge pull request !214 from 野生毛霉君/master
2021-07-06 12:41:48 +00:00
mucor
37ef8ca7ae fix: remove changelog in README
close: #I3ZECY

Signed-off-by: mucor <mucorwang@gmail.com>
2021-07-06 20:37:15 +08:00
openharmony_ci
2e621bc323 !212 littlefs stat 接口支持获取文件类型
Merge pull request !212 from LeonChan/little-stat
2021-07-06 09:31:36 +00:00