summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorzylx <[email protected]>2019-02-21 11:09:36 +0800
committerzylx <[email protected]>2019-02-21 11:09:41 +0800
commite2c0749d04652c8ea0934e0d2b3ca26733fad815 (patch)
tree75ceecac168c018d512dd44478731f42c488656a /components
parent6a150c0963d4db931f71c5716c1811b672a19af3 (diff)
[components][ymodem]ymodem 握手阶段增加延时,防止数据接收不全
Diffstat (limited to 'components')
-rw-r--r--components/utilities/ymodem/ymodem.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/components/utilities/ymodem/ymodem.c b/components/utilities/ymodem/ymodem.c
index c98c7f6cb6..716c702328 100644
--- a/components/utilities/ymodem/ymodem.c
+++ b/components/utilities/ymodem/ymodem.c
@@ -125,6 +125,7 @@ static rt_err_t _rym_do_handshake(
rt_size_t i;
rt_uint16_t recv_crc, cal_crc;
rt_size_t data_sz;
+ rt_tick_t tick;
ctx->stage = RYM_STAGE_ESTABLISHING;
/* send C every second, so the sender could know we are waiting for it. */
@@ -149,8 +150,17 @@ static rt_err_t _rym_do_handshake(
return -RYM_ERR_TMO;
}
- i = _rym_read_data(ctx, data_sz-1);
- if (i != (data_sz-1))
+ /* receive all data */
+ i = 0;
+ /* automatic exit after receiving specified length data, timeout: 100ms */
+ tick = rt_tick_get();
+ while (rt_tick_get() <= (tick + rt_tick_from_millisecond(100)) && i < (data_sz-1))
+ {
+ i += _rym_read_data(ctx, data_sz - 1);
+ rt_thread_mdelay(5);
+ }
+
+ if (i != (data_sz - 1))
return -RYM_ERR_DSZ;
/* sanity check */