added eos_bufq to msgq; net changed accordingly

1 files changed, 33 insertions, 13 deletions

diff --git a/code/fe310/eos/msgq.c b/code/fe310/eos/msgq.c
index 35e0d15..2b20f31 100644
--- a/code/fe310/eos/msgq.c
+++ b/code/fe310/eos/msgq.c
@@ -5,24 +5,23 @@
 #include "eos.h"
 #include "msgq.h"
 
-#define EOS_MSGQ_IDX_MASK(IDX, SIZE)    ((IDX) & ((SIZE) - 1))
-
-#define EOS_MSGQ_IDX_HALF               ((uint8_t)1 << (sizeof(uint8_t) * 8 - 1))
-#define EOS_MSGQ_IDX_LT(a,b)            ((uint8_t)((uint8_t)(a) - (uint8_t)(b)) > EOS_MSGQ_IDX_HALF)
-#define EOS_MSGQ_IDX_LTE(a,b)           ((uint8_t)((uint8_t)(b) - (uint8_t)(a)) < EOS_MSGQ_IDX_HALF)
+#define IDX_MASK(IDX, SIZE)     ((IDX) & ((SIZE) - 1))
+#define IDX_HALF                ((uint8_t)1 << (sizeof(uint8_t) * 8 - 1))
+#define IDX_LT(a,b)             ((uint8_t)((uint8_t)(a) - (uint8_t)(b)) > IDX_HALF)
+#define IDX_LTE(a,b)            ((uint8_t)((uint8_t)(b) - (uint8_t)(a)) < IDX_HALF)
 
 
 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) {
     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;
@@ -34,8 +33,9 @@ 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;
     } 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;
@@ -52,7 +52,7 @@ int eos_msgq_get(EOSMsgQ *msgq, unsigned char type, unsigned char *selector, uin
         return 0;
     }
 
-    idx = EOS_MSGQ_IDX_MASK(msgq->idx_r, msgq->size);
+    idx = IDX_MASK(msgq->idx_r, msgq->size);
     if (type == msgq->array[idx].type) {
         *buffer = msgq->array[idx].buffer;
         *len = msgq->array[idx].len;
@@ -61,14 +61,14 @@ int eos_msgq_get(EOSMsgQ *msgq, unsigned char type, unsigned char *selector, uin
             return 1;
         }
     }
-    for (i = msgq->idx_r + 1; EOS_MSGQ_IDX_LT(i, msgq->idx_w); i++) {
-        idx = EOS_MSGQ_IDX_MASK(i, msgq->size);
+    for (i = msgq->idx_r + 1; IDX_LT(i, msgq->idx_w); i++) {
+        idx = IDX_MASK(i, msgq->size);
         if (type== msgq->array[idx].type) {
             *buffer = msgq->array[idx].buffer;
             *len = msgq->array[idx].len;
             if ((selector == NULL) || (sel_len == 0) || ((sel_len <= *len) && (memcmp(selector, *buffer, sel_len) == 0))) {
-                for (j = i + 1; EOS_MSGQ_IDX_LT(j, msgq->idx_w); j++) {
-                    msgq->array[EOS_MSGQ_IDX_MASK(j - 1, msgq->size)] = msgq->array[EOS_MSGQ_IDX_MASK(j, msgq->size)];
+                for (j = i + 1; IDX_LT(j, msgq->idx_w); j++) {
+                    msgq->array[IDX_MASK(j - 1, msgq->size)] = msgq->array[IDX_MASK(j, msgq->size)];
                 }
                 msgq->idx_w--;
                 return 1;
@@ -80,3 +80,23 @@ int eos_msgq_get(EOSMsgQ *msgq, unsigned char type, unsigned char *selector, uin
     return 0;
 }
 
+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)];
+}
+