misc: adjust formatting
This commit is contained in:
@@ -10,7 +10,7 @@ size_t ringbuffer_unread(struct ringbuffer *ring_buffer)
|
||||
|
||||
if (ring_buffer->r_read_ptr > ring_buffer->r_write_ptr) {
|
||||
return (ring_buffer->r_size - ring_buffer->r_read_ptr)
|
||||
+ ring_buffer->r_write_ptr;
|
||||
+ ring_buffer->r_write_ptr;
|
||||
} else {
|
||||
return (ring_buffer->r_write_ptr - ring_buffer->r_read_ptr);
|
||||
}
|
||||
@@ -26,7 +26,7 @@ size_t ringbuffer_avail(struct ringbuffer *ring_buffer)
|
||||
return ring_buffer->r_read_ptr - ring_buffer->r_write_ptr - 1;
|
||||
} else {
|
||||
return (ring_buffer->r_size - ring_buffer->r_write_ptr)
|
||||
+ ring_buffer->r_read_ptr - 1;
|
||||
+ ring_buffer->r_read_ptr - 1;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,7 +46,11 @@ static inline void increment_write(struct ringbuffer *ring_buffer)
|
||||
}
|
||||
}
|
||||
|
||||
size_t ringbuffer_read(struct ringbuffer *ring_buffer, size_t size, void *p, mango_flags_t flags)
|
||||
size_t ringbuffer_read(
|
||||
struct ringbuffer *ring_buffer,
|
||||
size_t size,
|
||||
void *p,
|
||||
mango_flags_t flags)
|
||||
{
|
||||
if (!ring_buffer) {
|
||||
return 0;
|
||||
@@ -59,7 +63,9 @@ size_t ringbuffer_read(struct ringbuffer *ring_buffer, size_t size, void *p, man
|
||||
while (collected < size) {
|
||||
spin_lock_irqsave(&ring_buffer->r_lock, &lock_flags);
|
||||
while (ringbuffer_unread(ring_buffer) > 0 && collected < size) {
|
||||
buffer[collected] = ring_buffer->r_buffer[ring_buffer->r_read_ptr];
|
||||
buffer[collected]
|
||||
= ring_buffer
|
||||
->r_buffer[ring_buffer->r_read_ptr];
|
||||
increment_read(ring_buffer);
|
||||
collected++;
|
||||
}
|
||||
@@ -67,7 +73,9 @@ size_t ringbuffer_read(struct ringbuffer *ring_buffer, size_t size, void *p, man
|
||||
wakeup_queue(&ring_buffer->r_wait_writers);
|
||||
|
||||
if (flags & S_NOBLOCK) {
|
||||
spin_unlock_irqrestore(&ring_buffer->r_lock, lock_flags);
|
||||
spin_unlock_irqrestore(
|
||||
&ring_buffer->r_lock,
|
||||
lock_flags);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -87,7 +95,11 @@ size_t ringbuffer_read(struct ringbuffer *ring_buffer, size_t size, void *p, man
|
||||
return collected;
|
||||
}
|
||||
|
||||
size_t ringbuffer_write(struct ringbuffer *ring_buffer, size_t size, const void *p, mango_flags_t flags)
|
||||
size_t ringbuffer_write(
|
||||
struct ringbuffer *ring_buffer,
|
||||
size_t size,
|
||||
const void *p,
|
||||
mango_flags_t flags)
|
||||
{
|
||||
if (!ring_buffer || !size) {
|
||||
return 0;
|
||||
@@ -101,7 +113,8 @@ size_t ringbuffer_write(struct ringbuffer *ring_buffer, size_t size, const void
|
||||
spin_lock_irqsave(&ring_buffer->r_lock, &lock_flags);
|
||||
|
||||
while (ringbuffer_avail(ring_buffer) > 0 && written < size) {
|
||||
ring_buffer->r_buffer[ring_buffer->r_write_ptr] = buffer[written];
|
||||
ring_buffer->r_buffer[ring_buffer->r_write_ptr]
|
||||
= buffer[written];
|
||||
increment_write(ring_buffer);
|
||||
written++;
|
||||
}
|
||||
@@ -109,7 +122,9 @@ size_t ringbuffer_write(struct ringbuffer *ring_buffer, size_t size, const void
|
||||
wakeup_queue(&ring_buffer->r_wait_readers);
|
||||
|
||||
if (flags & S_NOBLOCK) {
|
||||
spin_unlock_irqrestore(&ring_buffer->r_lock, lock_flags);
|
||||
spin_unlock_irqrestore(
|
||||
&ring_buffer->r_lock,
|
||||
lock_flags);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user