diff options
| author | Bernard Xiong <[email protected]> | 2015-01-29 09:14:12 +0000 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2015-01-29 09:14:12 +0000 |
| commit | 7f4e647971a8bef8ed10204daa58ed55cc2936c1 (patch) | |
| tree | 6823a2f8c84c1b5dff1850afa87ca265e9b88958 /components | |
| parent | 068e2f95a1483ae26a57949b4d04ef51629d4c5d (diff) | |
| parent | aaacd40425212ad2fab9bf31138f2e3a004b73e4 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'components')
| -rw-r--r-- | components/dfs/src/dfs.c | 4 | ||||
| -rw-r--r-- | components/drivers/src/ringbuffer.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/components/dfs/src/dfs.c b/components/dfs/src/dfs.c index 4e38615ba7..7e56137aba 100644 --- a/components/dfs/src/dfs.c +++ b/components/dfs/src/dfs.c @@ -234,7 +234,11 @@ int fd_is_open(const char *pathname) mountpath = fullpath + strlen(fs->path); dfs_lock(); +#ifdef DFS_USING_STDIO + for (index = 3; index < DFS_FD_MAX+3; index++) +#else for (index = 0; index < DFS_FD_MAX; index++) +#endif { fd = &(fd_table[index]); if (fd->fs == RT_NULL) diff --git a/components/drivers/src/ringbuffer.c b/components/drivers/src/ringbuffer.c index 6212b10258..8c2705ceb1 100644 --- a/components/drivers/src/ringbuffer.c +++ b/components/drivers/src/ringbuffer.c @@ -100,13 +100,13 @@ rt_size_t rt_ringbuffer_put_force(struct rt_ringbuffer *rb, const rt_uint8_t *ptr, rt_uint16_t length) { - enum rt_ringbuffer_state old_state; + rt_uint16_t space_length; RT_ASSERT(rb != RT_NULL); - old_state = rt_ringbuffer_status(rb); + space_length = rt_ringbuffer_space_len(rb); - if (length > rb->buffer_size) + if (length > space_length) length = rb->buffer_size; if (rb->buffer_size - rb->write_index > length) @@ -117,7 +117,7 @@ rt_size_t rt_ringbuffer_put_force(struct rt_ringbuffer *rb, * length of data in current mirror */ rb->write_index += length; - if (old_state == RT_RINGBUFFER_FULL) + if (length > space_length) rb->read_index = rb->write_index; return length; @@ -134,7 +134,7 @@ rt_size_t rt_ringbuffer_put_force(struct rt_ringbuffer *rb, rb->write_mirror = ~rb->write_mirror; rb->write_index = length - (rb->buffer_size - rb->write_index); - if (old_state == RT_RINGBUFFER_FULL) + if (length > space_length) { rb->read_mirror = ~rb->read_mirror; rb->read_index = rb->write_index; |