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 remote-tracking branch 'upstream/master'

This commit is contained in:
Bernard Xiong 2015-01-29 09:14:12 +00:00
parent 068e2f95a1 aaacd40425
commit 7f4e647971
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/dfs/src/dfs.c
View File

@ -234,7 +234,11 @@ int fd_is_open(const char *pathname)
mountpath = fullpath + strlen(fs->path); mountpath = fullpath + strlen(fs->path);
dfs_lock(); dfs_lock();
#ifdef DFS_USING_STDIO
for (index = 3; index < DFS_FD_MAX+3; index++)
#else
for (index = 0; index < DFS_FD_MAX; index++) for (index = 0; index < DFS_FD_MAX; index++)
#endif
{ {
fd = &(fd_table[index]); fd = &(fd_table[index]);
if (fd->fs == RT_NULL) if (fd->fs == RT_NULL)

10
components/drivers/src/ringbuffer.c
View File

@ -100,13 +100,13 @@ rt_size_t rt_ringbuffer_put_force(struct rt_ringbuffer *rb,
const rt_uint8_t *ptr, const rt_uint8_t *ptr,
rt_uint16_t length) rt_uint16_t length)
{ {
enum rt_ringbuffer_state old_state; rt_uint16_t space_length;
RT_ASSERT(rb != RT_NULL); 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; length = rb->buffer_size;
if (rb->buffer_size - rb->write_index > length) 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 */ * length of data in current mirror */
rb->write_index += length; rb->write_index += length;
if (old_state == RT_RINGBUFFER_FULL) if (length > space_length)
rb->read_index = rb->write_index; rb->read_index = rb->write_index;
return length; 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_mirror = ~rb->write_mirror;
rb->write_index = length - (rb->buffer_size - rb->write_index); 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_mirror = ~rb->read_mirror;
rb->read_index = rb->write_index; rb->read_index = rb->write_index;