Changeset 3d135e9 in mainline for uspace/lib/virtio

Timestamp:

2018-06-16T16:05:39Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b8ef198b

Parents:

fe96085

Message:

Implement virtio_net_send

Location:

uspace/lib/virtio

Files:

• virtio-pci.h (modified) (1 diff)
• virtio.c (modified) (2 diffs)

uspace/lib/virtio/virtio-pci.h

@@ -176 +176 @@
 } virtio_dev_t;
 
-extern void virtio_virtq_set_desc(virtio_dev_t *vdev, uint16_t, uint16_t,
+extern void virtio_virtq_desc_set(virtio_dev_t *vdev, uint16_t, uint16_t,
     uint64_t, uint32_t, uint16_t, uint16_t);
+extern uint16_t virtio_virtq_desc_get_next(virtio_dev_t *vdev, uint16_t,
+    uint16_t);
 
 extern void virtio_virtq_produce_available(virtio_dev_t *, uint16_t, uint16_t);

uspace/lib/virtio/virtio.c

@@ -39 +39 @@
 #include <libarch/barrier.h>
 
-void virtio_virtq_set_desc(virtio_dev_t *vdev, uint16_t num, uint16_t descno,
+void virtio_virtq_desc_set(virtio_dev_t *vdev, uint16_t num, uint16_t descno,
     uint64_t addr, uint32_t len, uint16_t flags, uint16_t next)
 {
@@ -47 +47 @@
         pio_write_le16(&d->flags, flags);
         pio_write_le16(&d->next, next);
+}
+
+uint16_t virtio_virtq_desc_get_next(virtio_dev_t *vdev, uint16_t num,
+    uint16_t descno)
+{
+        virtq_desc_t *d = &vdev->queues[num].desc[descno];
+        if (!(pio_read_le16(&d->flags) & VIRTQ_DESC_F_NEXT))
+                return (uint16_t) -1U;
+        return pio_read_le16(&d->next);
 }