diff options
| -rw-r--r-- | Makefile.target | 10 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | hw/ide/core.c (renamed from hw/ide.c) | 13 | ||||
| -rw-r--r-- | hw/ide/internal.h (renamed from hw/ide-internal.h) | 4 | ||||
| -rw-r--r-- | hw/ide/isa.c (renamed from hw/ide-isa.c) | 7 | ||||
| -rw-r--r-- | hw/ide/macio.c (renamed from hw/ide-macio.c) | 9 | ||||
| -rw-r--r-- | hw/ide/microdrive.c (renamed from hw/ide-microdrive.c) | 9 | ||||
| -rw-r--r-- | hw/ide/mmio.c (renamed from hw/ide-mmio.c) | 5 | ||||
| -rw-r--r-- | hw/ide/pci.c (renamed from hw/ide-pci.c) | 9 |
9 files changed, 37 insertions, 30 deletions
diff --git a/Makefile.target b/Makefile.target index 6e94e138a4..f7d1919e87 100644 --- a/Makefile.target +++ b/Makefile.target @@ -183,7 +183,7 @@ obj-y += e1000.o obj-y += wdt_i6300esb.o # Hardware support -obj-i386-y = ide.o ide-isa.o ide-pci.o pckbd.o vga.o $(sound-obj-y) dma.o isa-bus.o +obj-i386-y = ide/core.o ide/isa.o ide/pci.o pckbd.o vga.o $(sound-obj-y) dma.o isa-bus.o obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o @@ -212,7 +212,7 @@ obj-ppc-$(CONFIG_FDT) += device_tree.o obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o obj-mips-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o obj-mips-y += g364fb.o jazz_led.o dp8393x.o -obj-mips-y += ide.o ide-isa.o ide-pci.o +obj-mips-y += ide/core.o ide/isa.o ide/pci.o obj-mips-y += gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o obj-mips-y += piix_pci.o parallel.o cirrus_vga.o isa-bus.o pcspk.o $(sound-obj-y) obj-mips-y += mipsnet.o @@ -244,7 +244,7 @@ obj-cris-y += etraxfs_ser.o obj-cris-y += pflash_cfi02.o ifeq ($(TARGET_ARCH), sparc64) -obj-sparc-y = sun4u.o ide.o ide-pci.o isa-bus.o pckbd.o vga.o apb_pci.o +obj-sparc-y = sun4u.o ide/core.o ide/pci.o isa-bus.o pckbd.o vga.o apb_pci.o obj-sparc-y += fdc.o mc146818rtc.o serial.o obj-sparc-y += cirrus_vga.o parallel.o else @@ -263,7 +263,7 @@ obj-arm-y += arm-semi.o obj-arm-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o obj-arm-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o obj-arm-y += pflash_cfi01.o gumstix.o -obj-arm-y += zaurus.o ide.o isa-bus.o ide-microdrive.o serial.o spitz.o tosa.o tc6393xb.o +obj-arm-y += zaurus.o ide/core.o isa-bus.o ide/microdrive.o serial.o spitz.o tosa.o tc6393xb.o obj-arm-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o obj-arm-y += omap2.o omap_dss.o soc_dma.o obj-arm-y += omap_sx1.o palm.o tsc210x.o @@ -277,7 +277,7 @@ obj-arm-y += syborg_virtio.o obj-sh4-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o obj-sh4-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o serial.o -obj-sh4-y += ide.o isa-bus.o ide-mmio.o +obj-sh4-y += ide/core.o isa-bus.o ide/mmio.o obj-m68k-y = an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o obj-m68k-y += m68k-semi.o dummy_m68k.o @@ -1991,6 +1991,7 @@ test -f $config_h && mv $config_h ${config_h}~ mkdir -p $target_dir mkdir -p $target_dir/fpu mkdir -p $target_dir/tcg +mkdir -p $target_dir/ide if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then mkdir -p $target_dir/nwfpe fi diff --git a/hw/ide.c b/hw/ide/core.c index 7064e6d0ac..79a3a9c7ad 100644 --- a/hw/ide.c +++ b/hw/ide/core.c @@ -22,17 +22,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" -#include "pci.h" -#include "scsi-disk.h" +#include <hw/hw.h> +#include <hw/pc.h> +#include <hw/pci.h> +#include <hw/scsi-disk.h> +#include <hw/sh.h> #include "block.h" #include "block_int.h" #include "qemu-timer.h" #include "sysemu.h" -#include "sh.h" #include "dma.h" -#include "ide-internal.h" + +#include <hw/ide/internal.h> static int smart_attributes[][5] = { /* id, flags, val, wrst, thrsh */ diff --git a/hw/ide-internal.h b/hw/ide/internal.h index 4f3f86ceb5..65991a8b07 100644 --- a/hw/ide-internal.h +++ b/hw/ide/internal.h @@ -3,10 +3,10 @@ /* * QEMU IDE Emulation -- internal header file - * only hw/ide*.c is supposed to include this file. + * only files in hw/ide/ are supposed to include this file. * non-internal declarations are in hw/ide.h */ -#include "ide.h" +#include <hw/ide.h> /* debug IDE devices */ //#define DEBUG_IDE diff --git a/hw/ide-isa.c b/hw/ide/isa.c index 279474b30e..aa026c7a62 100644 --- a/hw/ide-isa.c +++ b/hw/ide/isa.c @@ -22,13 +22,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" +#include <hw/hw.h> +#include <hw/pc.h> #include "block.h" #include "block_int.h" #include "sysemu.h" #include "dma.h" -#include "ide-internal.h" + +#include <hw/ide/internal.h> /***********************************************************/ /* ISA IDE definitions */ diff --git a/hw/ide-macio.c b/hw/ide/macio.c index d4135efe3a..4dc35682f1 100644 --- a/hw/ide-macio.c +++ b/hw/ide/macio.c @@ -22,14 +22,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include <hw/hw.h> +#include <hw/ppc_mac.h> +#include <hw/mac_dbdma.h> #include "block.h" #include "block_int.h" #include "sysemu.h" #include "dma.h" -#include "ppc_mac.h" -#include "mac_dbdma.h" -#include "ide-internal.h" + +#include <hw/ide/internal.h> /***********************************************************/ /* MacIO based PowerPC IDE */ diff --git a/hw/ide-microdrive.c b/hw/ide/microdrive.c index f055425fae..a735452e50 100644 --- a/hw/ide-microdrive.c +++ b/hw/ide/microdrive.c @@ -22,14 +22,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" +#include <hw/hw.h> +#include <hw/pc.h> +#include <hw/pcmcia.h> #include "block.h" #include "block_int.h" #include "sysemu.h" #include "dma.h" -#include "ide-internal.h" -#include "pcmcia.h" + +#include <hw/ide/internal.h> /***********************************************************/ /* CF-ATA Microdrive */ diff --git a/hw/ide-mmio.c b/hw/ide/mmio.c index ba4363049e..99ddf9d4d9 100644 --- a/hw/ide-mmio.c +++ b/hw/ide/mmio.c @@ -22,12 +22,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include <hw/hw.h> #include "block.h" #include "block_int.h" #include "sysemu.h" #include "dma.h" -#include "ide-internal.h" + +#include <hw/ide/internal.h> /***********************************************************/ /* MMIO based ide port diff --git a/hw/ide-pci.c b/hw/ide/pci.c index e3826bfec0..a3d6bd0dc6 100644 --- a/hw/ide-pci.c +++ b/hw/ide/pci.c @@ -22,14 +22,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" +#include <hw/hw.h> +#include <hw/pc.h> +#include <hw/pci.h> #include "block.h" #include "block_int.h" #include "sysemu.h" #include "dma.h" -#include "pci.h" -#include "ide-internal.h" + +#include <hw/ide/internal.h> /***********************************************************/ /* PCI IDE definitions */ |