cell fixed; cell voice test passed

1 files changed, 26 insertions, 5 deletions

diff --git a/code/esp32/components/eos/msgq.c b/code/esp32/components/eos/msgq.c
index 30fb0ad..22430b4 100644
--- a/code/esp32/components/eos/msgq.c
+++ b/code/esp32/components/eos/msgq.c
@@ -3,19 +3,19 @@
 #include "eos.h"
 #include "msgq.h"
 
-#define EOS_MSGQ_IDX_MASK(IDX, SIZE)    ((IDX) & ((SIZE) - 1))
+#define IDX_MASK(IDX, SIZE)     ((IDX) & ((SIZE) - 1))
 
 void eos_msgq_init(EOSMsgQ *msgq, EOSMsgItem *array, uint8_t size) {
     msgq->idx_r = 0;
     msgq->idx_w = 0;
-    msgq->array = array;
     msgq->size = size;
+    msgq->array = array;
 }
 
 int eos_msgq_push(EOSMsgQ *msgq, unsigned char type, unsigned char *buffer, uint16_t len, uint8_t flags) {
     if ((uint8_t)(msgq->idx_w - msgq->idx_r) == msgq->size) return EOS_ERR_FULL;
 
-    uint8_t idx = EOS_MSGQ_IDX_MASK(msgq->idx_w, msgq->size);
+    uint8_t idx = IDX_MASK(msgq->idx_w, msgq->size);
     msgq->array[idx].type = type;
     msgq->array[idx].buffer = buffer;
     msgq->array[idx].len = len;
@@ -28,13 +28,34 @@ void eos_msgq_pop(EOSMsgQ *msgq, unsigned char *type, unsigned char **buffer, ui
     if (msgq->idx_r == msgq->idx_w) {
         *type = 0;
         *buffer = NULL;
+        *len = 0;
+        if (flags) *flags = 0;
     } else {
-        uint8_t idx = EOS_MSGQ_IDX_MASK(msgq->idx_r, msgq->size);
+        uint8_t idx = IDX_MASK(msgq->idx_r, msgq->size);
         *type = msgq->array[idx].type;
         *buffer = msgq->array[idx].buffer;
         *len = msgq->array[idx].len;
-        *flags = msgq->array[idx].flags;
+        if (flags) *flags = msgq->array[idx].flags;
         msgq->idx_r++;
     }
 }
 
+void eos_bufq_init(EOSBufQ *bufq, unsigned char **array, uint8_t size) {
+    bufq->idx_r = 0;
+    bufq->idx_w = 0;
+    bufq->size = size;
+    bufq->array = array;
+}
+
+int eos_bufq_push(EOSBufQ *bufq, unsigned char *buffer) {
+    if ((uint8_t)(bufq->idx_w - bufq->idx_r) == bufq->size) return EOS_ERR_FULL;
+
+    bufq->array[IDX_MASK(bufq->idx_w++, bufq->size)] = buffer;
+    return EOS_OK;
+}
+
+unsigned char *eos_bufq_pop(EOSBufQ *bufq) {
+    if (bufq->idx_r == bufq->idx_w) return NULL;
+
+    return bufq->array[IDX_MASK(bufq->idx_r++, bufq->size)];
+}