payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修复tty读取不完整的问题

Browse Source
This commit is contained in:
payton 2023-12-07 15:56:49 +08:00
parent 409b49d5dd
commit 93990c03a1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/application/source/sf_app/code/source/ttyusb/sf_hal_ttyusb.c
View File

@ -430,23 +430,25 @@ SINT32 sf_hal_ttyusb2_read_buf(SF_TTY_DATA_TYPE_S *recv)
TimeoutVal.tv_sec = 0; TimeoutVal.tv_sec = 0;
TimeoutVal.tv_usec = (recv->waitMs)*1000; TimeoutVal.tv_usec = (recv->waitMs)*1000;
while(waitTime--) while(waitTime)
{ {
s32ret = select(TtyUSB2Fd + 1, &read_fds, NULL, NULL, &TimeoutVal); s32ret = select(TtyUSB2Fd + 1, &read_fds, NULL, NULL, &TimeoutVal);
if (s32ret > 0) { if (s32ret > 0) {
if (FD_ISSET(TtyUSB2Fd, &read_fds)) { if (FD_ISSET(TtyUSB2Fd, &read_fds)) {
s32ret = read(TtyUSB2Fd, recv->data+dataL, recv->lenMax); s32ret = read(TtyUSB2Fd, recv->data+dataL, recv->lenMax);
dataL += strlen(recv->data); dataL += strlen(recv->data);
if ((((dataL) >= (recv->len)) && (strstr(recv->data, recv->cmp))) || (strstr(recv->data, recv->cmperr))) { if (((dataL) >= (recv->len)) || (strstr(recv->data, recv->cmp)) || (strstr(recv->data, recv->cmperr))) {
break; break;
} }
} }
} }
else if (s32ret < 0) { else if (s32ret < 0) {
waitTime--;
MLOGE(" select failed\n"); MLOGE(" select failed\n");
continue; continue;
} }
else if (0 == s32ret) { else if (0 == s32ret) {
waitTime--;
MLOGW("FIFO select timeout [%d]\n",waitTime); MLOGW("FIFO select timeout [%d]\n",waitTime);
continue; continue;
} }