diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-04-12 18:54:13 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-04-29 17:57:21 +0100 |
| commit | 66b03dcec2715ffb3bc121114650502c9d3ffaef (patch) | |
| tree | 7f8a0665cd8c9c685a0447b0949e8214930de6e4 | |
| parent | a331dd029911fa85fd2e9fa72101396cd5b5fc08 (diff) | |
| download | qemu-66b03dcec2715ffb3bc121114650502c9d3ffaef.zip qemu-66b03dcec2715ffb3bc121114650502c9d3ffaef.tar.gz qemu-66b03dcec2715ffb3bc121114650502c9d3ffaef.tar.bz2 | |
hw/devices: Move LAN9118 declarations into a new header
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190412165416.7977-10-philmd@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/arm/kzm.c | 2 | ||||
| -rw-r--r-- | hw/arm/mps2.c | 2 | ||||
| -rw-r--r-- | hw/arm/realview.c | 1 | ||||
| -rw-r--r-- | hw/arm/vexpress.c | 2 | ||||
| -rw-r--r-- | hw/net/lan9118.c | 2 | ||||
| -rw-r--r-- | include/hw/devices.h | 3 | ||||
| -rw-r--r-- | include/hw/net/lan9118.h | 19 |
7 files changed, 24 insertions, 7 deletions
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 864c7bd..139934c 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -22,7 +22,7 @@ #include "qemu/error-report.h" #include "exec/address-spaces.h" #include "net/net.h" -#include "hw/devices.h" +#include "hw/net/lan9118.h" #include "hw/char/serial.h" #include "sysemu/qtest.h" diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index e3d698b..54b7395 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -36,7 +36,7 @@ #include "hw/timer/cmsdk-apb-timer.h" #include "hw/timer/cmsdk-apb-dualtimer.h" #include "hw/misc/mps2-scc.h" -#include "hw/devices.h" +#include "hw/net/lan9118.h" #include "net/net.h" typedef enum MPS2FPGAType { diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 242f5a8..e9983c8 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -15,6 +15,7 @@ #include "hw/arm/arm.h" #include "hw/arm/primecell.h" #include "hw/devices.h" +#include "hw/net/lan9118.h" #include "hw/pci/pci.h" #include "net/net.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index f07134c..d8634f3 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -28,7 +28,7 @@ #include "hw/sysbus.h" #include "hw/arm/arm.h" #include "hw/arm/primecell.h" -#include "hw/devices.h" +#include "hw/net/lan9118.h" #include "hw/i2c/i2c.h" #include "net/net.h" #include "sysemu/sysemu.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index a6269d9..a428b16 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -14,7 +14,7 @@ #include "hw/sysbus.h" #include "net/net.h" #include "net/eth.h" -#include "hw/devices.h" +#include "hw/net/lan9118.h" #include "sysemu/sysemu.h" #include "hw/ptimer.h" #include "qemu/log.h" diff --git a/include/hw/devices.h b/include/hw/devices.h index ba90340..ebc45c8 100644 --- a/include/hw/devices.h +++ b/include/hw/devices.h @@ -8,7 +8,4 @@ /* smc91c111.c */ void smc91c111_init(NICInfo *, uint32_t, qemu_irq); -/* lan9118.c */ -void lan9118_init(NICInfo *, uint32_t, qemu_irq); - #endif diff --git a/include/hw/net/lan9118.h b/include/hw/net/lan9118.h new file mode 100644 index 0000000..d13d8cd --- /dev/null +++ b/include/hw/net/lan9118.h @@ -0,0 +1,19 @@ +/* + * SMSC LAN9118 Ethernet interface emulation + * + * Copyright (c) 2009 CodeSourcery, LLC. + * Written by Paul Brook + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#ifndef HW_NET_LAN9118_H +#define HW_NET_LAN9118_H + +#include "hw/irq.h" +#include "net/net.h" + +void lan9118_init(NICInfo *, uint32_t, qemu_irq); + +#endif |