Rename write_queue_address -> setup_queue

For transports supporting several interrupts, this function needs to
setup per-queue interrupts in addition of setting the queue address.

No logic change.

OK jasper@

3 files changed, 12 insertions, 12 deletions

diff --git a/sys/dev/pci/virtio.c b/sys/dev/pci/virtio.c
index 02c91026fc8..933b7120467 100644
--- a/sys/dev/pci/virtio.c
+++ b/sys/dev/pci/virtio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: virtio.c,v 1.4 2013/03/10 21:54:46 sf Exp $	*/
+/*	$OpenBSD: virtio.c,v 1.5 2013/03/10 21:58:02 sf Exp $	*/
 /*	$NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $	*/
 
 /*
@@ -160,7 +160,7 @@ virtio_reinit_start(struct virtio_softc *sc)
 			      sc->sc_dev.dv_xname, vq->vq_index);
 		}
 		virtio_init_vq(sc, vq, 1);
-		virtio_write_queue_address(sc, vq->vq_index,
+		virtio_setup_queue(sc, vq->vq_index,
 		    vq->vq_dmamap->dm_segs[0].ds_addr / VIRTIO_PAGE_SIZE);
 	}
 }
@@ -355,7 +355,7 @@ virtio_alloc_vq(struct virtio_softc *sc,
 		goto err;
 	}
 
-	virtio_write_queue_address(sc, index,
+	virtio_setup_queue(sc, index,
 	    vq->vq_dmamap->dm_segs[0].ds_addr / VIRTIO_PAGE_SIZE);
 
 	/* remember addresses and offsets for later use */
@@ -399,7 +399,7 @@ virtio_alloc_vq(struct virtio_softc *sc,
 	return 0;
 
 err:
-	virtio_write_queue_address(sc, index, 0);
+	virtio_setup_queue(sc, index, 0);
 	if (vq->vq_dmamap)
 		bus_dmamap_destroy(sc->sc_dmat, vq->vq_dmamap);
 	if (vq->vq_vaddr)
@@ -429,7 +429,7 @@ virtio_free_vq(struct virtio_softc *sc, struct virtqueue *vq)
 	}
 
 	/* tell device that there's no virtqueue any longer */
-	virtio_write_queue_address(sc, vq->vq_index, 0);
+	virtio_setup_queue(sc, vq->vq_index, 0);
 
 	free(vq->vq_entries, M_DEVBUF);
 	bus_dmamap_unload(sc->sc_dmat, vq->vq_dmamap);
diff --git a/sys/dev/pci/virtio_pci.c b/sys/dev/pci/virtio_pci.c
index ecd01f2f32c..89adc968f11 100644
--- a/sys/dev/pci/virtio_pci.c
+++ b/sys/dev/pci/virtio_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: virtio_pci.c,v 1.5 2013/03/10 21:56:11 sf Exp $	*/
+/*	$OpenBSD: virtio_pci.c,v 1.6 2013/03/10 21:58:02 sf Exp $	*/
 /*	$NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $	*/
 
 /*
@@ -63,7 +63,7 @@ void		virtio_pci_write_device_config_2(struct virtio_softc *, int, uint16_t);
 void		virtio_pci_write_device_config_4(struct virtio_softc *, int, uint32_t);
 void		virtio_pci_write_device_config_8(struct virtio_softc *, int, uint64_t);
 uint16_t	virtio_pci_read_queue_size(struct virtio_softc *, uint16_t);
-void		virtio_pci_write_queue_address(struct virtio_softc *, uint16_t, uint32_t);
+void		virtio_pci_setup_queue(struct virtio_softc *, uint16_t, uint32_t);
 void		virtio_pci_set_status(struct virtio_softc *, int);
 uint32_t	virtio_pci_negotiate_features(struct virtio_softc *, uint32_t,
 					      const struct virtio_feature_name *);
@@ -101,7 +101,7 @@ struct virtio_ops virtio_pci_ops = {
 	virtio_pci_write_device_config_4,
 	virtio_pci_write_device_config_8,
 	virtio_pci_read_queue_size,
-	virtio_pci_write_queue_address,
+	virtio_pci_setup_queue,
 	virtio_pci_set_status,
 	virtio_pci_negotiate_features,
 	virtio_pci_intr,
@@ -118,7 +118,7 @@ virtio_pci_read_queue_size(struct virtio_softc *vsc, uint16_t idx)
 }
 
 void
-virtio_pci_write_queue_address(struct virtio_softc *vsc, uint16_t idx, uint32_t addr)
+virtio_pci_setup_queue(struct virtio_softc *vsc, uint16_t idx, uint32_t addr)
 {
 	struct virtio_pci_softc *sc = (struct virtio_pci_softc *)vsc;
 	bus_space_write_2(sc->sc_iot, sc->sc_ioh, VIRTIO_CONFIG_QUEUE_SELECT,
diff --git a/sys/dev/pci/virtiovar.h b/sys/dev/pci/virtiovar.h
index 9a68dd72db7..5bd7f38c600 100644
--- a/sys/dev/pci/virtiovar.h
+++ b/sys/dev/pci/virtiovar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: virtiovar.h,v 1.3 2013/03/10 21:56:11 sf Exp $	*/
+/*	$OpenBSD: virtiovar.h,v 1.4 2013/03/10 21:58:02 sf Exp $	*/
 /*	$NetBSD: virtiovar.h,v 1.1 2011/10/30 12:12:21 hannken Exp $	*/
 
 /*
@@ -146,7 +146,7 @@ struct virtio_ops {
 	void		(*write_dev_cfg_4)(struct virtio_softc *, int, uint32_t);
 	void		(*write_dev_cfg_8)(struct virtio_softc *, int, uint64_t);
 	uint16_t	(*read_queue_size)(struct virtio_softc *, uint16_t);
-	void		(*write_queue_addr)(struct virtio_softc *, uint16_t, uint32_t);
+	void		(*setup_queue)(struct virtio_softc *, uint16_t, uint32_t);
 	void		(*set_status)(struct virtio_softc *, int);
 	uint32_t	(*neg_features)(struct virtio_softc *, uint32_t, const struct virtio_feature_name *);
 	int		(*intr)(void *);
@@ -187,7 +187,7 @@ struct virtio_softc {
 #define	virtio_write_device_config_4(sc, o, v)	(sc)->sc_ops->write_dev_cfg_4(sc, o, v)
 #define	virtio_write_device_config_8(sc, o, v)	(sc)->sc_ops->write_dev_cfg_8(sc, o, v)
 #define	virtio_read_queue_size(sc, i)		(sc)->sc_ops->read_queue_size(sc, i)
-#define	virtio_write_queue_address(sc, i, v)	(sc)->sc_ops->write_queue_addr(sc, i, v)
+#define	virtio_setup_queue(sc, i, v)		(sc)->sc_ops->setup_queue(sc, i, v)
 #define	virtio_negotiate_features(sc, f, n)	(sc)->sc_ops->neg_features(sc, f, n)
 
 int virtio_alloc_vq(struct virtio_softc*, struct virtqueue*, int, int, int,