From patchwork Fri Mar 26 19:03:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 48717 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6D719B7CBB for ; Sat, 27 Mar 2010 07:15:03 +1100 (EST) Received: from localhost ([127.0.0.1]:43716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NvFk8-0000q6-BQ for incoming@patchwork.ozlabs.org; Fri, 26 Mar 2010 16:02:56 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NvEoT-00021M-Gt for qemu-devel@nongnu.org; Fri, 26 Mar 2010 15:03:21 -0400 Received: from [140.186.70.92] (port=32776 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NvEoQ-0001z0-Pm for qemu-devel@nongnu.org; Fri, 26 Mar 2010 15:03:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NvEoJ-0007Ta-Ui for qemu-devel@nongnu.org; Fri, 26 Mar 2010 15:03:13 -0400 Received: from mail-pw0-f45.google.com ([209.85.160.45]:48744) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NvEoJ-0007OU-Q9 for qemu-devel@nongnu.org; Fri, 26 Mar 2010 15:03:11 -0400 Received: by mail-pw0-f45.google.com with SMTP id 9so6226558pwi.4 for ; Fri, 26 Mar 2010 12:03:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:received:message-id :subject:from:to:content-type; bh=pTYWCadUHA9xSorcBctHee5bjki+J3J+W8lOtSgwX60=; b=dUhJeVbXlNKnNF7FaPrTyM7rD7ugdbNiukEfp+bBQdAwqWMdQJbZIGg1c1P56QwZib bFbYr00mq2Mwjob1oqzSzMKUgC+9xuBCoXN7ARY3YzZvf+4BGFY39VYM2Pr6dbQthsxv dQG87F1i+litTQka9P7vlGZhoJ4qbkMG8J3Ks= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=o72ba4nDQlUBQzLwkiQQPLaFkenKrJazC5DXS6CSKkxfafCYRzH7HdiY8dtOJg6Jgi S0ey+n00L/xBiMRfx+6W+AN0mEu9GVS2NX5Vr6INFNT5Ph5Erzd+M4xqWOVncw98furg F2eJwQQ6MvxdaJAG+z57RdMx2wMEmnJKcTj2Q= MIME-Version: 1.0 Received: by 10.141.51.13 with HTTP; Fri, 26 Mar 2010 12:03:11 -0700 (PDT) Date: Fri, 26 Mar 2010 21:03:11 +0200 Received: by 10.141.15.21 with SMTP id s21mr1470470rvi.18.1269630191438; Fri, 26 Mar 2010 12:03:11 -0700 (PDT) Message-ID: From: Blue Swirl To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 04/10] Compile ide/macio only once X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Replace TARGET_PAGE_SIZE with 4096. Make byte swapping unconditional since PPC is big endian. Signed-off-by: Blue Swirl --- Makefile.objs | 1 + Makefile.target | 2 +- default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/ppcemb-softmmu.mak | 1 + hw/ide/macio.c | 12 ++---------- 6 files changed, 7 insertions(+), 11 deletions(-) @@ -254,9 +250,7 @@ static void pmac_ide_writel (void *opaque, MACIOIDEState *d = opaque; addr = (addr & 0xFFF) >> 4; -#ifdef TARGET_WORDS_BIGENDIAN val = bswap32(val); -#endif if (addr == 0) { ide_data_writel(&d->bus, 0, val); } @@ -273,9 +267,7 @@ static uint32_t pmac_ide_readl (void *opaque,target_phys_addr_t addr) } else { retval = 0xFFFFFFFF; } -#ifdef TARGET_WORDS_BIGENDIAN retval = bswap32(retval); -#endif return retval; } diff --git a/Makefile.objs b/Makefile.objs index 063f382..713821e 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -170,6 +170,7 @@ hw-obj-$(CONFIG_IDE_PCI) += ide/pci.o hw-obj-$(CONFIG_IDE_ISA) += ide/isa.o hw-obj-$(CONFIG_IDE_PIIX) += ide/piix.o hw-obj-$(CONFIG_IDE_CMD646) += ide/cmd646.o +hw-obj-$(CONFIG_IDE_MACIO) += ide/macio.o # SCSI layer hw-obj-y += lsi53c895a.o diff --git a/Makefile.target b/Makefile.target index fbbe63f..e3a9eed 100644 --- a/Makefile.target +++ b/Makefile.target @@ -190,7 +190,7 @@ obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += debugcon.o multiboot.o # shared objects -obj-ppc-y = ppc.o ide/macio.o +obj-ppc-y = ppc.o obj-ppc-y += vga.o dma.o openpic.o # PREP target obj-ppc-y += pckbd.o i8259.o mc146818rtc.o diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 859423f..78b01d9 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -14,6 +14,7 @@ CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y CONFIG_IDE_ISA=y CONFIG_IDE_CMD646=y +CONFIG_IDE_MACIO=y CONFIG_NE2000_ISA=y CONFIG_SOUND=y CONFIG_PFLASH_CFI02=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index 2d0028c..08b07ec 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -14,6 +14,7 @@ CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y CONFIG_IDE_ISA=y CONFIG_IDE_CMD646=y +CONFIG_IDE_MACIO=y CONFIG_NE2000_ISA=y CONFIG_SOUND=y CONFIG_PFLASH_CFI02=y diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index e5a1dcc..a099468 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -14,6 +14,7 @@ CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y CONFIG_IDE_ISA=y CONFIG_IDE_CMD646=y +CONFIG_IDE_MACIO=y CONFIG_NE2000_ISA=y CONFIG_SOUND=y CONFIG_PFLASH_CFI02=y diff --git a/hw/ide/macio.c b/hw/ide/macio.c index d1bdb49..132d579 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -77,7 +77,7 @@ static void pmac_ide_atapi_transfer_cb(void *opaque, int ret) s->io_buffer_size = io->len; - qemu_sglist_init(&s->sg, io->len / TARGET_PAGE_SIZE + 1); + qemu_sglist_init(&s->sg, io->len / 4096 + 1); qemu_sglist_add(&s->sg, io->addr, io->len); io->addr += io->len; io->len = 0; @@ -139,7 +139,7 @@ static void pmac_ide_transfer_cb(void *opaque, int ret) s->io_buffer_index = 0; s->io_buffer_size = io->len; - qemu_sglist_init(&s->sg, io->len / TARGET_PAGE_SIZE + 1); + qemu_sglist_init(&s->sg, io->len / 4096 + 1); qemu_sglist_add(&s->sg, io->addr, io->len); io->addr += io->len; io->len = 0; @@ -223,9 +223,7 @@ static void pmac_ide_writew (void *opaque, MACIOIDEState *d = opaque; addr = (addr & 0xFFF) >> 4; -#ifdef TARGET_WORDS_BIGENDIAN val = bswap16(val); -#endif if (addr == 0) { ide_data_writew(&d->bus, 0, val); } @@ -242,9 +240,7 @@ static uint32_t pmac_ide_readw (void *opaque,target_phys_addr_t addr) } else { retval = 0xFFFF; } -#ifdef TARGET_WORDS_BIGENDIAN retval = bswap16(retval); -#endif return retval; }