hw: include hw header files with full paths

[mirror_qemu.git] / hw / etraxfs.h

diff --git a/hw/etraxfs.h b/hw/etraxfs.h
index c62f94b7b79c8f96d417c326e7e0e649fdaebca4..0df4fdd2e999253414bf981d66112bdadb29862c 100644 (file)
--- a/hw/etraxfs.h
+++ b/hw/etraxfs.h
@@ -22,14 +22,17 @@
  * THE SOFTWARE.
  */
 
-#include "net.h"
-#include "etraxfs_dma.h"
+#ifndef HW_EXTRAXFS_H
+#define HW_EXTRAXFS_H 1
+
+#include "net/net.h"
+#include "hw/etraxfs_dma.h"
 
 qemu_irq *cris_pic_init_cpu(CPUCRISState *env);
 
 /* Instantiate an ETRAXFS Ethernet MAC.  */
 static inline DeviceState *
-etraxfs_eth_init(NICInfo *nd, target_phys_addr_t base, int phyaddr,
+etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr,
                  void *dma_out, void *dma_in)
 {
     DeviceState *dev;
@@ -41,6 +44,8 @@ etraxfs_eth_init(NICInfo *nd, target_phys_addr_t base, int 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);
+    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
     return dev;
 }
+
+#endif