This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 5aeb644bc5d24493a5a8e63414d536b6f2eb9cce Author: wangyongrong <[email protected]> AuthorDate: Tue Jul 2 16:29:13 2024 +0800 virtio: adapt to the new OpenAMP Sync all the virtio api usage to sync with new OpenAMP Signed-off-by: wangyongrong <[email protected]> --- drivers/rpmsg/rpmsg_virtio.c | 6 ++++-- drivers/virtio/virtio-blk.c | 4 ++-- drivers/virtio/virtio-gpu.c | 2 +- drivers/virtio/virtio-input.c | 2 +- drivers/virtio/virtio-mmio.c | 6 ++++-- drivers/virtio/virtio-net.c | 4 ++-- drivers/virtio/virtio-pci.c | 3 ++- drivers/virtio/virtio-pci.h | 3 ++- drivers/virtio/virtio-rng.c | 2 +- drivers/virtio/virtio-rpmb.c | 2 +- drivers/virtio/virtio-serial.c | 2 +- drivers/virtio/virtio-snd.c | 4 ++-- 12 files changed, 23 insertions(+), 17 deletions(-) diff --git a/drivers/rpmsg/rpmsg_virtio.c b/drivers/rpmsg/rpmsg_virtio.c index 1f8b1bb6f6..0de34a501f 100644 --- a/drivers/rpmsg/rpmsg_virtio.c +++ b/drivers/rpmsg/rpmsg_virtio.c @@ -79,7 +79,8 @@ static int rpmsg_virtio_create_virtqueues_(FAR struct virtio_device *vdev, unsigned int flags, unsigned int nvqs, FAR const char *names[], - vq_callback callbacks[]); + vq_callback callbacks[], + FAR void *callback_args[]); static uint8_t rpmsg_virtio_get_status_(FAR struct virtio_device *dev); static void rpmsg_virtio_set_status_(FAR struct virtio_device *dev, uint8_t status); @@ -128,7 +129,8 @@ static int rpmsg_virtio_create_virtqueues_(FAR struct virtio_device *vdev, unsigned int flags, unsigned int nvqs, FAR const char *names[], - vq_callback callbacks[]) + vq_callback callbacks[], + FAR void *callback_args[]) { int ret; int i; diff --git a/drivers/virtio/virtio-blk.c b/drivers/virtio/virtio-blk.c index 81c5bbf991..b1211e8179 100644 --- a/drivers/virtio/virtio-blk.c +++ b/drivers/virtio/virtio-blk.c @@ -517,12 +517,12 @@ static int virtio_blk_init(FAR struct virtio_blk_priv_s *priv, virtio_set_status(vdev, VIRTIO_CONFIG_STATUS_DRIVER); virtio_negotiate_features(vdev, (1UL << VIRTIO_BLK_F_RO) | (1UL << VIRTIO_BLK_F_BLK_SIZE) | - (1UL << VIRTIO_BLK_F_FLUSH)); + (1UL << VIRTIO_BLK_F_FLUSH), NULL); virtio_set_status(vdev, VIRTIO_CONFIG_FEATURES_OK); vqname[0] = "virtio_blk_vq"; callback[0] = virtio_blk_done; - ret = virtio_create_virtqueues(vdev, 0, 1, vqname, callback); + ret = virtio_create_virtqueues(vdev, 0, 1, vqname, callback, NULL); if (ret < 0) { vrterr("virtio_device_create_virtqueue failed, ret=%d\n", ret); diff --git a/drivers/virtio/virtio-gpu.c b/drivers/virtio/virtio-gpu.c index 9b343f9570..5991f82239 100644 --- a/drivers/virtio/virtio-gpu.c +++ b/drivers/virtio/virtio-gpu.c @@ -256,7 +256,7 @@ static int virtio_gpu_init(FAR struct virtio_gpu_priv_s *priv, vqnames[VIRTIO_GPU_CTL] = "virtio_gpu_ctl"; callbacks[VIRTIO_GPU_CTL] = virtio_gpu_done; ret = virtio_create_virtqueues(vdev, 0, VIRTIO_GPU_NUM, vqnames, - callbacks); + callbacks, NULL); if (ret < 0) { vrterr("virtio_device_create_virtqueue failed, ret=%d", ret); diff --git a/drivers/virtio/virtio-input.c b/drivers/virtio/virtio-input.c index a209ebfb3e..922230e01c 100644 --- a/drivers/virtio/virtio-input.c +++ b/drivers/virtio/virtio-input.c @@ -391,7 +391,7 @@ static int virtio_input_probe(FAR struct virtio_device *vdev) vqnames[VIRTIO_INPUT_EVENT] = "virtio_input_event"; callbacks[VIRTIO_INPUT_EVENT] = virtio_input_recv_events; ret = virtio_create_virtqueues(vdev, 0, VIRTIO_INPUT_NUM, vqnames, - callbacks); + callbacks, NULL); if (ret < 0) { vrterr("virtio_device_create_virtqueue failed, ret=%d\n", ret); diff --git a/drivers/virtio/virtio-mmio.c b/drivers/virtio/virtio-mmio.c index fde390595c..b11756ef55 100644 --- a/drivers/virtio/virtio-mmio.c +++ b/drivers/virtio/virtio-mmio.c @@ -209,7 +209,8 @@ static int virtio_mmio_create_virtqueues(FAR struct virtio_device *vdev, unsigned int flags, unsigned int nvqs, FAR const char *names[], - vq_callback callbacks[]); + vq_callback callbacks[], + FAR void *callback_args[]); static void virtio_mmio_delete_virtqueues(FAR struct virtio_device *vdev); static void virtio_mmio_set_status(FAR struct virtio_device *vdev, uint8_t status); @@ -420,7 +421,8 @@ static int virtio_mmio_create_virtqueues(FAR struct virtio_device *vdev, unsigned int flags, unsigned int nvqs, FAR const char *names[], - vq_callback callbacks[]) + vq_callback callbacks[], + FAR void *callback_args[]) { FAR struct virtio_mmio_device_s *vmdev = (FAR struct virtio_mmio_device_s *)vdev; diff --git a/drivers/virtio/virtio-net.c b/drivers/virtio/virtio-net.c index e6c0552a47..ced5cff5b5 100644 --- a/drivers/virtio/virtio-net.c +++ b/drivers/virtio/virtio-net.c @@ -569,7 +569,7 @@ static int virtio_net_init(FAR struct virtio_net_priv_s *priv, virtio_set_status(vdev, VIRTIO_CONFIG_STATUS_DRIVER); virtio_negotiate_features(vdev, (1UL << VIRTIO_NET_F_MAC) | - (1UL << VIRTIO_F_ANY_LAYOUT)); + (1UL << VIRTIO_F_ANY_LAYOUT), NULL); virtio_set_status(vdev, VIRTIO_CONFIG_FEATURES_OK); vqnames[VIRTIO_NET_RX] = "virtio_net_rx"; @@ -577,7 +577,7 @@ static int virtio_net_init(FAR struct virtio_net_priv_s *priv, callbacks[VIRTIO_NET_RX] = virtio_net_rxready; callbacks[VIRTIO_NET_TX] = virtio_net_txdone; ret = virtio_create_virtqueues(vdev, 0, VIRTIO_NET_NUM, vqnames, - callbacks); + callbacks, NULL); if (ret < 0) { vrterr("virtio_device_create_virtqueue failed, ret=%d\n", ret); diff --git a/drivers/virtio/virtio-pci.c b/drivers/virtio/virtio-pci.c index f1b904c713..126ecb36f7 100644 --- a/drivers/virtio/virtio-pci.c +++ b/drivers/virtio/virtio-pci.c @@ -343,7 +343,8 @@ int virtio_pci_create_virtqueues(FAR struct virtio_device *vdev, unsigned int flags, unsigned int nvqs, FAR const char *names[], - vq_callback callbacks[]) + vq_callback callbacks[], + FAR void *callback_args[]) { FAR struct virtio_pci_device_s *vpdev = (FAR struct virtio_pci_device_s *)vdev; diff --git a/drivers/virtio/virtio-pci.h b/drivers/virtio/virtio-pci.h index 2608a21a93..66a36f9342 100644 --- a/drivers/virtio/virtio-pci.h +++ b/drivers/virtio/virtio-pci.h @@ -115,7 +115,8 @@ int virtio_pci_create_virtqueues(FAR struct virtio_device *vdev, unsigned int flags, unsigned int nvqs, FAR const char *names[], - vq_callback callbacks[]); + vq_callback callbacks[], + FAR void *callback_args[]); void virtio_pci_delete_virtqueues(FAR struct virtio_device *vdev); int virtio_pci_modern_probe(FAR struct pci_device_s *dev); diff --git a/drivers/virtio/virtio-rng.c b/drivers/virtio/virtio-rng.c index 768cc239ef..a3e4501e7b 100644 --- a/drivers/virtio/virtio-rng.c +++ b/drivers/virtio/virtio-rng.c @@ -215,7 +215,7 @@ static int virtio_rng_probe(FAR struct virtio_device *vdev) vqnames[0] = "virtio_rng_rx"; callback[0] = virtio_rng_done; - ret = virtio_create_virtqueues(vdev, 0, 1, vqnames, callback); + ret = virtio_create_virtqueues(vdev, 0, 1, vqnames, callback, NULL); if (ret < 0) { vrterr("virtio_device_create_virtqueue failed, ret=%d\n", ret); diff --git a/drivers/virtio/virtio-rpmb.c b/drivers/virtio/virtio-rpmb.c index b256228f24..f855ad063c 100644 --- a/drivers/virtio/virtio-rpmb.c +++ b/drivers/virtio/virtio-rpmb.c @@ -211,7 +211,7 @@ static int virtio_rpmb_init(FAR struct virtio_rpmb_priv_s *priv, vqname[0] = "virtio_rpmb_vq"; callback[0] = virtio_rpmb_done; - ret = virtio_create_virtqueues(vdev, 0, 1, vqname, callback); + ret = virtio_create_virtqueues(vdev, 0, 1, vqname, callback, NULL); if (ret < 0) { vrterr("virtio_device_create_virtqueue failed, ret=%d\n", ret); diff --git a/drivers/virtio/virtio-serial.c b/drivers/virtio/virtio-serial.c index 78e1e03517..315a8acee4 100644 --- a/drivers/virtio/virtio-serial.c +++ b/drivers/virtio/virtio-serial.c @@ -505,7 +505,7 @@ static int virtio_serial_init(FAR struct virtio_serial_priv_s *priv, callbacks[VIRTIO_SERIAL_RX] = virtio_serial_rxready; callbacks[VIRTIO_SERIAL_TX] = virtio_serial_txdone; ret = virtio_create_virtqueues(vdev, 0, VIRTIO_SERIAL_NUM, vqnames, - callbacks); + callbacks, NULL); if (ret < 0) { vrterr("virtio_device_create_virtqueue failed, ret=%d\n", ret); diff --git a/drivers/virtio/virtio-snd.c b/drivers/virtio/virtio-snd.c index b6cd429a56..959bafce1b 100644 --- a/drivers/virtio/virtio-snd.c +++ b/drivers/virtio/virtio-snd.c @@ -1090,8 +1090,8 @@ static int virtio_snd_init(FAR struct virtio_snd_s *priv) callbacks[VIRTIO_SND_VQ_TX] = virtio_snd_pcm_notify_cb; callbacks[VIRTIO_SND_VQ_RX] = virtio_snd_pcm_notify_cb; - ret = virtio_create_virtqueues(priv->vdev, 0, - VIRTIO_SND_VQ_MAX, vqnames, callbacks); + ret = virtio_create_virtqueues(priv->vdev, 0, VIRTIO_SND_VQ_MAX, + vqnames, callbacks, NULL); if (ret < 0) { vrterr("virtio_device_create_virtqueue failed, ret=%d\n", ret);
