Commit f1ae32a1 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

usb: the big rename 



Reorganize usb source files.  Create a new hw/usb/ directory and move
all usb source code to that place.  Also make filenames a bit more
descriptive.  Host adapters are prefixed with "hch-" now, usb device
emulations are prefixed with "dev-".  Fixup paths Makefile and include
paths to make it compile.  No code changes.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent cb72b758

Makefile.objs

+13 −11
Original line number Diff line number Diff line
@@ -107,13 +107,15 @@ common-obj-y += eeprom93xx.o 
common-obj-y += scsi-disk.o cdrom.o

common-obj-y += scsi-generic.o scsi-bus.o

common-obj-y += hid.o

common-obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o

common-obj-y += usb-serial.o usb-net.o usb-bus.o usb-desc.o usb-audio.o

common-obj-y += usb/core.o usb/bus.o usb/desc.o usb/dev-hub.o

common-obj-y += usb/host-$(HOST_USB).o

common-obj-y += usb/dev-hid.o usb/dev-storage.o usb/dev-wacom.o

common-obj-y += usb/dev-serial.o usb/dev-network.o usb/dev-audio.o

common-obj-$(CONFIG_SSI) += ssi.o

common-obj-$(CONFIG_SSI_SD) += ssi-sd.o

common-obj-$(CONFIG_SD) += sd.o

common-obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o

common-obj-y += bt-hci-csr.o

common-obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o

common-obj-y += bt-hci-csr.o usb/dev-bluetooth.o

common-obj-y += buffered_file.o migration.o migration-tcp.o

common-obj-y += qemu-char.o #aio.o

common-obj-y += msmouse.o ps2.o
@@ -194,7 +196,7 @@ user-obj-y += $(trace-obj-y) 
hw-obj-y =

hw-obj-y += vl.o loader.o

hw-obj-$(CONFIG_VIRTIO) += virtio-console.o

hw-obj-y += usb-libhw.o

hw-obj-y += usb/libhw.o

hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o

hw-obj-y += fw_cfg.o

hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o
@@ -217,10 +219,10 @@ hw-obj-$(CONFIG_PARALLEL) += parallel.o 
hw-obj-$(CONFIG_I8254) += i8254_common.o i8254.o

hw-obj-$(CONFIG_PCSPK) += pcspk.o

hw-obj-$(CONFIG_PCKBD) += pckbd.o

hw-obj-$(CONFIG_USB_UHCI) += usb-uhci.o

hw-obj-$(CONFIG_USB_OHCI) += usb-ohci.o

hw-obj-$(CONFIG_USB_EHCI) += usb-ehci.o

hw-obj-$(CONFIG_USB_XHCI) += usb-xhci.o

hw-obj-$(CONFIG_USB_UHCI) += usb/hcd-uhci.o

hw-obj-$(CONFIG_USB_OHCI) += usb/hcd-ohci.o

hw-obj-$(CONFIG_USB_EHCI) += usb/hcd-ehci.o

hw-obj-$(CONFIG_USB_XHCI) += usb/hcd-xhci.o

hw-obj-$(CONFIG_FDC) += fdc.o

hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o

hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o
@@ -228,9 +230,9 @@ hw-obj-$(CONFIG_DMA) += dma.o 
hw-obj-$(CONFIG_I82374) += i82374.o

hw-obj-$(CONFIG_HPET) += hpet.o

hw-obj-$(CONFIG_APPLESMC) += applesmc.o

hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o

hw-obj-$(CONFIG_SMARTCARD) += usb/dev-smartcard-reader.o ccid-card-passthru.o

hw-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o

hw-obj-$(CONFIG_USB_REDIR) += usb-redir.o

hw-obj-$(CONFIG_USB_REDIR) += usb/redirect.o

hw-obj-$(CONFIG_I8259) += i8259_common.o i8259.o



# PPC devices

Makefile.target

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ 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 omap_gptimer.o omap_synctimer.o \

		omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o

obj-arm-y += omap_sx1.o palm.o tsc210x.o

obj-arm-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb-musb.o

obj-arm-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o

obj-arm-y += mst_fpga.o mainstone.o

obj-arm-y += z2.o

obj-arm-y += musicpal.o bitbang_i2c.o marvell_88w8618_audio.o

configure

+3 −1
Original line number Diff line number Diff line
@@ -3447,6 +3447,7 @@ mkdir -p $target_dir 
mkdir -p $target_dir/fpu

mkdir -p $target_dir/tcg

mkdir -p $target_dir/ide

mkdir -p $target_dir/usb

mkdir -p $target_dir/9pfs

mkdir -p $target_dir/kvm

if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then
@@ -3863,7 +3864,7 @@ done # for target in $targets 
DIRS="tests tests/tcg tests/tcg/cris slirp audio block net pc-bios/optionrom"

DIRS="$DIRS pc-bios/spapr-rtas"

DIRS="$DIRS roms/seabios roms/vgabios"

DIRS="$DIRS fsdev ui"

DIRS="$DIRS fsdev ui usb"

DIRS="$DIRS qapi qapi-generated"

DIRS="$DIRS qga trace qom"

FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"
@@ -3904,6 +3905,7 @@ for hwlib in 32 64; do 
  d=libhw$hwlib

  mkdir -p $d

  mkdir -p $d/ide

  mkdir -p $d/usb

  symlink $source_path/Makefile.hw $d/Makefile

  mkdir -p $d/9pfs

  echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak

hw/usb-bus.c→hw/usb/bus.c

+3 −3
Original line number Diff line number Diff line 
#include "hw.h"

#include "usb.h"

#include "qdev.h"

#include "hw/hw.h"

#include "hw/usb.h"

#include "hw/qdev.h"

#include "sysemu.h"

#include "monitor.h"

#include "trace.h"

hw/usb.c→hw/usb/core.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
 * THE SOFTWARE.

 */

#include "qemu-common.h"

#include "usb.h"

#include "hw/usb.h"

#include "iov.h"

#include "trace.h"