From 93990c03a1368fa9a3582afd7c387b027a00ec79 Mon Sep 17 00:00:00 2001 From: payton Date: Thu, 7 Dec 2023 15:56:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dtty=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E4=B8=8D=E5=AE=8C=E6=95=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/sf_app/code/source/ttyusb/sf_hal_ttyusb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/application/source/sf_app/code/source/ttyusb/sf_hal_ttyusb.c b/code/application/source/sf_app/code/source/ttyusb/sf_hal_ttyusb.c index 68274422b..d1626dcb0 100755 --- a/code/application/source/sf_app/code/source/ttyusb/sf_hal_ttyusb.c +++ b/code/application/source/sf_app/code/source/ttyusb/sf_hal_ttyusb.c @@ -430,23 +430,25 @@ SINT32 sf_hal_ttyusb2_read_buf(SF_TTY_DATA_TYPE_S *recv) TimeoutVal.tv_sec = 0; TimeoutVal.tv_usec = (recv->waitMs)*1000; - while(waitTime--) + while(waitTime) { s32ret = select(TtyUSB2Fd + 1, &read_fds, NULL, NULL, &TimeoutVal); if (s32ret > 0) { if (FD_ISSET(TtyUSB2Fd, &read_fds)) { s32ret = read(TtyUSB2Fd, recv->data+dataL, recv->lenMax); 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; } } } else if (s32ret < 0) { + waitTime--; MLOGE(" select failed\n"); continue; } else if (0 == s32ret) { + waitTime--; MLOGW("FIFO select timeout [%d]\n",waitTime); continue; }