Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-6]: src/sys/arch/arm/xscale Pull up revision 1.2 (requested by ...
details: https://anonhg.NetBSD.org/src/rev/9fd54138ad7c
branches: netbsd-1-6
changeset: 528086:9fd54138ad7c
user: lukem <lukem%NetBSD.org@localhost>
date: Tue Jun 25 22:12:13 2002 +0000
description:
Pull up revision 1.2 (requested by thorpej in ticket #364):
* Interrupt status is in cp13.4, not cp13.1 (D'oh!)
* Fix an inverted test.
diffstat:
sys/arch/arm/xscale/i80200_irq.S | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r 0d85ec99fe2c -r 9fd54138ad7c sys/arch/arm/xscale/i80200_irq.S
--- a/sys/arch/arm/xscale/i80200_irq.S Tue Jun 25 22:10:18 2002 +0000
+++ b/sys/arch/arm/xscale/i80200_irq.S Tue Jun 25 22:12:13 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i80200_irq.S,v 1.1 2002/01/24 01:12:40 thorpej Exp $ */
+/* $NetBSD: i80200_irq.S,v 1.1.14.1 2002/06/25 22:12:13 lukem Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -93,7 +93,7 @@
/*
* Get the interrupt status into a callee-save register.
*/
- mrc p13, 0, r4, c1, c0, 0
+ mrc p13, 0, r4, c4, c0, 0
/*
* XXX Right here will be a good place to check for PMU
@@ -108,7 +108,7 @@
* disabled.
*/
tst r4, #(INTSRC_II)
- bne Lextirq_return /* no external IRQ pending */
+ beq Lextirq_return /* no external IRQ pending */
ldr r1, Lintr_dispatch
add lr, pc, #Lextirq_return - . - 8
mov r0, sp
Home |
Main Index |
Thread Index |
Old Index