Module Name: src
Committed By: matt
Date: Mon Aug 12 17:32:03 UTC 2013
Modified Files:
src/sys/arch/shark/isa: isa_irq.S
src/sys/arch/shark/shark: shark_fiq.S
Log Message:
Update to unified syntax
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/shark/isa/isa_irq.S
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/shark/shark/shark_fiq.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/shark/isa/isa_irq.S
diff -u src/sys/arch/shark/isa/isa_irq.S:1.14 src/sys/arch/shark/isa/isa_irq.S:1.15
--- src/sys/arch/shark/isa/isa_irq.S:1.14 Mon Sep 3 16:35:33 2012
+++ src/sys/arch/shark/isa/isa_irq.S Mon Aug 12 17:32:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_irq.S,v 1.14 2012/09/03 16:35:33 matt Exp $ */
+/* $NetBSD: isa_irq.S,v 1.15 2013/08/12 17:32:03 matt Exp $ */
/*
* Copyright 1997
@@ -143,7 +143,7 @@ ASENTRY_NP(irq_entry)
/* address of 8259 #2 */
tst r2, #(1 << IRQ_SLAVE) /* if slave is enabled */
tstne r8, #(1 << IRQ_SLAVE) /* anything from slave? */
- ldrneb r1, [r0, #IO_ICU2] /* ocw3 = irr */
+ ldrbne r1, [r0, #IO_ICU2] /* ocw3 = irr */
orrne r8, r8, r1, lsl #8
and r8, r8, r2 /* clear disabled */
@@ -366,12 +366,12 @@ ENTRY(irq_setmasks)
/* see if there's any change for 8259 #1 (master) */
tst r2, #0x00FF /* bottom 8 bits different? */
- strneb r1, [r0, #(IO_ICU1 + 1)] /* icu1 / ocw1 */
+ strbne r1, [r0, #(IO_ICU1 + 1)] /* icu1 / ocw1 */
/* anything for 8259 #2? */
tst r2, #0xFF00
mov r1, r1, lsr #8 /* next byte */
- strneb r1, [r0, #(IO_ICU2 + 1)] /* icu2 / ocw1 */
+ strbne r1, [r0, #(IO_ICU2 + 1)] /* icu2 / ocw1 */
/* Restore old cpsr and exit */
msr cpsr_all, r3
Index: src/sys/arch/shark/shark/shark_fiq.S
diff -u src/sys/arch/shark/shark/shark_fiq.S:1.2 src/sys/arch/shark/shark/shark_fiq.S:1.3
--- src/sys/arch/shark/shark/shark_fiq.S:1.2 Tue May 20 04:44:52 2003
+++ src/sys/arch/shark/shark/shark_fiq.S Mon Aug 12 17:32:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: shark_fiq.S,v 1.2 2003/05/20 04:44:52 simonb Exp $ */
+/* $NetBSD: shark_fiq.S,v 1.3 2013/08/12 17:32:03 matt Exp $ */
/*
* Copyright 1997
@@ -129,7 +129,7 @@ _C_LABEL(shark_fiq):
str r11, [r12]
cmp r9, #0
- subeqs pc, lr, #4 /* no routine => return from trap */
+ subseq pc, lr, #4 /* no routine => return from trap */
/* assume that the C routine follows the ARM procedure call standard.
save only user registers and let the C code save the rest.
