On Thu, Mar 08, 2012 at 10:16:21AM +0100, Gerd Hoffmann wrote:
> 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: Gerd Hoffmann <kra...@redhat.com>
> ---
> Makefile.objs | 22 ++++++++++++----------
> Makefile.target | 2 +-
> configure | 4 +++-
> hw/{usb-bus.c => usb/bus.c} | 6 +++---
> hw/{usb.c => usb/core.c} | 2 +-
> hw/{usb-desc.c => usb/desc.c} | 4 ++--
> hw/{usb-desc.h => usb/desc.h} | 0
> hw/{usb-audio.c => usb/dev-audio.c} | 8 ++++----
> hw/{usb-bt.c => usb/dev-bluetooth.c} | 6 +++---
> hw/{usb-hid.c => usb/dev-hid.c} | 8 ++++----
> hw/{usb-hub.c => usb/dev-hub.c} | 4 ++--
> hw/{usb-net.c => usb/dev-network.c} | 4 ++--
> hw/{usb-serial.c => usb/dev-serial.c} | 4 ++--
> hw/{usb-ccid.c => usb/dev-smartcard.c} | 0
CCID is the name of the specification. Smartcard might be more
descriptive, but if you want to be both descriptive and accurate you
could do dev-smartcard-reader.c .
> hw/{usb-msd.c => usb/dev-storage.c} | 6 +++---
> hw/{usb-wacom.c => usb/dev-wacom.c} | 6 +++---
> hw/{usb-ehci.c => usb/hcd-ehci.c} | 6 +++---
> hw/{usb-musb.c => usb/hcd-musb.c} | 6 +++---
> hw/{usb-ohci.c => usb/hcd-ohci.c} | 12 ++++++------
> hw/{usb-uhci.c => usb/hcd-uhci.c} | 8 ++++----
> hw/{usb-xhci.c => usb/hcd-xhci.c} | 10 +++++-----
> usb-bsd.c => hw/usb/host-bsd.c | 0
> usb-linux.c => hw/usb/host-linux.c | 0
> usb-stub.c => hw/usb/host-stub.c | 0
> hw/{usb-libhw.c => usb/libhw.c} | 2 +-
> usb-redir.c => hw/usb/redirect.c | 0
> 26 files changed, 67 insertions(+), 63 deletions(-)
> rename hw/{usb-bus.c => usb/bus.c} (99%)
> rename hw/{usb.c => usb/core.c} (99%)
> rename hw/{usb-desc.c => usb/desc.c} (99%)
> rename hw/{usb-desc.h => usb/desc.h} (100%)
> rename hw/{usb-audio.c => usb/dev-audio.c} (99%)
> rename hw/{usb-bt.c => usb/dev-bluetooth.c} (99%)
> rename hw/{usb-hid.c => usb/dev-hid.c} (99%)
> rename hw/{usb-hub.c => usb/dev-hub.c} (99%)
> rename hw/{usb-net.c => usb/dev-network.c} (99%)
> rename hw/{usb-serial.c => usb/dev-serial.c} (99%)
> rename hw/{usb-ccid.c => usb/dev-smartcard.c} (100%)
> rename hw/{usb-msd.c => usb/dev-storage.c} (99%)
> rename hw/{usb-wacom.c => usb/dev-wacom.c} (99%)
> rename hw/{usb-ehci.c => usb/hcd-ehci.c} (99%)
> rename hw/{usb-musb.c => usb/hcd-musb.c} (99%)
> rename hw/{usb-ohci.c => usb/hcd-ohci.c} (99%)
> rename hw/{usb-uhci.c => usb/hcd-uhci.c} (99%)
> rename hw/{usb-xhci.c => usb/hcd-xhci.c} (99%)
> rename usb-bsd.c => hw/usb/host-bsd.c (100%)
> rename usb-linux.c => hw/usb/host-linux.c (100%)
> rename usb-stub.c => hw/usb/host-stub.c (100%)
> rename hw/{usb-libhw.c => usb/libhw.c} (99%)
> rename usb-redir.c => hw/usb/redirect.c (100%)
>
> diff --git a/Makefile.objs b/Makefile.objs
> index 808de6a..a97338b 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -103,13 +103,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
> @@ -190,7 +192,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
> @@ -213,10 +215,10 @@ hw-obj-$(CONFIG_PARALLEL) += parallel.o
> hw-obj-$(CONFIG_I8254) += 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
> @@ -226,7 +228,7 @@ 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_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
> diff --git a/Makefile.target b/Makefile.target
> index 343eb78..16e6e4b 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -365,7 +365,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
> diff --git a/configure b/configure
> index a5eb832..14fa213 100755
> --- a/configure
> +++ b/configure
> @@ -3428,6 +3428,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
> @@ -3844,7 +3845,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"
> @@ -3885,6 +3886,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
> diff --git a/hw/usb-bus.c b/hw/usb/bus.c
> similarity index 99%
> rename from hw/usb-bus.c
> rename to hw/usb/bus.c
> index 70b7ebc..d3f8358 100644
> --- a/hw/usb-bus.c
> +++ b/hw/usb/bus.c
> @@ -1,6 +1,6 @@
> -#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"
> diff --git a/hw/usb.c b/hw/usb/core.c
> similarity index 99%
> rename from hw/usb.c
> rename to hw/usb/core.c
> index 1ec2e90..494989a 100644
> --- a/hw/usb.c
> +++ b/hw/usb/core.c
> @@ -24,7 +24,7 @@
> * THE SOFTWARE.
> */
> #include "qemu-common.h"
> -#include "usb.h"
> +#include "hw/usb.h"
> #include "iov.h"
> #include "trace.h"
>
> diff --git a/hw/usb-desc.c b/hw/usb/desc.c
> similarity index 99%
> rename from hw/usb-desc.c
> rename to hw/usb/desc.c
> index ccf85ad..9847a75 100644
> --- a/hw/usb-desc.c
> +++ b/hw/usb/desc.c
> @@ -1,5 +1,5 @@
> -#include "usb.h"
> -#include "usb-desc.h"
> +#include "hw/usb.h"
> +#include "hw/usb/desc.h"
> #include "trace.h"
>
> /* ------------------------------------------------------------------ */
> diff --git a/hw/usb-desc.h b/hw/usb/desc.h
> similarity index 100%
> rename from hw/usb-desc.h
> rename to hw/usb/desc.h
> diff --git a/hw/usb-audio.c b/hw/usb/dev-audio.c
> similarity index 99%
> rename from hw/usb-audio.c
> rename to hw/usb/dev-audio.c
> index fed1361..426b95c 100644
> --- a/hw/usb-audio.c
> +++ b/hw/usb/dev-audio.c
> @@ -30,10 +30,10 @@
> */
>
> #include "qemu-common.h"
> -#include "usb.h"
> -#include "usb-desc.h"
> -#include "hw.h"
> -#include "audiodev.h"
> +#include "hw/usb.h"
> +#include "hw/usb/desc.h"
> +#include "hw/hw.h"
> +#include "hw/audiodev.h"
> #include "audio/audio.h"
>
> #define USBAUDIO_VENDOR_NUM 0x46f4 /* CRC16() of "QEMU" */
> diff --git a/hw/usb-bt.c b/hw/usb/dev-bluetooth.c
> similarity index 99%
> rename from hw/usb-bt.c
> rename to hw/usb/dev-bluetooth.c
> index 23c39ec..195370c 100644
> --- a/hw/usb-bt.c
> +++ b/hw/usb/dev-bluetooth.c
> @@ -19,10 +19,10 @@
> */
>
> #include "qemu-common.h"
> -#include "usb.h"
> -#include "usb-desc.h"
> +#include "hw/usb.h"
> +#include "hw/usb/desc.h"
> #include "net.h"
> -#include "bt.h"
> +#include "hw/bt.h"
>
> struct USBBtState {
> USBDevice dev;
> diff --git a/hw/usb-hid.c b/hw/usb/dev-hid.c
> similarity index 99%
> rename from hw/usb-hid.c
> rename to hw/usb/dev-hid.c
> index 37bca78..f29544d 100644
> --- a/hw/usb-hid.c
> +++ b/hw/usb/dev-hid.c
> @@ -22,12 +22,12 @@
> * 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 "console.h"
> -#include "usb.h"
> -#include "usb-desc.h"
> +#include "hw/usb.h"
> +#include "hw/usb/desc.h"
> #include "qemu-timer.h"
> -#include "hid.h"
> +#include "hw/hid.h"
>
> /* HID interface requests */
> #define GET_REPORT 0xa101
> diff --git a/hw/usb-hub.c b/hw/usb/dev-hub.c
> similarity index 99%
> rename from hw/usb-hub.c
> rename to hw/usb/dev-hub.c
> index a12856e..eb4e711 100644
> --- a/hw/usb-hub.c
> +++ b/hw/usb/dev-hub.c
> @@ -22,8 +22,8 @@
> * THE SOFTWARE.
> */
> #include "qemu-common.h"
> -#include "usb.h"
> -#include "usb-desc.h"
> +#include "hw/usb.h"
> +#include "hw/usb/desc.h"
>
> //#define DEBUG
>
> diff --git a/hw/usb-net.c b/hw/usb/dev-network.c
> similarity index 99%
> rename from hw/usb-net.c
> rename to hw/usb/dev-network.c
> index 22b8201..cff55f2 100644
> --- a/hw/usb-net.c
> +++ b/hw/usb/dev-network.c
> @@ -24,8 +24,8 @@
> */
>
> #include "qemu-common.h"
> -#include "usb.h"
> -#include "usb-desc.h"
> +#include "hw/usb.h"
> +#include "hw/usb/desc.h"
> #include "net.h"
> #include "qemu-queue.h"
> #include "sysemu.h"
> diff --git a/hw/usb-serial.c b/hw/usb/dev-serial.c
> similarity index 99%
> rename from hw/usb-serial.c
> rename to hw/usb/dev-serial.c
> index 0aae379..8dcac8b 100644
> --- a/hw/usb-serial.c
> +++ b/hw/usb/dev-serial.c
> @@ -10,8 +10,8 @@
>
> #include "qemu-common.h"
> #include "qemu-error.h"
> -#include "usb.h"
> -#include "usb-desc.h"
> +#include "hw/usb.h"
> +#include "hw/usb/desc.h"
> #include "qemu-char.h"
>
> //#define DEBUG_Serial
> diff --git a/hw/usb-ccid.c b/hw/usb/dev-smartcard.c
> similarity index 100%
> rename from hw/usb-ccid.c
> rename to hw/usb/dev-smartcard.c
> diff --git a/hw/usb-msd.c b/hw/usb/dev-storage.c
> similarity index 99%
> rename from hw/usb-msd.c
> rename to hw/usb/dev-storage.c
> index c6f08a0..6ffaf70 100644
> --- a/hw/usb-msd.c
> +++ b/hw/usb/dev-storage.c
> @@ -10,9 +10,9 @@
> #include "qemu-common.h"
> #include "qemu-option.h"
> #include "qemu-config.h"
> -#include "usb.h"
> -#include "usb-desc.h"
> -#include "scsi.h"
> +#include "hw/usb.h"
> +#include "hw/usb/desc.h"
> +#include "hw/scsi.h"
> #include "console.h"
> #include "monitor.h"
> #include "sysemu.h"
> diff --git a/hw/usb-wacom.c b/hw/usb/dev-wacom.c
> similarity index 99%
> rename from hw/usb-wacom.c
> rename to hw/usb/dev-wacom.c
> index 197e2dc..c1cfd74 100644
> --- a/hw/usb-wacom.c
> +++ b/hw/usb/dev-wacom.c
> @@ -25,10 +25,10 @@
> * 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 "console.h"
> -#include "usb.h"
> -#include "usb-desc.h"
> +#include "hw/usb.h"
> +#include "hw/usb/desc.h"
>
> /* Interface requests */
> #define WACOM_GET_REPORT 0x2101
> diff --git a/hw/usb-ehci.c b/hw/usb/hcd-ehci.c
> similarity index 99%
> rename from hw/usb-ehci.c
> rename to hw/usb/hcd-ehci.c
> index df742f7..58811d3 100644
> --- a/hw/usb-ehci.c
> +++ b/hw/usb/hcd-ehci.c
> @@ -22,10 +22,10 @@
> * along with this program; if not, see <http://www.gnu.org/licenses/>.
> */
>
> -#include "hw.h"
> +#include "hw/hw.h"
> #include "qemu-timer.h"
> -#include "usb.h"
> -#include "pci.h"
> +#include "hw/usb.h"
> +#include "hw/pci.h"
> #include "monitor.h"
> #include "trace.h"
> #include "dma.h"
> diff --git a/hw/usb-musb.c b/hw/usb/hcd-musb.c
> similarity index 99%
> rename from hw/usb-musb.c
> rename to hw/usb/hcd-musb.c
> index 820907a..fa9385e 100644
> --- a/hw/usb-musb.c
> +++ b/hw/usb/hcd-musb.c
> @@ -22,9 +22,9 @@
> */
> #include "qemu-common.h"
> #include "qemu-timer.h"
> -#include "usb.h"
> -#include "irq.h"
> -#include "hw.h"
> +#include "hw/usb.h"
> +#include "hw/irq.h"
> +#include "hw/hw.h"
>
> /* Common USB registers */
> #define MUSB_HDRC_FADDR 0x00 /* 8-bit */
> diff --git a/hw/usb-ohci.c b/hw/usb/hcd-ohci.c
> similarity index 99%
> rename from hw/usb-ohci.c
> rename to hw/usb/hcd-ohci.c
> index 20aaa74..dd79cef 100644
> --- a/hw/usb-ohci.c
> +++ b/hw/usb/hcd-ohci.c
> @@ -26,13 +26,13 @@
> * o BIOS work to boot from USB storage
> */
>
> -#include "hw.h"
> +#include "hw/hw.h"
> #include "qemu-timer.h"
> -#include "usb.h"
> -#include "pci.h"
> -#include "usb-ohci.h"
> -#include "sysbus.h"
> -#include "qdev-addr.h"
> +#include "hw/usb.h"
> +#include "hw/pci.h"
> +#include "hw/usb-ohci.h"
> +#include "hw/sysbus.h"
> +#include "hw/qdev-addr.h"
>
> //#define DEBUG_OHCI
> /* Dump packet contents. */
> diff --git a/hw/usb-uhci.c b/hw/usb/hcd-uhci.c
> similarity index 99%
> rename from hw/usb-uhci.c
> rename to hw/usb/hcd-uhci.c
> index 304b84b..7c2e9b3 100644
> --- a/hw/usb-uhci.c
> +++ b/hw/usb/hcd-uhci.c
> @@ -25,11 +25,11 @@
> * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> * THE SOFTWARE.
> */
> -#include "hw.h"
> -#include "usb.h"
> -#include "pci.h"
> +#include "hw/hw.h"
> +#include "hw/usb.h"
> +#include "hw/pci.h"
> #include "qemu-timer.h"
> -#include "usb-uhci.h"
> +#include "hw/usb-uhci.h"
> #include "iov.h"
> #include "dma.h"
>
> diff --git a/hw/usb-xhci.c b/hw/usb/hcd-xhci.c
> similarity index 99%
> rename from hw/usb-xhci.c
> rename to hw/usb/hcd-xhci.c
> index e8f1b6e..73b0c7f 100644
> --- a/hw/usb-xhci.c
> +++ b/hw/usb/hcd-xhci.c
> @@ -18,12 +18,12 @@
> * You should have received a copy of the GNU Lesser General Public
> * License along with this library; if not, see
> <http://www.gnu.org/licenses/>.
> */
> -#include "hw.h"
> +#include "hw/hw.h"
> #include "qemu-timer.h"
> -#include "usb.h"
> -#include "pci.h"
> -#include "qdev-addr.h"
> -#include "msi.h"
> +#include "hw/usb.h"
> +#include "hw/pci.h"
> +#include "hw/qdev-addr.h"
> +#include "hw/msi.h"
>
> //#define DEBUG_XHCI
> //#define DEBUG_DATA
> diff --git a/usb-bsd.c b/hw/usb/host-bsd.c
> similarity index 100%
> rename from usb-bsd.c
> rename to hw/usb/host-bsd.c
> diff --git a/usb-linux.c b/hw/usb/host-linux.c
> similarity index 100%
> rename from usb-linux.c
> rename to hw/usb/host-linux.c
> diff --git a/usb-stub.c b/hw/usb/host-stub.c
> similarity index 100%
> rename from usb-stub.c
> rename to hw/usb/host-stub.c
> diff --git a/hw/usb-libhw.c b/hw/usb/libhw.c
> similarity index 99%
> rename from hw/usb-libhw.c
> rename to hw/usb/libhw.c
> index 162b42b..2462351 100644
> --- a/hw/usb-libhw.c
> +++ b/hw/usb/libhw.c
> @@ -21,7 +21,7 @@
> */
> #include "qemu-common.h"
> #include "cpu-common.h"
> -#include "usb.h"
> +#include "hw/usb.h"
> #include "dma.h"
>
> int usb_packet_map(USBPacket *p, QEMUSGList *sgl)
> diff --git a/usb-redir.c b/hw/usb/redirect.c
> similarity index 100%
> rename from usb-redir.c
> rename to hw/usb/redirect.c
> --
> 1.7.1
>
>
