Skip to content

Commit ee2b9a4

Browse files
kartbendanieldegrasse
authored andcommitted
drivers: virtio: move virtio headers to zephyr/drivers
Virtio headers are moved to zephyr/drivers/ as they have no reason to be top-level headers since virtio is a driver class. Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
1 parent a7ce605 commit ee2b9a4

File tree

8 files changed

+12
-11
lines changed

8 files changed

+12
-11
lines changed

MAINTAINERS.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2266,7 +2266,8 @@ Release Notes:
22662266
files:
22672267
- drivers/virtio/
22682268
- dts/bindings/virtio/
2269-
- include/zephyr/virtio/
2269+
- include/zephyr/drivers/virtio.h
2270+
- include/zephyr/drivers/virtio/
22702271
labels:
22712272
- "area: VIRTIO"
22722273

drivers/entropy/entropy_virtio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66

77
#include <zephyr/drivers/entropy.h>
8-
#include <zephyr/virtio/virtio.h>
9-
#include <zephyr/virtio/virtqueue.h>
8+
#include <zephyr/drivers/virtio.h>
9+
#include <zephyr/drivers/virtio/virtqueue.h>
1010
#include <zephyr/logging/log.h>
1111

1212
#define VIRTIO_ENTROPY_QUEUE_IDX 0

drivers/virtio/virtio_common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
#include <zephyr/logging/log.h>
88
#include <zephyr/sys/byteorder.h>
9-
#include <zephyr/virtio/virtio.h>
10-
#include <zephyr/virtio/virtqueue.h>
9+
#include <zephyr/drivers/virtio.h>
10+
#include <zephyr/drivers/virtio/virtqueue.h>
1111
#include "virtio_common.h"
1212

1313
LOG_MODULE_REGISTER(virtio_common, CONFIG_VIRTIO_LOG_LEVEL);

drivers/virtio/virtio_mmio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include <zephyr/spinlock.h>
1111
#include <zephyr/sys/barrier.h>
1212
#include <zephyr/sys/byteorder.h>
13-
#include <zephyr/virtio/virtio.h>
14-
#include <zephyr/virtio/virtqueue.h>
13+
#include <zephyr/drivers/virtio.h>
14+
#include <zephyr/drivers/virtio/virtqueue.h>
1515
#include "virtio_common.h"
1616

1717
#define DT_DRV_COMPAT virtio_mmio

drivers/virtio/virtio_pci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include <zephyr/spinlock.h>
1212
#include <zephyr/sys/barrier.h>
1313
#include <zephyr/sys/byteorder.h>
14-
#include <zephyr/virtio/virtio.h>
15-
#include <zephyr/virtio/virtqueue.h>
14+
#include <zephyr/drivers/virtio.h>
15+
#include <zephyr/drivers/virtio/virtqueue.h>
1616
#include "virtio_common.h"
1717
#include "assert.h"
1818

drivers/virtio/virtqueue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <zephyr/virtio/virtqueue.h>
7+
#include <zephyr/drivers/virtio/virtqueue.h>
88
#include <zephyr/kernel.h>
99
#include <zephyr/logging/log.h>
1010
#include <zephyr/sys/__assert.h>

include/zephyr/virtio/virtio.h renamed to include/zephyr/drivers/virtio.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#ifndef ZEPHYR_VIRTIO_VIRTIO_H_
88
#define ZEPHYR_VIRTIO_VIRTIO_H_
99
#include <zephyr/device.h>
10-
#include "virtqueue.h"
10+
#include "virtio/virtqueue.h"
1111

1212
#ifdef __cplusplus
1313
extern "C" {

0 commit comments

Comments
 (0)