未验证 提交 ac01ffd6 编写于 作者: O openharmony_ci 提交者: Gitee

!2863 同步master上的部分内源问题修改

Merge pull request !2863 from liyan/OpenHarmony-3.1-Release
......@@ -69,9 +69,9 @@ struct MipiDsiCntlrMethod { // 核心层结构体的成员函数
</tr>
<tr id="row793312013010"><td class="cellrowborder" valign="top" width="20%" headers="mcps1.2.6.1.1 "><p id="p13933120708"><a name="p13933120708"></a><a name="p13933120708"></a>getCmd</p>
</td>
<td class="cellrowborder" valign="top" width="20%" headers="mcps1.2.6.1.2 "><p id="p199331906010"><a name="p199331906010"></a><a name="p199331906010"></a>cntlr: 结构体指针,MipiDsi控制器 ;</p>
<td class="cellrowborder" valign="top" width="20%" headers="mcps1.2.6.1.2 "><p id="p199331906010"><a name="p199331906010"></a><a name="p199331906010"></a>cntlr:结构体指针,MipiDsi控制器;</br>cmd:传入的命令描述结构体指针;</br>readLen:读取的数据大小;</p>
</td>
<td class="cellrowborder" valign="top" width="20%" headers="mcps1.2.6.1.3 "><p id="p139331001602"><a name="p139331001602"></a><a name="p139331001602"></a>cmd: 结构体指针,用于传出指令值;</p>
<td class="cellrowborder" valign="top" width="20%" headers="mcps1.2.6.1.3 "><p id="p139331001602"><a name="p139331001602"></a><a name="p139331001602"></a>out:结构体指针,用于存储读取的数据。</p>
</td>
<td class="cellrowborder" valign="top" width="20%" headers="mcps1.2.6.1.4 "><p id="p993390900"><a name="p993390900"></a><a name="p993390900"></a>HDF_STATUS相关状态</p>
</td>
......
......@@ -535,10 +535,10 @@ UART模块适配HDF框架的三个环节是配置属性文件,实例化驱动
if (port->physBase != 0) {
OsalIoUnmap((void *)port->physBase);//地址反映射
}
(void)OsalMemFree(port);
OsalMemFree(port);
udd->private = NULL;
}
(void)OsalMemFree(udd);//释放UartDriverData
OsalMemFree(udd);//释放UartDriverData
host->priv = NULL;
}
```
......
......@@ -541,12 +541,12 @@ static int32_t TestCaseWatchdog(void)
/* 接下来持续不喂狗,使得看门狗计时器超时 */
for (i = 0; i < WATCHDOG_TEST_FEED_TIME; i++) {
HDF_LOGE("%s: watiting dog buck %d times... \n", __func__, i);
HDF_LOGE("%s: watiting dog back %d times... \n", __func__, i);
OsalSleep(1);
}
/* 当不喂狗时间到达之前设定的超时时间的时候,系统会发生复位,理论上观察不到此日志的打印 */
HDF_LOGE("%s: dog has't buck!!! \n", __func__, i);
HDF_LOGE("%s: dog hasn't back!!! \n", __func__, i);
WatchdogClose(handle);
return -1;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册