summaryrefslogtreecommitdiff
path: root/components/drivers/src/ringbuffer.c
diff options
context:
space:
mode:
author[email protected] <[email protected]>2012-12-26 00:29:42 +0000
committer[email protected] <[email protected]>2012-12-26 00:29:42 +0000
commitef5c47e6840a2d2cd986f4ecfdde87c9148375b2 (patch)
tree401d4b4000b3b9f9c210861cd9cc0dd9613d95f0 /components/drivers/src/ringbuffer.c
parentf29cfc5e79b11acb28c00d870764bc0afe586a39 (diff)
fixed the coding style in components/drivers/src
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2529 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'components/drivers/src/ringbuffer.c')
-rw-r--r--components/drivers/src/ringbuffer.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/components/drivers/src/ringbuffer.c b/components/drivers/src/ringbuffer.c
index 6454fd9932..6ef8f5da63 100644
--- a/components/drivers/src/ringbuffer.c
+++ b/components/drivers/src/ringbuffer.c
@@ -38,7 +38,7 @@ rt_size_t rt_ringbuffer_put(struct rt_ringbuffer *rb,
rt_uint16_t size;
rt_uint16_t mask;
rt_uint16_t write_position;
-
+
RT_ASSERT(rb != RT_NULL);
mask = rb->buffer_size - 1;
@@ -60,9 +60,11 @@ rt_size_t rt_ringbuffer_put(struct rt_ringbuffer *rb,
}
else
{
- memcpy(&rb->buffer_ptr[write_position], ptr,
+ memcpy(&rb->buffer_ptr[write_position],
+ ptr,
rb->buffer_size - write_position);
- memcpy(&rb->buffer_ptr[0], &ptr[rb->buffer_size - write_position],
+ memcpy(&rb->buffer_ptr[0],
+ &ptr[rb->buffer_size - write_position],
length - (rb->buffer_size - write_position));
}
rb->write_index += length;
@@ -126,9 +128,11 @@ rt_size_t rt_ringbuffer_get(struct rt_ringbuffer *rb,
else
{
/* copy first and second */
- memcpy(ptr, &rb->buffer_ptr[read_position],
+ memcpy(ptr,
+ &rb->buffer_ptr[read_position],
rb->buffer_size - read_position);
- memcpy(&ptr[rb->buffer_size - read_position], &rb->buffer_ptr[0],
+ memcpy(&ptr[rb->buffer_size - read_position],
+ &rb->buffer_ptr[0],
length - rb->buffer_size + read_position);
}
rb->read_index += length;