Changeset ffccdff0 in mainline for uspace/lib/virtio/virtio.c

Timestamp:

2020-06-15T13:29:29Z (4 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4f663f3e

Parents:

128359eb

Message:

Unify alignment handling

Use the C11 alignof() operator. Make sure the allocation alignment is
sufficient.

File:

• uspace/lib/virtio/virtio.c (modified) (2 diffs)

uspace/lib/virtio/virtio.c

@@ -35 +35 @@
 #include <align.h>
 #include <macros.h>
+#include <stdalign.h>
 
 #include <ddf/log.h>
@@ -230 +231 @@
          */
         size_t mem_size = sizeof(virtq_desc_t[size]);
-        mem_size = ALIGN_UP(mem_size, _Alignof(virtq_avail_t));
+        mem_size = ALIGN_UP(mem_size, alignof(virtq_avail_t));
         avail_offset = mem_size;
         mem_size += sizeof(virtq_avail_t) + sizeof(ioport16_t[size]) +
             sizeof(ioport16_t);
-        mem_size = ALIGN_UP(mem_size, _Alignof(virtq_used_t));
+        mem_size = ALIGN_UP(mem_size, alignof(virtq_used_t));
         used_offset = mem_size;
         mem_size += sizeof(virtq_used_t) + sizeof(virtq_used_elem_t[size]) +