Merge remote-tracking branch 'stefanha/trivial-patches' into staging

[qemu.git] / hw / etraxfs.h

diff --git a/hw/etraxfs.h b/hw/etraxfs.h
index cdbe58bd9b286eb7ea04a97bb5de302507aeb18b..24e8fd880b3b9138c6ce08e30cd1808233363122 100644 (file)
--- a/hw/etraxfs.h
+++ b/hw/etraxfs.h
@@ -22,8 +22,25 @@
  * THE SOFTWARE.
  */
 
+#include "net.h"
 #include "etraxfs_dma.h"
 
-qemu_irq *etraxfs_pic_init(CPUState *env, target_phys_addr_t base);
-void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
-                       target_phys_addr_t base, int phyaddr);
+qemu_irq *cris_pic_init_cpu(CPUState *env);
+
+/* Instantiate an ETRAXFS Ethernet MAC.  */
+static inline DeviceState *
+etraxfs_eth_init(NICInfo *nd, target_phys_addr_t base, int phyaddr,
+                 void *dma_out, void *dma_in)
+{
+    DeviceState *dev;
+    qemu_check_nic_model(nd, "fseth");
+
+    dev = qdev_create(NULL, "etraxfs-eth");
+    qdev_set_nic_properties(dev, nd);
+    qdev_prop_set_uint32(dev, "phyaddr", phyaddr);
+    qdev_prop_set_ptr(dev, "dma_out", dma_out);
+    qdev_prop_set_ptr(dev, "dma_in", dma_in);
+    qdev_init_nofail(dev);
+    sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
+    return dev;
+}