Skip to contentSkip to conversation

Order IRQ bit numbers

PATCH New Hollis Blanchard 1 participant 1 message Mar 28, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Order IRQ bit numbers

2 files changed, 3 insertions(+), 3 deletions(-)
qemu/hw/ppc440.c      |    4 ++--
qemu/hw/ppc4xx_devs.c |    2 +-

# HG changeset patch
# User Hollis Blanchard <[email protected]>
# Date 1206672133 18000
# Branch merge
# Node ID 70ac21ad91e107e5b58a7488f8f9a81a1acbda9f
# Parent 217bc81a8881e9b706a42cfed1f02bfc660657b9
[qemu ppc uic] Order IRQ bit numbers as described in the UIC documentation.

qemu/hw/ppc440.c +2 -2
@@ -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]);
 	}
 }
qemu/hw/ppc4xx_devs.c +1 -1
@@ -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
[email protected]
https://lists.sourceforge.net/lists/listinfo/kvm-ppc-devel