ipack: Move IndustryPack out of hw/char/
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/. Acked-by: Alberto Garcia <agarcia@igalia.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
08c9cacf0e
commit
1f9c4cfda4
|
@ -12,6 +12,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += i2c/
|
||||||
devices-dirs-$(CONFIG_SOFTMMU) += ide/
|
devices-dirs-$(CONFIG_SOFTMMU) += ide/
|
||||||
devices-dirs-$(CONFIG_SOFTMMU) += input/
|
devices-dirs-$(CONFIG_SOFTMMU) += input/
|
||||||
devices-dirs-$(CONFIG_SOFTMMU) += intc/
|
devices-dirs-$(CONFIG_SOFTMMU) += intc/
|
||||||
|
devices-dirs-$(CONFIG_IPACK) += ipack/
|
||||||
devices-dirs-$(CONFIG_SOFTMMU) += isa/
|
devices-dirs-$(CONFIG_SOFTMMU) += isa/
|
||||||
devices-dirs-$(CONFIG_SOFTMMU) += misc/
|
devices-dirs-$(CONFIG_SOFTMMU) += misc/
|
||||||
devices-dirs-$(CONFIG_SOFTMMU) += net/
|
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_ESCC) += escc.o
|
||||||
common-obj-$(CONFIG_PARALLEL) += parallel.o
|
common-obj-$(CONFIG_PARALLEL) += parallel.o
|
||||||
common-obj-$(CONFIG_PL011) += pl011.o
|
common-obj-$(CONFIG_PL011) += pl011.o
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
* later version.
|
* later version.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ipack.h"
|
#include "hw/ipack/ipack.h"
|
||||||
#include "qemu/bitops.h"
|
#include "qemu/bitops.h"
|
||||||
#include "sysemu/char.h"
|
#include "sysemu/char.h"
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
common-obj-$(CONFIG_IPACK) += ipack.o
|
||||||
|
common-obj-$(CONFIG_IPACK) += tpci200.o
|
|
@ -8,7 +8,7 @@
|
||||||
* later version.
|
* later version.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ipack.h"
|
#include "hw/ipack/ipack.h"
|
||||||
|
|
||||||
IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)
|
IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)
|
||||||
{
|
{
|
|
@ -8,7 +8,7 @@
|
||||||
* later version.
|
* later version.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ipack.h"
|
#include "hw/ipack/ipack.h"
|
||||||
#include "hw/pci/pci.h"
|
#include "hw/pci/pci.h"
|
||||||
#include "qemu/bitops.h"
|
#include "qemu/bitops.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
|
@ -65,7 +65,7 @@ check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh
|
||||||
# All QTests for now are POSIX-only, but the dependencies are
|
# All QTests for now are POSIX-only, but the dependencies are
|
||||||
# really in libqtest, not in the testcases themselves.
|
# really in libqtest, not in the testcases themselves.
|
||||||
|
|
||||||
gcov-files-ipack-y += hw/char/ipack.c
|
gcov-files-ipack-y += hw/ipack/ipack.c
|
||||||
check-qtest-ipack-y += tests/ipoctal232-test$(EXESUF)
|
check-qtest-ipack-y += tests/ipoctal232-test$(EXESUF)
|
||||||
gcov-files-ipack-y += hw/char/ipoctal232.c
|
gcov-files-ipack-y += hw/char/ipoctal232.c
|
||||||
|
|
||||||
|
@ -89,7 +89,7 @@ gcov-files-pci-y += $(gcov-files-virtio-y) hw/virtio/virtio-pci.c
|
||||||
check-qtest-pci-y += tests/tpci200-test$(EXESUF)
|
check-qtest-pci-y += tests/tpci200-test$(EXESUF)
|
||||||
gcov-files-pci-y += hw/char/tpci200.c
|
gcov-files-pci-y += hw/char/tpci200.c
|
||||||
check-qtest-pci-y += $(check-qtest-ipack-y)
|
check-qtest-pci-y += $(check-qtest-ipack-y)
|
||||||
gcov-files-pci-y += $(gcov-files-ipack-y) hw/char/tpci200.c
|
gcov-files-pci-y += $(gcov-files-ipack-y) hw/ipack/tpci200.c
|
||||||
|
|
||||||
check-qtest-i386-y = tests/endianness-test$(EXESUF)
|
check-qtest-i386-y = tests/endianness-test$(EXESUF)
|
||||||
check-qtest-i386-y += tests/fdc-test$(EXESUF)
|
check-qtest-i386-y += tests/fdc-test$(EXESUF)
|
||||||
|
|
Loading…
Reference in New Issue