From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53635 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PNeVG-0002OE-5g for qemu-devel@nongnu.org; Tue, 30 Nov 2010 23:41:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PNRJt-0002Pa-Lv for qemu-devel@nongnu.org; Tue, 30 Nov 2010 09:36:40 -0500 Received: from cantor.suse.de ([195.135.220.2]:55586 helo=mx1.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PNRJt-0001JZ-Az for qemu-devel@nongnu.org; Tue, 30 Nov 2010 09:36:37 -0500 From: Alexander Graf Date: Tue, 30 Nov 2010 15:36:01 +0100 Message-Id: <1291127761-16501-16-git-send-email-agraf@suse.de> In-Reply-To: <1291127761-16501-1-git-send-email-agraf@suse.de> References: <1291127761-16501-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 15/15] usb_ohci: Always use little endian List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel Developers Cc: Blue Swirl , Paul Brook This patch replaces explicit bswaps with endianness hints to the mmio layer. Because we don't depend on the target endianness anymore, we can also move the driver over to Makefile.objs. Signed-off-by: Alexander Graf --- Makefile.objs | 1 + Makefile.target | 3 --- hw/usb-ohci.c | 9 +-------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 5a679c6..f2c971c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -179,6 +179,7 @@ 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_FDC) += fdc.o hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o diff --git a/Makefile.target b/Makefile.target index c96107c..74930ae 100644 --- a/Makefile.target +++ b/Makefile.target @@ -206,9 +206,6 @@ QEMU_CFLAGS += $(VNC_PNG_CFLAGS) # xen backend driver support obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o -# USB layer -obj-$(CONFIG_USB_OHCI) += usb-ohci.o - # Inter-VM PCI shared memory obj-$(CONFIG_KVM) += ivshmem.o diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c index 0c1bdeb..4716c27 100644 --- a/hw/usb-ohci.c +++ b/hw/usb-ohci.c @@ -1530,9 +1530,6 @@ static uint32_t ohci_mem_read(void *ptr, target_phys_addr_t addr) } } -#ifdef TARGET_WORDS_BIGENDIAN - retval = bswap32(retval); -#endif return retval; } @@ -1542,10 +1539,6 @@ static void ohci_mem_write(void *ptr, target_phys_addr_t addr, uint32_t val) addr &= 0xff; -#ifdef TARGET_WORDS_BIGENDIAN - val = bswap32(val); -#endif - /* Only aligned reads are allowed on OHCI */ if (addr & 3) { fprintf(stderr, "usb-ohci: Mis-aligned write\n"); @@ -1698,7 +1691,7 @@ static void usb_ohci_init(OHCIState *ohci, DeviceState *dev, } ohci->mem = cpu_register_io_memory(ohci_readfn, ohci_writefn, ohci, - DEVICE_NATIVE_ENDIAN); + DEVICE_LITTLE_ENDIAN); ohci->localmem_base = localmem_base; ohci->name = dev->info->name; -- 1.6.0.2