Add the virtq_desc elements into queue

Author: Cuda-Chen

queue.h

@@ -1,6 +1,8 @@
 #ifndef QUEUE_H
 #define QUEUE_H
 
+#include <stddef.h>
+
 #if defined(__GNUC__)
 #define __QUEUE_HAVE_TYPEOF 1
 #endif
@@ -18,18 +20,41 @@ static inline void INIT_QUEUE_HEAD(struct queue_head *head)
     head->prev = head;
 }
 
+/* Push the node to the end of queue */
 static inline void queue_push(struct queue_head *node, struct queue_head *head)
 {
-    struct queue_head *next = head->next;
+    struct queue_head *prev = head->prev;
+
+    prev->next = node;
+    node->next = head;
+    node->prev = prev;
+    head->prev = node;
+}
+
+static inline int head_empty(const struct queue_head *head)
+{
+    return (head->next == head);
+}
+
+static inline void queue_del(struct queue_head *node)
+{
+    struct queue_head *next = node->next;
+    struct queue_head *prev = node->prev;
 
-    next->prev = node;
-    node->next = next;
+    next->prev = prev;
+    prev->next = next;
 
-    node->prev = head;
-    head->next = node;
+#ifdef LIST_POISONING
+    node->prev = (struct queue_head *) (0x00100100);
+    node->next = (struct queue_head *) (0x00200200);
+#endif
 }
 
-static inline void queue_pop() {}
+static inline void queue_del_init(struct queue_head *node)
+{
+    queue_del(node);
+    INIT_QUEUE_HEAD(node);
+}
 
 #ifndef container_of
 #ifdef __QUEUE_HAVE_TYPEOF
@@ -52,14 +77,14 @@ static inline void queue_pop() {}
 #define queue_last_entry(head, type, member) \
     queue_entry((head)->prev, type, member)
 
-#define list_for_each(node, head) \
+#define queue_for_each(node, head) \
     for (node = (head)->next; node != (head); node = node->next)
 
-#ifdef __LIST_HAVE_TYPEOF
-#define list_for_each_entry(entry, head, member)                       \
-    for (entry = list_entry((head)->next, __typeof__(*entry), member); \
+#ifdef __QUEUE_HAVE_TYPEOF
+#define queue_for_each_entry(entry, head, member)                       \
+    for (entry = queue_entry((head)->next, __typeof__(*entry), member); \
          &entry->member != (head);                                     \
-         entry = list_entry(entry->member.next, __typeof__(*entry), member))
+         entry = queue_entry(entry->member.next, __typeof__(*entry), member))
 #endif
 
 #endif

virtio-snd.c

@@ -654,7 +654,6 @@ static int virtio_snd_desc_handler(virtio_snd_state_t *vsnd,
 
     /* Return the device status */
     response->code = VIRTIO_SND_S_OK;
-    //*plen = vq_desc[2].len;
 
     return 0;
 }
@@ -663,7 +662,7 @@ static int virtio_snd_desc_handler(virtio_snd_state_t *vsnd,
 typedef struct {
     struct virtq_desc vq_desc;
     struct queue_head q;
-} virtq_desc_queue_t;
+} virtq_desc_queue_node_t;
 static int virtio_snd_tx_desc_handler(virtio_snd_state_t *vsnd,
                                       const virtio_snd_queue_t *queue,
                                       uint32_t desc_idx,
@@ -678,7 +677,10 @@ static int virtio_snd_tx_desc_handler(virtio_snd_state_t *vsnd,
      * Finally, the last descriptors contains:
      *   (response payload structure)
      */
-    struct virtq_desc vq_desc[VSND_DESC_CNT];
+    virtq_desc_queue_node_t *node;
+    struct queue_head q;
+
+    INIT_QUEUE_HEAD(&q);
 
     /* Collect the descriptors */
     int i = 0;
@@ -687,11 +689,16 @@ static int virtio_snd_tx_desc_handler(virtio_snd_state_t *vsnd,
         const uint32_t *desc = &vsnd->ram[queue->QueueDesc + desc_idx * 4];
 
         /* Retrieve the fields of current descriptor */
-        if (i < VSND_DESC_CNT) {
+        /*if (i < VSND_DESC_CNT) {
             vq_desc[i].addr = desc[0];
             vq_desc[i].len = desc[2];
             vq_desc[i].flags = desc[3];
-        }
+        }*/
+        node = (virtq_desc_queue_node_t *) malloc(sizeof(*node));
+        node->vq_desc.addr = desc[0];
+        node->vq_desc.len = desc[2];
+        node->vq_desc.flags = desc[3];
+        queue_push(&node->q, &q);
         desc_idx = desc[3] >> 16; /* vq_desc[desc_cnt].next */
 
         i++;
@@ -704,6 +711,7 @@ static int virtio_snd_tx_desc_handler(virtio_snd_state_t *vsnd,
         }
     }
 
+#if 0
     fprintf(stderr, "TX process header\n");
     /* Process the header */
     const virtio_snd_pcm_xfer_t *request =
@@ -723,6 +731,13 @@ static int virtio_snd_tx_desc_handler(virtio_snd_state_t *vsnd,
     response->status = VIRTIO_SND_S_OK;
     response->latency_bytes = 0; /* TODO: show the actual latency bytes */
     *plen = vq_desc[1].len + sizeof(*response);
+#endif
+    int idx = 0;
+    queue_for_each_entry(node, &q, q)
+    {
+        printf("node %d\n", idx);
+        idx++;
+    }
 
     return 0;
 }