From: Hollis Blanchard Date: Fri, 28 Mar 2008 02:49:37 +0000 Subject: [kvm-ppc-devel] [PATCH 1 of 4] [qemu ppc uic] Order IRQ bit numbers Message-Id: <70ac21ad91e107e5b58a.1206672577@basalt> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kvm-ppc@vger.kernel.org 2 files changed, 3 insertions(+), 3 deletions(-) qemu/hw/ppc440.c | 4 ++-- qemu/hw/ppc4xx_devs.c | 2 +- # HG changeset patch # User Hollis Blanchard # Date 1206672133 18000 # Branch merge # Node ID 70ac21ad91e107e5b58a7488f8f9a81a1acbda9f # Parent 217bc81a8881e9b706a42cfed1f02bfc660657b9 [qemu ppc uic] Order IRQ bit numbers as described in the UIC documentation. Signed-off-by: Hollis Blanchard diff --git a/qemu/hw/ppc440.c b/qemu/hw/ppc440.c --- a/qemu/hw/ppc440.c +++ b/qemu/hw/ppc440.c @@ -47,10 +47,10 @@ void ppc440ep_init(CPUState *env, /* serial ports on page 126 of 440EP user manual */ if (serial_hds[0]) { printf("Initializing first serial port\n"); - ppc405_serial_init(env, mmio,0x300, pic[31], serial_hds[0]); + ppc405_serial_init(env, mmio,0x300, pic[0], serial_hds[0]); } if (serial_hds[1]) { printf("Initializing 2nd serial port\n"); - ppc405_serial_init(env, mmio,0x400, pic[30], serial_hds[1]); + ppc405_serial_init(env, mmio,0x400, pic[1], serial_hds[1]); } } diff --git a/qemu/hw/ppc4xx_devs.c b/qemu/hw/ppc4xx_devs.c --- a/qemu/hw/ppc4xx_devs.c +++ b/qemu/hw/ppc4xx_devs.c @@ -365,7 +365,7 @@ static void ppcuic_set_irq (void *opaque uint32_t mask, sr; uic = opaque; - mask = 1 << irq_num; + mask = 1 << (31-irq_num); #ifdef DEBUG_UIC if (loglevel & CPU_LOG_INT) { fprintf(logfile, "%s: irq %d level %d uicsr %08" PRIx32 ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace _______________________________________________ kvm-ppc-devel mailing list kvm-ppc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-ppc-devel