Patchwork [04/10] Compile ide/macio only once

login
register
mail settings
Submitter Blue Swirl
Date March 26, 2010, 7:03 p.m.
Message ID <f43fc5581003261203v55dc2ab6pd60d665d144efb77@mail.gmail.com>
Download mbox | patch
Permalink /patch/48717/
State New
Headers show

Comments

Blue Swirl - March 26, 2010, 7:03 p.m.
Replace TARGET_PAGE_SIZE with 4096. Make byte swapping unconditional
since PPC is big endian.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 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;
 }

Patch

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;
 }