diff options
| author | Arda <[email protected]> | 2015-03-10 12:01:25 +0800 |
|---|---|---|
| committer | Arda <[email protected]> | 2015-03-10 12:01:25 +0800 |
| commit | 4a9c3fae2900da71cdf026063679d2c25f266fd7 (patch) | |
| tree | 2fba8aec09a671cc36d281365351003a988eb57d /components/drivers/src | |
| parent | 5fe489a3949cdbb947d3c719a7ef958a37e8d826 (diff) | |
| parent | 89ceb7dc27895225bc221d22c035d5cc8802a256 (diff) | |
Merge pull request #3 from RT-Thread/master
sync with official source
Diffstat (limited to 'components/drivers/src')
| -rw-r--r-- | components/drivers/src/ringbuffer.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; |
