[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 12/12] hw/devices: Move SMSC 91C111 declaration i
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v3 12/12] hw/devices: Move SMSC 91C111 declaration into a new header |
Date: |
Fri, 12 Apr 2019 18:54:16 +0200 |
This commit finally deletes "hw/devices.h".
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/arm/gumstix.c | 2 +-
hw/arm/integratorcp.c | 2 +-
hw/arm/mainstone.c | 2 +-
hw/arm/realview.c | 2 +-
hw/arm/versatilepb.c | 2 +-
hw/net/smc91c111.c | 2 +-
include/hw/devices.h | 11 -----------
include/hw/net/smc91c111.h | 19 +++++++++++++++++++
8 files changed, 25 insertions(+), 17 deletions(-)
delete mode 100644 include/hw/devices.h
create mode 100644 include/hw/net/smc91c111.h
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index 79886ce3787..343cbfd7da8 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -40,7 +40,7 @@
#include "hw/arm/pxa.h"
#include "net/net.h"
#include "hw/block/flash.h"
-#include "hw/devices.h"
+#include "hw/net/smc91c111.h"
#include "hw/boards.h"
#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 4eceebb9ea7..0b6f24465e4 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -12,10 +12,10 @@
#include "qemu-common.h"
#include "cpu.h"
#include "hw/sysbus.h"
-#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/arm/arm.h"
#include "hw/misc/arm_integrator_debug.h"
+#include "hw/net/smc91c111.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index e96738ad267..c1cec590379 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -18,7 +18,7 @@
#include "hw/arm/pxa.h"
#include "hw/arm/arm.h"
#include "net/net.h"
-#include "hw/devices.h"
+#include "hw/net/smc91c111.h"
#include "hw/boards.h"
#include "hw/block/flash.h"
#include "hw/sysbus.h"
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index e9983c87639..05a244df255 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -14,8 +14,8 @@
#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/net/smc91c111.h"
#include "hw/pci/pci.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index d67181810a6..25166e15171 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -13,7 +13,7 @@
#include "cpu.h"
#include "hw/sysbus.h"
#include "hw/arm/arm.h"
-#include "hw/devices.h"
+#include "hw/net/smc91c111.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/pci/pci.h"
diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index 99da2d92973..d19ea0750d3 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "net/net.h"
-#include "hw/devices.h"
+#include "hw/net/smc91c111.h"
#include "qemu/log.h"
/* For crc32 */
#include <zlib.h>
diff --git a/include/hw/devices.h b/include/hw/devices.h
deleted file mode 100644
index ebc45c87997..00000000000
--- a/include/hw/devices.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef QEMU_DEVICES_H
-#define QEMU_DEVICES_H
-
-/* Devices that have nowhere better to go. */
-
-#include "hw/hw.h"
-
-/* smc91c111.c */
-void smc91c111_init(NICInfo *, uint32_t, qemu_irq);
-
-#endif
diff --git a/include/hw/net/smc91c111.h b/include/hw/net/smc91c111.h
new file mode 100644
index 00000000000..a66ba4112f8
--- /dev/null
+++ b/include/hw/net/smc91c111.h
@@ -0,0 +1,19 @@
+/*
+ * SMSC 91C111 Ethernet interface emulation
+ *
+ * Copyright (c) 2005 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_SMC91C111_H
+#define HW_NET_SMC91C111_H
+
+#include "hw/irq.h"
+#include "net/net.h"
+
+void smc91c111_init(NICInfo *, uint32_t, qemu_irq);
+
+#endif
--
2.20.1
- [Qemu-devel] [PATCH v3 03/12] hw/display/tc6393xb: Remove unused functions, (continued)
- [Qemu-devel] [PATCH v3 03/12] hw/display/tc6393xb: Remove unused functions, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 02/12] hw/arm/nseries: Use TYPE_TMP105 instead of hardcoded string, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 04/12] hw/devices: Move TC6393XB declarations into a new header, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 05/12] hw/devices: Move Blizzard declarations into a new header, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 06/12] hw/devices: Move CBus declarations into a new header, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 08/12] hw/devices: Move TI touchscreen declarations into a new header, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 07/12] hw/devices: Move Gamepad declarations into a new header, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 09/12] hw/devices: Move LAN9118 declarations into a new header, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 10/12] hw/net/ne2000-isa: Add guards to the header, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 11/12] hw/net/lan9118: Export TYPE_LAN9118 and use it instead of hardcoded string, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 12/12] hw/devices: Move SMSC 91C111 declaration into a new header,
Philippe Mathieu-Daudé <=
- Re: [Qemu-devel] [Qemu-arm] [PATCH v3 00/12] hw: Remove "hw/devices.h", Peter Maydell, 2019/04/29