@@ -12,6 +12,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += i2c/
devices-dirs-$(CONFIG_SOFTMMU) += ide/
devices-dirs-$(CONFIG_SOFTMMU) += input/
devices-dirs-$(CONFIG_SOFTMMU) += intc/
+devices-dirs-$(CONFIG_IPACK) += ipack/
devices-dirs-$(CONFIG_SOFTMMU) += isa/
devices-dirs-$(CONFIG_SOFTMMU) += misc/
devices-dirs-$(CONFIG_SOFTMMU) += net/
@@ -1,4 +1,4 @@
-common-obj-$(CONFIG_IPACK) += tpci200.o ipoctal232.o ipack.o
+common-obj-$(CONFIG_IPACK) += ipoctal232.o
common-obj-$(CONFIG_ESCC) += escc.o
common-obj-$(CONFIG_PARALLEL) += parallel.o
common-obj-$(CONFIG_PL011) += pl011.o
@@ -8,7 +8,7 @@
* later version.
*/
-#include "ipack.h"
+#include "hw/ipack/ipack.h"
#include "qemu/bitops.h"
#include "sysemu/char.h"
new file mode 100644
@@ -0,0 +1,2 @@
+common-obj-$(CONFIG_IPACK) += ipack.o
+common-obj-$(CONFIG_IPACK) += tpci200.o
similarity index 98%
rename from hw/char/ipack.c
rename to hw/ipack/ipack.c
@@ -8,7 +8,7 @@
* later version.
*/
-#include "ipack.h"
+#include "hw/ipack/ipack.h"
IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)
{
similarity index 99%
rename from hw/char/tpci200.c
rename to hw/ipack/tpci200.c
@@ -8,7 +8,7 @@
* later version.
*/
-#include "ipack.h"
+#include "hw/ipack/ipack.h"
#include "hw/pci/pci.h"
#include "qemu/bitops.h"
#include <stdio.h>
Move the header defining an IPackBus and IPackDevice base class into a new include/ directory and move their implementation and a PCI-IndustryPack bridge out of hw/char/ directory into a new hw/ipack/. Signed-off-by: Andreas Färber <afaerber@suse.de> --- hw/Makefile.objs | 1 + hw/char/Makefile.objs | 2 +- hw/char/ipoctal232.c | 2 +- hw/ipack/Makefile.objs | 2 ++ hw/{char => ipack}/ipack.c | 2 +- hw/{char => ipack}/tpci200.c | 2 +- {hw/char => include/hw/ipack}/ipack.h | 0 7 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 hw/ipack/Makefile.objs rename hw/{char => ipack}/ipack.c (98%) rename hw/{char => ipack}/tpci200.c (99%) rename {hw/char => include/hw/ipack}/ipack.h (100%) diff --git a/hw/char/ipack.h b/include/hw/ipack/ipack.h similarity index 100% rename from hw/char/ipack.h rename to include/hw/ipack/ipack.h