Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to unified syntax

This commit is contained in:
matt 2013-08-12 17:32:03 +00:00
parent a6c6eb019c
commit 029a1f3b59
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/shark/isa/isa_irq.S
View File

@ -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

4
sys/arch/shark/shark/shark_fiq.S
View File

@ -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.