libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #299 from grissiom/next-ymodem 

Next ymodem
This commit is contained in:
Bernard Xiong 2014-07-15 18:12:15 +08:00
parent 0bc57e9b82 2aa51d42f9
commit 19ef55375a
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
components/utilities/ymodem/ymodem.c
View File

@ -70,18 +70,23 @@ static enum rym_code _rym_read_code(
struct rym_ctx *ctx, struct rym_ctx *ctx,
rt_tick_t timeout) rt_tick_t timeout)
{ {
/* consume the available sem and read the data in buffer if possible */ /* Fast path */
while (rt_sem_trytake(&ctx->sem) == RT_EOK)
;
if (rt_device_read(ctx->dev, 0, ctx->buf, 1) == 1) if (rt_device_read(ctx->dev, 0, ctx->buf, 1) == 1)
return *ctx->buf; return *ctx->buf;
/* no data yet, wait for one */
if (rt_sem_take(&ctx->sem, timeout) != RT_EOK) /* Slow path */
return RYM_CODE_NONE; do {
/* read one */ rt_size_t rsz;
if (rt_device_read(ctx->dev, 0, ctx->buf, 1) == 1)
return *ctx->buf; /* No data yet, wait for one */
return RYM_CODE_NONE; if (rt_sem_take(&ctx->sem, timeout) != RT_EOK)
return RYM_CODE_NONE;
/* Try to read one */
rsz = rt_device_read(ctx->dev, 0, ctx->buf, 1);
if (rsz == 1)
return *ctx->buf;
} while (1);
} }
/* the caller should at least alloc _RYM_STX_PKG_SZ buffer */ /* the caller should at least alloc _RYM_STX_PKG_SZ buffer */

2
components/utilities/ymodem/ymodem.h
View File

@ -52,7 +52,7 @@ enum rym_code {
#endif #endif
/* how many ticks between two handshake code. */ /* how many ticks between two handshake code. */
#ifndef RYM_CHD_INTV_TICK #ifndef RYM_CHD_INTV_TICK
#define RYM_CHD_INTV_TICK (RT_TICK_PER_SECOND / 4) #define RYM_CHD_INTV_TICK (RT_TICK_PER_SECOND * 3)
#endif #endif
enum rym_stage { enum rym_stage {