Module Name: src
Committed By: skrll
Date: Sat Nov 21 09:36:27 UTC 2020
Modified Files:
src/sys/arch/arm/iomd: iomd_irq.S
src/sys/arch/arm/ofw: ofw_irq.S
src/sys/arch/arm/sa11x0: sa11x0_irq.S
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/iomd/iomd_irq.S
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/ofw/ofw_irq.S
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/sa11x0/sa11x0_irq.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/arm/iomd/iomd_irq.S
diff -u src/sys/arch/arm/iomd/iomd_irq.S:1.16 src/sys/arch/arm/iomd/iomd_irq.S:1.17
--- src/sys/arch/arm/iomd/iomd_irq.S:1.16 Mon Dec 2 18:36:10 2013
+++ src/sys/arch/arm/iomd/iomd_irq.S Sat Nov 21 09:36:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: iomd_irq.S,v 1.16 2013/12/02 18:36:10 joerg Exp $ */
+/* $NetBSD: iomd_irq.S,v 1.17 2020/11/21 09:36:26 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -199,7 +199,7 @@ Lfind_highest_ipl:
mvn r2, r2
orr r0, r0, r2
- str r0, [r1]
+ str r0, [r1]
ldr r0, [r4, #CI_CPL]
str r9, [r4, #CI_CPL]
@@ -214,7 +214,7 @@ Lfind_highest_ipl:
ldr r7, Lirqhandlers
- /*
+ /*
* take a copy of the IRQ request so that we can strip bits out of it
* note that we only use 24 bits with iomd2 chips
*/
@@ -229,7 +229,7 @@ Lfind_highest_ipl:
rsb r5, r11, #0
ands r10, r11, r5
- /*
+ /*
* now r10 has at most 1 set bit, call this X
* if X = 0, branch to exit code
*/
@@ -252,7 +252,7 @@ irqloop:
/* fetch the bit number */
ldrb r9, [r5, r9, lsr #26 ]
- /*
+ /*
* r9 = irq to service
*/
@@ -271,7 +271,7 @@ irqloop:
moveq r0, r8 /* IRQ requests as arg 0 */
adreq lr, nextirq /* return Address */
beq _C_LABEL(stray_irqhandler) /* call special handler */
-
+
/* stat info C */
ldr r1, [r4, #(CI_CC_NINTR)] /* Stat info B */
ldr r2, [r4, #(CI_CC_NINTR+4)]
@@ -305,9 +305,9 @@ irqchainloop:
ldr pc, [r6, #(IH_FUNC)] /* Call handler */
ldr r6, [r6, #(IH_NEXT)] /* fetch next handler */
-
+
teq r0, #0x00000001 /* Was the irq serviced ? */
-
+
/* if it was it'll just fall through this: */
teqne r6, #0x00000000
bne irqchainloop
Index: src/sys/arch/arm/ofw/ofw_irq.S
diff -u src/sys/arch/arm/ofw/ofw_irq.S:1.15 src/sys/arch/arm/ofw/ofw_irq.S:1.16
--- src/sys/arch/arm/ofw/ofw_irq.S:1.15 Mon Dec 2 18:36:10 2013
+++ src/sys/arch/arm/ofw/ofw_irq.S Sat Nov 21 09:36:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_irq.S,v 1.15 2013/12/02 18:36:10 joerg Exp $ */
+/* $NetBSD: ofw_irq.S,v 1.16 2020/11/21 09:36:27 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -56,11 +56,11 @@
*
* This function is called only on timer ticks, passed on to the
* kernel from the OFW tick handler.
- *
+ *
* For now, I am trying to re-use as much of the code from the
* IOMD interrupt-handler as possible. In time, I will strip this
* down to something OFW-specific.
- *
+ *
* Here's the original, IOMD-specific description:
* This function reads the irq request bits in the IOMD registers
* IRQRQA, IRQRQB and DMARQ
@@ -106,21 +106,21 @@ AST_ALIGNMENT_FAULT_LOCALS
ASENTRY_NP(irq_entry)
/*
* We come here following an OFW-handled timer tick.
- *
+ *
* We are in the SVC frame, and interrupts are disabled.
* The state of the interrupted context is partially in
* the registers and partially in the global storage area
* labeled ofw_ticktmp. ofw_ticktmp is filled-in by the
* tick callback that is invoked by OFW on the way out of
* its interrupt handler. ofw_ticktmp contains the following:
- *
+ *
* pc // interrupted instruction
* lr_usr
* sp_usr
* r1 // makes r1 available for scratch
* r0 // makes r0 available for scratch
* spsr_svc // cpsr of interrupted context
- *
+ *
* The prologue of this routine must re-construct the
* machine state that existed at the time OFW's interrupt-
* handler fielded the interrupt. That allows us to use
@@ -177,7 +177,7 @@ ASENTRY_NP(irq_entry)
PULLFRAMEFROMSVCANDEXIT
movs pc, lr /* Exit */
- /*
+ /*
* Stuff a bit-mask into r8 indicating which interrupts
* are pending. In our case, that is just the timer0
* interrupt: (1 << TIMER0). The existing code will take
@@ -238,7 +238,7 @@ Lfind_highest_ipl:
mvn r2, r2
orr r0, r0, r2
- str r0, [r1]
+ str r0, [r1]
ldr r0, Lcurrent_spl_level
ldr r1, [r4, #CI_CPL]
@@ -348,7 +348,7 @@ Lirqhandlers:
.text
.global _C_LABEL(dotickgrovelling)
-/*
+/*
* Do magic to cause OFW to call our irq_entry
* routine when it returns from its tick-handling.
*
@@ -362,16 +362,16 @@ Lirqhandlers:
*
* r0 - base of saved OFW interrupt frame, which
* has the following format:
- *
+ *
* pc // interrupted instruction
* lr // lr of interrupted context
* sp // sp of interrupted context
* r12
* ... // non-banked register values
- * ... // of interrupted context
+ * ... // of interrupted context
* r0
* spsr // psr of interrupted context
- *
+ *
*/
_C_LABEL(dotickgrovelling):
@@ -463,7 +463,7 @@ _C_LABEL(dotickgrovelling):
ldmfd sp!, {r1-r5}
mov pc, lr
-
+
.bss
.align 0
Index: src/sys/arch/arm/sa11x0/sa11x0_irq.S
diff -u src/sys/arch/arm/sa11x0/sa11x0_irq.S:1.18 src/sys/arch/arm/sa11x0/sa11x0_irq.S:1.19
--- src/sys/arch/arm/sa11x0/sa11x0_irq.S:1.18 Mon Dec 2 18:36:11 2013
+++ src/sys/arch/arm/sa11x0/sa11x0_irq.S Sat Nov 21 09:36:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_irq.S,v 1.18 2013/12/02 18:36:11 joerg Exp $ */
+/* $NetBSD: sa11x0_irq.S,v 1.19 2020/11/21 09:36:27 skrll Exp $ */
/*
* Copyright (c) 1998 Mark Brinicombe.
@@ -291,7 +291,7 @@ Lirqhandlers:
#ifdef IRQSTATS
.global _C_LABEL(intrnames), _C_LABEL(eintrnames)
.global _C_LABEL(eintrcnt)
-_C_LABEL(intrnames):
+_C_LABEL(intrnames):
_C_LABEL(eintrnames):
_C_LABEL(eintrcnt):
