+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+
#include <geekos/ring_buffer.h>
#include <geekos/malloc.h>
#include <geekos/ktypes.h>
-
+#include <geekos/debug.h>
void init_ring_buffer(struct ring_buffer * ring, uint_t size) {
static inline uchar_t * get_read_ptr(struct ring_buffer * ring) {
- return (uchar_t *)&(ring->buf + ring->start);
+ return (uchar_t *)(ring->buf + ring->start);
}
static inline uchar_t * get_write_ptr(struct ring_buffer * ring) {
- return (uchar_t *)&(ring->buf + ring->end);
+ return (uchar_t *)(ring->buf + ring->end);
}
int section_len = get_read_section_size(ring);
memcpy(dst, get_read_ptr(ring), section_len);
- ring->start = 0;
-
- memcpy(dst + section_len, get_read_ptr(ring), read_len - section_len);
+ memcpy(dst + section_len, ring->buf, read_len - section_len);
- ring->start += read_len - section_len;
+ ring->start = read_len - section_len;
} else {
memcpy(dst, get_read_ptr(ring), read_len);
}
+
+
+int rb_peek(struct ring_buffer * ring, char * dst, uint_t len) {
+ int read_len = 0;
+ int ring_data_len = ring->current_len;
+
+ read_len = (len > ring_data_len) ? ring_data_len : len;
+
+ if (is_read_loop(ring, read_len)) {
+ int section_len = get_read_section_size(ring);
+
+ memcpy(dst, get_read_ptr(ring), section_len);
+ memcpy(dst + section_len, ring->buf, read_len - section_len);
+ } else {
+ memcpy(dst, get_read_ptr(ring), read_len);
+ }
+
+ return read_len;
+}
+
+
+int rb_delete(struct ring_buffer * ring, uint_t len) {
+ int del_len = 0;
+ int ring_data_len = ring->current_len;
+
+ del_len = (len > ring_data_len) ? ring_data_len : len;
+
+ if (is_read_loop(ring, del_len)) {
+ int section_len = get_read_section_size(ring);
+ ring->start = del_len - section_len;
+ } else {
+ ring->start += del_len;
+ }
+
+ ring->current_len -= del_len;
+ return del_len;
+}
+
+
int rb_write(struct ring_buffer * ring, char * src, uint_t len) {
int write_len = 0;
int ring_avail_space = ring->size - ring->current_len;
return write_len;
}
+
+
+void print_ring_buffer(struct ring_buffer * ring) {
+ int ctr = 0;
+
+ for (ctr = 0; ctr < ring->current_len; ctr++) {
+ int index = (ctr + ring->start) % ring->size;
+
+ PrintBoth("Entry %d (index=%d): %c\n", ctr, index, ring->buf[index]);
+ }
+}