aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Crosthwaite <peter.crosthwaite@xilinx.com>2013-02-12 11:17:11 +1000
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>2013-02-13 13:01:24 +0100
commit7ce4106c2125eca8f7f61f460456a49074c13e56 (patch)
tree2b73bd4f99be73d8dbb697eaf6dded0ce2fbd63b
parentdada5c7e92434df7c0ec152fe9a8f0e3de67b632 (diff)
xilinx.h: s/xilinx_axiethernetdma()/xilinx_axidma()
This function has nothing to do with ethernet. Its reusable for all DMA clients. Dropped the "ethernet" in the name accordingly. Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
-rw-r--r--hw/petalogix_ml605_mmu.c4
-rw-r--r--hw/xilinx.h5
2 files changed, 4 insertions, 5 deletions
diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index 8fd55a0328..82d7183ae5 100644
--- a/hw/petalogix_ml605_mmu.c
+++ b/hw/petalogix_ml605_mmu.c
@@ -140,8 +140,8 @@ petalogix_ml605_init(QEMUMachineInitArgs *args)
xilinx_axiethernet_init(eth0, &nd_table[0], STREAM_SLAVE(dma),
0x82780000, irq[3], 0x1000, 0x1000);
- xilinx_axiethernetdma_init(dma, STREAM_SLAVE(eth0),
- 0x84600000, irq[1], irq[0], 100 * 1000000);
+ xilinx_axidma_init(dma, STREAM_SLAVE(eth0), 0x84600000, irq[1], irq[0],
+ 100 * 1000000);
{
SSIBus *spi;
diff --git a/hw/xilinx.h b/hw/xilinx.h
index d255ca7fbb..09bc2e4913 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -71,9 +71,8 @@ xilinx_axiethernet_init(DeviceState *dev, NICInfo *nd, StreamSlave *peer,
}
static inline void
-xilinx_axiethernetdma_init(DeviceState *dev, StreamSlave *peer,
- hwaddr base, qemu_irq irq,
- qemu_irq irq2, int freqhz)
+xilinx_axidma_init(DeviceState *dev, StreamSlave *peer, hwaddr base,
+ qemu_irq irq, qemu_irq irq2, int freqhz)
{
Error *errp = NULL;