Updated according to feedback

Signed-off-by: Lucy <[email protected]>

libsharedringbuffer/include/shared_ringbuffer/shared_ringbuffer.h

@@ -57,9 +57,10 @@ void ring_init(ring_handle_t *ring, ring_buffer_t *avail, ring_buffer_t *used, n
  *
  * @return true indicates the buffer is empty, false otherwise.
  */
-static inline int ring_empty(ring_buffer_t *ring) 
+static inline bool ring_empty(ring_buffer_t *ring) 
 {
-    return !((ring->write_idx - ring->read_idx) % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT);
+    //return !((ring->write_idx - ring->read_idx) % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT);
+    return (ring->write_idx == ring->read_idx);
 }
 
 /**
@@ -69,9 +70,10 @@ static inline int ring_empty(ring_buffer_t *ring)
  *
  * @return true indicates the buffer is full, false otherwise.
  */
-static inline int ring_full(ring_buffer_t *ring)
+static inline bool ring_full(ring_buffer_t *ring)
 {
-    return !((ring->write_idx - ring->read_idx + 1) % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT);
+    //return !((ring->write_idx - ring->read_idx + 1) % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT);
+    return CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT == (ring->write_idx - ring->read_idx);
 }
 
 /**
@@ -82,7 +84,9 @@ static inline int ring_full(ring_buffer_t *ring)
  */
 static inline void notify(ring_handle_t *ring) 
 {
-    return ring->notify();
+    if (ring->notify != NULL) {
+        return ring->notify();
+    }
 }
 
 /**
@@ -102,11 +106,13 @@ static inline int enqueue(ring_buffer_t *ring, uintptr_t buffer, unsigned int le
         return -1; 
     }
 
-    ring->buffers[ring->write_idx % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT].encoded_addr = buffer;
-    ring->buffers[ring->write_idx % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT].len = len;
-    ring->buffers[ring->write_idx % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT].cookie = cookie;
+    buff_desc_t *buff_desc = &(ring->buffers[ring->write_idx % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT]);
+    buff_desc->encoded_addr = buffer;
+    buff_desc->len = len;
+    buff_desc->cookie = cookie;
     ring->write_idx++;
 
+    /* Ensure data is written back to memory */
     THREAD_MEMORY_RELEASE();
 
     return 0;
@@ -129,10 +135,12 @@ static inline int dequeue(ring_buffer_t *ring, uintptr_t *addr, unsigned int *le
         return -1;
     }
 
-    *addr = ring->buffers[ring->read_idx % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT].encoded_addr;
-    *len = ring->buffers[ring->read_idx % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT].len;
-    *cookie = ring->buffers[ring->read_idx % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT].cookie;
+    buff_desc_t *buff_desc = &(ring->buffers[ring->read_idx % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT]);
+    *addr = buff_desc->encoded_addr;
+    *len = buff_desc->len;
+    *cookie = buff_desc->cookie;
 
+    /* Ensure data is written back to memory */
     THREAD_MEMORY_RELEASE();
     ring->read_idx++;
 
@@ -209,25 +217,25 @@ static inline int dequeue_used(ring_handle_t *ring, uintptr_t *addr, unsigned in
  * @param ring Ring buffer to dequeue from.
  * @param addr pointer to the address of where to store buffer address.
  * @param len pointer to variable to store length of data dequeueing.
- * @param cookie pointer to store a pointer to this particular entry.
+ * @param pointer pointer to store the address to this particular entry.
  *
  * @return -1 when ring is empty, 0 on success.
  */
 
-static int driver_dequeue(ring_buffer_t *ring, uintptr_t *addr, unsigned int *len, void **cookie)
+static int driver_dequeue(ring_buffer_t *ring, uintptr_t *addr, unsigned int *len, void **pointer)
 {
     if (!((ring->write_idx - ring->read_idx) % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT)) {
-        ZF_LOGW("write idx = %d, read idx = %d", ring->write_idx, ring->read_idx);
         ZF_LOGW("Ring is empty");
         return -1;
     }
 
-    *addr = ring->buffers[ring->read_idx % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT].encoded_addr;
-    *len = ring->buffers[ring->read_idx % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT].len;
-    *cookie = &ring->buffers[ring->read_idx % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT];
+    buff_desc_t *buff_desc = &(ring->buffers[ring->read_idx % CONFIG_LIB_SHARED_RINGBUFFER_DESC_COUNT]);
+    *addr = buff_desc->encoded_addr;
+    *len = buff_desc->len;
+    *pointer = buff_desc;
 
     THREAD_MEMORY_RELEASE();
     ring->read_idx++;
 
     return 0;
-}
+}

libsharedringbuffer/src/shared_ringbuffer.c

@@ -18,4 +18,4 @@ void ring_init(ring_handle_t *ring, ring_buffer_t *avail, ring_buffer_t *used, n
         ring->avail_ring->write_idx = 0;
         ring->avail_ring->read_idx = 0;
     }
-}
+}