From 865c1d4df0f416bd8b60cff71320ac940f0241e2 Mon Sep 17 00:00:00 2001 From: dzzxzz Date: Mon, 19 Sep 2011 04:40:50 +0000 Subject: [PATCH] fix a spelling error rt_thread_switch_interrput_flag -> rt_thread_switch_interrupt_flag git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1712 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- libcpu/arm/AT91SAM7S/context_gcc.S | 6 ++--- libcpu/arm/AT91SAM7S/context_rvds.S | 6 ++--- libcpu/arm/AT91SAM7S/interrupt.c | 4 +-- libcpu/arm/AT91SAM7S/start_gcc.S | 6 ++--- libcpu/arm/AT91SAM7S/start_rvds.S | 6 ++--- libcpu/arm/AT91SAM7X/context_gcc.S | 6 ++--- libcpu/arm/AT91SAM7X/context_rvds.S | 34 ++++++++++++------------- libcpu/arm/AT91SAM7X/interrupt.c | 10 ++++---- libcpu/arm/AT91SAM7X/start_gcc.S | 6 ++--- libcpu/arm/AT91SAM7X/start_rvds.S | 6 ++--- libcpu/arm/PK40X25VLQ100/context_rvds.S | 12 ++++----- libcpu/arm/PK40X25VLQ100/interrupt.c | 2 +- libcpu/arm/at91sam926x/context_gcc.S | 6 ++--- libcpu/arm/at91sam926x/context_rvds.S | 34 ++++++++++++------------- libcpu/arm/at91sam926x/interrupt.c | 4 +-- libcpu/arm/at91sam926x/start_gcc.S | 8 +++--- libcpu/arm/at91sam926x/start_rvds.S | 6 ++--- libcpu/arm/cortex-m3/context_gcc.S | 10 ++++---- libcpu/arm/cortex-m3/cpuport.c | 2 +- libcpu/arm/lm3s/context_gcc.S | 10 ++++---- libcpu/arm/lm3s/context_rvds.S | 12 ++++----- libcpu/arm/lm3s/interrupt.c | 2 +- libcpu/arm/lpc1100/context_rvds.S | 12 ++++----- libcpu/arm/lpc1100/interrupt.c | 2 +- libcpu/arm/lpc122x/context_rvds.S | 12 ++++----- libcpu/arm/lpc122x/interrupt.c | 2 +- libcpu/arm/lpc17xx/context_iar.S | 12 ++++----- libcpu/arm/lpc17xx/context_rvds.S | 12 ++++----- libcpu/arm/lpc17xx/interrupt.c | 2 +- libcpu/arm/lpc214x/context_gcc.S | 4 +-- libcpu/arm/lpc214x/context_rvds.S | 6 ++--- libcpu/arm/lpc214x/cpuport.c | 4 +-- libcpu/arm/lpc214x/start_rvds.S | 6 ++--- libcpu/arm/lpc214x/startup_gcc.S | 6 ++--- libcpu/arm/lpc24xx/context_gcc.S | 6 ++--- libcpu/arm/lpc24xx/context_rvds.S | 6 ++--- libcpu/arm/lpc24xx/interrupt.c | 4 +-- libcpu/arm/lpc24xx/start_gcc.S | 8 +++--- libcpu/arm/lpc24xx/start_rvds.S | 6 ++--- libcpu/arm/nuc1xx/context_rvds.S | 12 ++++----- libcpu/arm/nuc1xx/interrupt.c | 2 +- libcpu/arm/s3c24x0/context_gcc.S | 6 ++--- libcpu/arm/s3c24x0/context_rvds.S | 6 ++--- libcpu/arm/s3c24x0/interrupt.c | 4 +-- libcpu/arm/s3c24x0/start_gcc.S | 8 +++--- libcpu/arm/s3c24x0/start_rvds.S | 6 ++--- libcpu/arm/s3c44b0/context_gcc.S | 6 ++--- libcpu/arm/s3c44b0/context_rvds.S | 6 ++--- libcpu/arm/s3c44b0/interrupt.c | 4 +-- libcpu/arm/s3c44b0/start_gcc.S | 8 +++--- libcpu/arm/s3c44b0/start_rvds.S | 6 ++--- libcpu/arm/sep4020/context_rvds.S | 6 ++--- libcpu/arm/sep4020/interrupt.c | 4 +-- libcpu/arm/sep4020/start_rvds.S | 6 ++--- libcpu/arm/stm32/context_gcc.S | 10 ++++---- libcpu/arm/stm32/context_iar.S | 12 ++++----- libcpu/arm/stm32/context_rvds.S | 12 ++++----- libcpu/arm/stm32/cpuport.c | 2 +- libcpu/ia32/context.S | 6 ++--- libcpu/ia32/hdisr.S | 6 ++--- libcpu/ia32/interrupt.c | 4 +-- libcpu/mips/jz47xx/context_gcc.S | 10 ++++---- libcpu/mips/jz47xx/interrupt.c | 4 +-- libcpu/mips/loongson/context_gcc.S | 10 ++++---- libcpu/mips/loongson/interrupt.c | 4 +-- libcpu/nios/nios_ii/context_gcc.S | 14 +++++----- libcpu/nios/nios_ii/interrupt.c | 2 +- libcpu/nios/nios_ii/vector.S | 6 ++--- 68 files changed, 250 insertions(+), 250 deletions(-) diff --git a/libcpu/arm/AT91SAM7S/context_gcc.S b/libcpu/arm/AT91SAM7S/context_gcc.S index e18dcfa6ea..e76093f8be 100644 --- a/libcpu/arm/AT91SAM7S/context_gcc.S +++ b/libcpu/arm/AT91SAM7S/context_gcc.S @@ -75,16 +75,16 @@ rt_hw_context_switch_to: /* * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to)/* */ -.globl rt_thread_switch_interrput_flag +.globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread .globl rt_hw_context_switch_interrupt rt_hw_context_switch_interrupt: - ldr r2, =rt_thread_switch_interrput_flag + ldr r2, =rt_thread_switch_interrupt_flag ldr r3, [r2] cmp r3, #1 beq _reswitch - mov r3, #1 /* set rt_thread_switch_interrput_flag to 1 */ + mov r3, #1 /* set rt_thread_switch_interrupt_flag to 1 */ str r3, [r2] ldr r2, =rt_interrupt_from_thread /* set rt_interrupt_from_thread */ str r0, [r2] diff --git a/libcpu/arm/AT91SAM7S/context_rvds.S b/libcpu/arm/AT91SAM7S/context_rvds.S index 82c5adc574..e24fa62a3d 100644 --- a/libcpu/arm/AT91SAM7S/context_rvds.S +++ b/libcpu/arm/AT91SAM7S/context_rvds.S @@ -84,17 +84,17 @@ rt_hw_context_switch_to PROC ;/* ; * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); ; */ - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread rt_hw_context_switch_interrupt PROC EXPORT rt_hw_context_switch_interrupt - LDR r2, =rt_thread_switch_interrput_flag + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch - MOV r3, #1 ; set rt_thread_switch_interrput_flag to 1 + MOV r3, #1 ; set rt_thread_switch_interrupt_flag to 1 STR r3, [r2] LDR r2, =rt_interrupt_from_thread ; set rt_interrupt_from_thread STR r0, [r2] diff --git a/libcpu/arm/AT91SAM7S/interrupt.c b/libcpu/arm/AT91SAM7S/interrupt.c index b8ef0c051c..cd80a5d408 100644 --- a/libcpu/arm/AT91SAM7S/interrupt.c +++ b/libcpu/arm/AT91SAM7S/interrupt.c @@ -20,7 +20,7 @@ extern rt_uint32_t rt_interrupt_nest; rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; /** * @addtogroup AT91SAM7 @@ -48,7 +48,7 @@ void rt_hw_interrupt_init() rt_interrupt_nest = 0; rt_interrupt_from_thread = 0; rt_interrupt_to_thread = 0; - rt_thread_switch_interrput_flag = 0; + rt_thread_switch_interrupt_flag = 0; } /** diff --git a/libcpu/arm/AT91SAM7S/start_gcc.S b/libcpu/arm/AT91SAM7S/start_gcc.S index bcfbc261ca..17695e31f2 100644 --- a/libcpu/arm/AT91SAM7S/start_gcc.S +++ b/libcpu/arm/AT91SAM7S/start_gcc.S @@ -164,7 +164,7 @@ vector_resv : b vector_resv .globl rt_interrupt_enter .globl rt_interrupt_leave -.globl rt_thread_switch_interrput_flag +.globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread vector_irq: @@ -174,10 +174,10 @@ vector_irq: bl rt_interrupt_leave /* - * if rt_thread_switch_interrput_flag set, jump to + * if rt_thread_switch_interrupt_flag set, jump to * rt_hw_context_switch_interrupt_do and don't return */ - ldr r0, =rt_thread_switch_interrput_flag + ldr r0, =rt_thread_switch_interrupt_flag ldr r1, [r0] cmp r1, #1 beq rt_hw_context_switch_interrupt_do diff --git a/libcpu/arm/AT91SAM7S/start_rvds.S b/libcpu/arm/AT91SAM7S/start_rvds.S index 64d65b6fbf..a4e403c1af 100644 --- a/libcpu/arm/AT91SAM7S/start_rvds.S +++ b/libcpu/arm/AT91SAM7S/start_rvds.S @@ -408,7 +408,7 @@ MC_RCR EQU 0x00 ; MC_RCR Offset IMPORT rt_interrupt_enter IMPORT rt_interrupt_leave - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread IMPORT rt_hw_trap_irq @@ -420,9 +420,9 @@ IRQ_Handler PROC BL rt_hw_trap_irq BL rt_interrupt_leave - ; if rt_thread_switch_interrput_flag set, jump to + ; if rt_thread_switch_interrupt_flag set, jump to ; rt_hw_context_switch_interrupt_do and don't return - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CMP r1, #1 BEQ rt_hw_context_switch_interrupt_do diff --git a/libcpu/arm/AT91SAM7X/context_gcc.S b/libcpu/arm/AT91SAM7X/context_gcc.S index 83e9f05755..e8f080359e 100644 --- a/libcpu/arm/AT91SAM7X/context_gcc.S +++ b/libcpu/arm/AT91SAM7X/context_gcc.S @@ -80,16 +80,16 @@ rt_hw_context_switch_to: /* * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); */ -.globl rt_thread_switch_interrput_flag +.globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread .globl rt_hw_context_switch_interrupt rt_hw_context_switch_interrupt: - ldr r2, =rt_thread_switch_interrput_flag + ldr r2, =rt_thread_switch_interrupt_flag ldr r3, [r2] cmp r3, #1 beq _reswitch - mov r3, #1 @ set rt_thread_switch_interrput_flag to 1 + mov r3, #1 @ set rt_thread_switch_interrupt_flag to 1 str r3, [r2] ldr r2, =rt_interrupt_from_thread @ set rt_interrupt_from_thread str r0, [r2] diff --git a/libcpu/arm/AT91SAM7X/context_rvds.S b/libcpu/arm/AT91SAM7X/context_rvds.S index 82c5adc574..641ec7a6b1 100644 --- a/libcpu/arm/AT91SAM7X/context_rvds.S +++ b/libcpu/arm/AT91SAM7X/context_rvds.S @@ -12,12 +12,12 @@ ; * 2009-01-20 Bernard first version ; */ -NOINT EQU 0xc0 ; disable interrupt in psr +NOINT EQU 0xc0 ; disable interrupt in psr - AREA |.text|, CODE, READONLY, ALIGN=2 - ARM - REQUIRE8 - PRESERVE8 + AREA |.text|, CODE, READONLY, ALIGN=2 + ARM + REQUIRE8 + PRESERVE8 ;/* ; * rt_base_t rt_hw_interrupt_disable(); @@ -26,16 +26,16 @@ rt_hw_interrupt_disable PROC EXPORT rt_hw_interrupt_disable MRS r0, cpsr ORR r1, r0, #NOINT - MSR cpsr_c, r1 + MSR cpsr_c, r1 BX lr - ENDP + ENDP ;/* ; * void rt_hw_interrupt_enable(rt_base_t level); ; */ rt_hw_interrupt_enable PROC EXPORT rt_hw_interrupt_enable - MSR cpsr_c, r0 + MSR cpsr_c, r0 BX lr ENDP @@ -63,7 +63,7 @@ rt_hw_context_switch PROC MSR cpsr_cxsf, r4 LDMFD sp!, {r0-r12, lr, pc} ; pop new task r0-r12, lr & pc - ENDP + ENDP ;/* ; * void rt_hw_context_switch_to(rt_uint32 to); @@ -79,29 +79,29 @@ rt_hw_context_switch_to PROC MSR cpsr_cxsf, r4 LDMFD sp!, {r0-r12, lr, pc} ; pop new task r0-r12, lr & pc - ENDP + ENDP ;/* ; * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); ; */ - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread - IMPORT rt_interrupt_to_thread + IMPORT rt_interrupt_to_thread rt_hw_context_switch_interrupt PROC EXPORT rt_hw_context_switch_interrupt - LDR r2, =rt_thread_switch_interrput_flag + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch - MOV r3, #1 ; set rt_thread_switch_interrput_flag to 1 + MOV r3, #1 ; set rt_thread_switch_interrupt_flag to 1 STR r3, [r2] LDR r2, =rt_interrupt_from_thread ; set rt_interrupt_from_thread STR r0, [r2] _reswitch LDR r2, =rt_interrupt_to_thread ; set rt_interrupt_to_thread - STR r1, [r2] + STR r1, [r2] BX lr - ENDP - + ENDP + END \ No newline at end of file diff --git a/libcpu/arm/AT91SAM7X/interrupt.c b/libcpu/arm/AT91SAM7X/interrupt.c index c61a6dc551..d3cbbcda2e 100644 --- a/libcpu/arm/AT91SAM7X/interrupt.c +++ b/libcpu/arm/AT91SAM7X/interrupt.c @@ -20,7 +20,7 @@ extern rt_uint32_t rt_interrupt_nest; rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; /** * @addtogroup AT91SAM7 @@ -48,7 +48,7 @@ void rt_hw_interrupt_init() rt_interrupt_nest = 0; rt_interrupt_from_thread = 0; rt_interrupt_to_thread = 0; - rt_thread_switch_interrput_flag = 0; + rt_thread_switch_interrupt_flag = 0; } /** @@ -56,11 +56,11 @@ void rt_hw_interrupt_init() * @param vector the interrupt number */ void rt_hw_interrupt_mask(int vector) -{ +{ /* disable interrupt */ - AT91C_BASE_AIC->AIC_IDCR = 1 << vector; + AT91C_BASE_AIC->AIC_IDCR = 1 << vector; - /* clear interrupt */ + /* clear interrupt */ AT91C_BASE_AIC->AIC_ICCR = 1 << vector; } diff --git a/libcpu/arm/AT91SAM7X/start_gcc.S b/libcpu/arm/AT91SAM7X/start_gcc.S index 9c09bfc7fd..119f3cdbf3 100644 --- a/libcpu/arm/AT91SAM7X/start_gcc.S +++ b/libcpu/arm/AT91SAM7X/start_gcc.S @@ -206,7 +206,7 @@ vector_resv : b vector_resv .globl rt_interrupt_enter .globl rt_interrupt_leave -.globl rt_thread_switch_interrput_flag +.globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread vector_irq: @@ -216,10 +216,10 @@ vector_irq: bl rt_interrupt_leave /* - * if rt_thread_switch_interrput_flag set, jump to + * if rt_thread_switch_interrupt_flag set, jump to * rt_hw_context_switch_interrupt_do and don't return */ - ldr r0, =rt_thread_switch_interrput_flag + ldr r0, =rt_thread_switch_interrupt_flag ldr r1, [r0] cmp r1, #1 beq rt_hw_context_switch_interrupt_do diff --git a/libcpu/arm/AT91SAM7X/start_rvds.S b/libcpu/arm/AT91SAM7X/start_rvds.S index bc5c6e9cce..eaee2a39ea 100644 --- a/libcpu/arm/AT91SAM7X/start_rvds.S +++ b/libcpu/arm/AT91SAM7X/start_rvds.S @@ -411,7 +411,7 @@ MC_RCR EQU 0x00 ; MC_RCR Offset IMPORT rt_interrupt_enter IMPORT rt_interrupt_leave - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread IMPORT rt_hw_trap_irq @@ -438,9 +438,9 @@ IRQ_Handler PROC BL rt_hw_trap_irq BL rt_interrupt_leave - ; if rt_thread_switch_interrput_flag set, jump to + ; if rt_thread_switch_interrupt_flag set, jump to ; rt_hw_context_switch_interrupt_do and don't return -SWITCH LDR r0, =rt_thread_switch_interrput_flag +SWITCH LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CMP r1, #1 BEQ rt_hw_context_switch_interrupt_do diff --git a/libcpu/arm/PK40X25VLQ100/context_rvds.S b/libcpu/arm/PK40X25VLQ100/context_rvds.S index 46b2e06737..69bed58105 100644 --- a/libcpu/arm/PK40X25VLQ100/context_rvds.S +++ b/libcpu/arm/PK40X25VLQ100/context_rvds.S @@ -29,7 +29,7 @@ NVIC_PENDSVSET EQU 0x10000000 ; value to trigger PendSV excep REQUIRE8 PRESERVE8 - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread @@ -62,8 +62,8 @@ rt_hw_context_switch_interrupt rt_hw_context_switch PROC EXPORT rt_hw_context_switch - ; set rt_thread_switch_interrput_flag to 1 - LDR r2, =rt_thread_switch_interrput_flag + ; set rt_thread_switch_interrupt_flag to 1 + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch @@ -94,11 +94,11 @@ rt_hw_pend_sv PROC CPSID I ; get rt_thread_switch_interrupt_flag - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CBZ r1, pendsv_exit ; pendsv already handled - ; clear rt_thread_switch_interrput_flag to 0 + ; clear rt_thread_switch_interrupt_flag to 0 MOV r1, #0x00 STR r1, [r0] @@ -144,7 +144,7 @@ rt_hw_context_switch_to PROC STR r0, [r1] ; set interrupt flag to 1 - LDR r1, =rt_thread_switch_interrput_flag + LDR r1, =rt_thread_switch_interrupt_flag MOV r0, #1 STR r0, [r1] diff --git a/libcpu/arm/PK40X25VLQ100/interrupt.c b/libcpu/arm/PK40X25VLQ100/interrupt.c index 8cf81a620f..5db4eaef3e 100644 --- a/libcpu/arm/PK40X25VLQ100/interrupt.c +++ b/libcpu/arm/PK40X25VLQ100/interrupt.c @@ -16,6 +16,6 @@ /* exception and interrupt handler table */ rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; /*@}*/ diff --git a/libcpu/arm/at91sam926x/context_gcc.S b/libcpu/arm/at91sam926x/context_gcc.S index e90ec49d5e..e53e1260dd 100755 --- a/libcpu/arm/at91sam926x/context_gcc.S +++ b/libcpu/arm/at91sam926x/context_gcc.S @@ -81,16 +81,16 @@ rt_hw_context_switch_to: /* * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); */ -.globl rt_thread_switch_interrput_flag +.globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread .globl rt_hw_context_switch_interrupt rt_hw_context_switch_interrupt: - ldr r2, =rt_thread_switch_interrput_flag + ldr r2, =rt_thread_switch_interrupt_flag ldr r3, [r2] cmp r3, #1 beq _reswitch - mov r3, #1 @ set rt_thread_switch_interrput_flag to 1 + mov r3, #1 @ set rt_thread_switch_interrupt_flag to 1 str r3, [r2] ldr r2, =rt_interrupt_from_thread @ set rt_interrupt_from_thread str r0, [r2] diff --git a/libcpu/arm/at91sam926x/context_rvds.S b/libcpu/arm/at91sam926x/context_rvds.S index 60aaa37acd..8f7bab61ef 100644 --- a/libcpu/arm/at91sam926x/context_rvds.S +++ b/libcpu/arm/at91sam926x/context_rvds.S @@ -12,12 +12,12 @@ ; * 2011-08-14 weety copy from mini2440 ; */ -NOINT EQU 0xc0 ; disable interrupt in psr +NOINT EQU 0xc0 ; disable interrupt in psr - AREA |.text|, CODE, READONLY, ALIGN=2 - ARM - REQUIRE8 - PRESERVE8 + AREA |.text|, CODE, READONLY, ALIGN=2 + ARM + REQUIRE8 + PRESERVE8 ;/* ; * rt_base_t rt_hw_interrupt_disable(); @@ -26,16 +26,16 @@ rt_hw_interrupt_disable PROC EXPORT rt_hw_interrupt_disable MRS r0, cpsr ORR r1, r0, #NOINT - MSR cpsr_c, r1 + MSR cpsr_c, r1 BX lr - ENDP + ENDP ;/* ; * void rt_hw_interrupt_enable(rt_base_t level); ; */ rt_hw_interrupt_enable PROC EXPORT rt_hw_interrupt_enable - MSR cpsr_c, r0 + MSR cpsr_c, r0 BX lr ENDP @@ -63,7 +63,7 @@ rt_hw_context_switch PROC MSR cpsr_cxsf, r4 LDMFD sp!, {r0-r12, lr, pc} ; pop new task r0-r12, lr & pc - ENDP + ENDP ;/* ; * void rt_hw_context_switch_to(rt_uint32 to); @@ -79,29 +79,29 @@ rt_hw_context_switch_to PROC MSR cpsr_cxsf, r4 LDMFD sp!, {r0-r12, lr, pc} ; pop new task r0-r12, lr & pc - ENDP + ENDP ;/* ; * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); ; */ - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread - IMPORT rt_interrupt_to_thread + IMPORT rt_interrupt_to_thread rt_hw_context_switch_interrupt PROC EXPORT rt_hw_context_switch_interrupt - LDR r2, =rt_thread_switch_interrput_flag + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch - MOV r3, #1 ; set rt_thread_switch_interrput_flag to 1 + MOV r3, #1 ; set rt_thread_switch_interrupt_flag to 1 STR r3, [r2] LDR r2, =rt_interrupt_from_thread ; set rt_interrupt_from_thread STR r0, [r2] _reswitch LDR r2, =rt_interrupt_to_thread ; set rt_interrupt_to_thread - STR r1, [r2] + STR r1, [r2] BX lr - ENDP - + ENDP + END diff --git a/libcpu/arm/at91sam926x/interrupt.c b/libcpu/arm/at91sam926x/interrupt.c index 392b46902e..31e49283dd 100755 --- a/libcpu/arm/at91sam926x/interrupt.c +++ b/libcpu/arm/at91sam926x/interrupt.c @@ -22,7 +22,7 @@ extern rt_uint32_t rt_interrupt_nest; /* exception and interrupt handler table */ rt_isr_handler_t isr_table[MAX_HANDLERS]; rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; /* -------------------------------------------------------------------- @@ -201,7 +201,7 @@ void rt_hw_interrupt_init(void) rt_interrupt_nest = 0; rt_interrupt_from_thread = 0; rt_interrupt_to_thread = 0; - rt_thread_switch_interrput_flag = 0; + rt_thread_switch_interrupt_flag = 0; } static void at91_gpio_irq_mask(int irq) diff --git a/libcpu/arm/at91sam926x/start_gcc.S b/libcpu/arm/at91sam926x/start_gcc.S index 47d25f1280..b9c6be4a35 100755 --- a/libcpu/arm/at91sam926x/start_gcc.S +++ b/libcpu/arm/at91sam926x/start_gcc.S @@ -285,7 +285,7 @@ vector_resv: .globl rt_interrupt_enter .globl rt_interrupt_leave -.globl rt_thread_switch_interrput_flag +.globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread vector_irq: @@ -294,8 +294,8 @@ vector_irq: bl rt_hw_trap_irq bl rt_interrupt_leave - /* if rt_thread_switch_interrput_flag set, jump to _interrupt_thread_switch and don't return */ - ldr r0, =rt_thread_switch_interrput_flag + /* if rt_thread_switch_interrupt_flag set, jump to _interrupt_thread_switch and don't return */ + ldr r0, =rt_thread_switch_interrupt_flag ldr r1, [r0] cmp r1, #1 beq _interrupt_thread_switch @@ -311,7 +311,7 @@ vector_fiq: subs pc,lr,#4 _interrupt_thread_switch: - mov r1, #0 /* clear rt_thread_switch_interrput_flag*/ + mov r1, #0 /* clear rt_thread_switch_interrupt_flag*/ str r1, [r0] ldmfd sp!, {r0-r12,lr} /* reload saved registers */ diff --git a/libcpu/arm/at91sam926x/start_rvds.S b/libcpu/arm/at91sam926x/start_rvds.S index bc2a0cc871..7fdb08b30a 100644 --- a/libcpu/arm/at91sam926x/start_rvds.S +++ b/libcpu/arm/at91sam926x/start_rvds.S @@ -222,7 +222,7 @@ Reset_Handler IMPORT rt_interrupt_enter IMPORT rt_interrupt_leave - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread IMPORT rt_hw_trap_irq @@ -234,9 +234,9 @@ IRQ_Handler PROC BL rt_hw_trap_irq BL rt_interrupt_leave - ; if rt_thread_switch_interrput_flag set, jump to + ; if rt_thread_switch_interrupt_flag set, jump to ; rt_hw_context_switch_interrupt_do and don't return - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CMP r1, #1 BEQ rt_hw_context_switch_interrupt_do diff --git a/libcpu/arm/cortex-m3/context_gcc.S b/libcpu/arm/cortex-m3/context_gcc.S index c4e2d60fb5..a091474904 100644 --- a/libcpu/arm/cortex-m3/context_gcc.S +++ b/libcpu/arm/cortex-m3/context_gcc.S @@ -66,8 +66,8 @@ rt_hw_interrupt_enable: .type rt_hw_context_switch, %function rt_hw_context_switch_interrupt: rt_hw_context_switch: - /* set rt_thread_switch_interrput_flag to 1 */ - LDR R2, =rt_thread_switch_interrput_flag + /* set rt_thread_switch_interrupt_flag to 1 */ + LDR R2, =rt_thread_switch_interrupt_flag LDR R3, [R2] CMP R3, #1 BEQ _reswitch @@ -98,11 +98,11 @@ PendSV_Handler: CPSID I /* get rt_thread_switch_interrupt_flag */ - LDR R0, =rt_thread_switch_interrput_flag + LDR R0, =rt_thread_switch_interrupt_flag LDR R1, [R0] CBZ R1, pendsv_exit /* pendsv aLReady handled */ - /* clear rt_thread_switch_interrput_flag to 0 */ + /* clear rt_thread_switch_interrupt_flag to 0 */ MOV R1, #0 STR R1, [R0] @@ -146,7 +146,7 @@ rt_hw_context_switch_to: STR R0, [R1] /* set interrupt flag to 1 */ - LDR R1, =rt_thread_switch_interrput_flag + LDR R1, =rt_thread_switch_interrupt_flag MOV R0, #1 STR R0, [R1] diff --git a/libcpu/arm/cortex-m3/cpuport.c b/libcpu/arm/cortex-m3/cpuport.c index b8532408e3..c36edb853a 100644 --- a/libcpu/arm/cortex-m3/cpuport.c +++ b/libcpu/arm/cortex-m3/cpuport.c @@ -42,7 +42,7 @@ struct stack_contex /* Private variables ------------------------------------------------------------*/ /* exception and interrupt handler table */ rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; /* Private function prototypes ---------------------------------------------------*/ /* Private functions ------------------------------------------------------------*/ diff --git a/libcpu/arm/lm3s/context_gcc.S b/libcpu/arm/lm3s/context_gcc.S index 99e76ba8f6..0afc1cd87c 100644 --- a/libcpu/arm/lm3s/context_gcc.S +++ b/libcpu/arm/lm3s/context_gcc.S @@ -59,8 +59,8 @@ rt_hw_interrupt_enable: rt_hw_context_switch_interrupt: rt_hw_context_switch: - /* set rt_thread_switch_interrput_flag to 1 */ - LDR r2, =rt_thread_switch_interrput_flag + /* set rt_thread_switch_interrupt_flag to 1 */ + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch @@ -91,11 +91,11 @@ rt_hw_pend_sv: CPSID I /* get rt_thread_switch_interrupt_flag */ - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CBZ r1, pendsv_exit /* pendsv already handled */ - /* clear rt_thread_switch_interrput_flag to 0 */ + /* clear rt_thread_switch_interrupt_flag to 0 */ MOV r1, #0x00 STR r1, [r0] @@ -139,7 +139,7 @@ rt_hw_context_switch_to: STR r0, [r1] /* set interrupt flag to 1 */ - LDR r1, =rt_thread_switch_interrput_flag + LDR r1, =rt_thread_switch_interrupt_flag MOV r0, #1 STR r0, [r1] diff --git a/libcpu/arm/lm3s/context_rvds.S b/libcpu/arm/lm3s/context_rvds.S index 6432965f57..b4c795e9ac 100644 --- a/libcpu/arm/lm3s/context_rvds.S +++ b/libcpu/arm/lm3s/context_rvds.S @@ -27,7 +27,7 @@ NVIC_PENDSVSET EQU 0x10000000 ; value to trigger PendSV excep REQUIRE8 PRESERVE8 - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread @@ -60,8 +60,8 @@ rt_hw_context_switch_interrupt rt_hw_context_switch PROC EXPORT rt_hw_context_switch - ; set rt_thread_switch_interrput_flag to 1 - LDR r2, =rt_thread_switch_interrput_flag + ; set rt_thread_switch_interrupt_flag to 1 + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch @@ -92,11 +92,11 @@ rt_hw_pend_sv PROC CPSID I ; get rt_thread_switch_interrupt_flag - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CBZ r1, pendsv_exit ; pendsv already handled - ; clear rt_thread_switch_interrput_flag to 0 + ; clear rt_thread_switch_interrupt_flag to 0 MOV r1, #0x00 STR r1, [r0] @@ -143,7 +143,7 @@ rt_hw_context_switch_to PROC STR r0, [r1] ; set interrupt flag to 1 - LDR r1, =rt_thread_switch_interrput_flag + LDR r1, =rt_thread_switch_interrupt_flag MOV r0, #1 STR r0, [r1] diff --git a/libcpu/arm/lm3s/interrupt.c b/libcpu/arm/lm3s/interrupt.c index 3f6165a255..f4cc2b1312 100644 --- a/libcpu/arm/lm3s/interrupt.c +++ b/libcpu/arm/lm3s/interrupt.c @@ -16,6 +16,6 @@ /* exception and interrupt handler table */ rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; /*@}*/ diff --git a/libcpu/arm/lpc1100/context_rvds.S b/libcpu/arm/lpc1100/context_rvds.S index 9eb913f27a..097f43bf85 100644 --- a/libcpu/arm/lpc1100/context_rvds.S +++ b/libcpu/arm/lpc1100/context_rvds.S @@ -27,7 +27,7 @@ NVIC_PENDSVSET EQU 0x10000000 ; value to trigger PendSV excep REQUIRE8 PRESERVE8 - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread @@ -60,8 +60,8 @@ rt_hw_context_switch_interrupt rt_hw_context_switch PROC EXPORT rt_hw_context_switch - ; set rt_thread_switch_interrput_flag to 1 - LDR r2, =rt_thread_switch_interrput_flag + ; set rt_thread_switch_interrupt_flag to 1 + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch @@ -92,12 +92,12 @@ rt_hw_pend_sv PROC CPSID I ; get rt_thread_switch_interrupt_flag - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CMP r1, #0x00 BEQ pendsv_exit ; pendsv already handled - ; clear rt_thread_switch_interrput_flag to 0 + ; clear rt_thread_switch_interrupt_flag to 0 MOVS r1, #0x00 STR r1, [r0] @@ -146,7 +146,7 @@ rt_hw_context_switch_to PROC STR r0, [r1] ; set interrupt flag to 1 - LDR r1, =rt_thread_switch_interrput_flag + LDR r1, =rt_thread_switch_interrupt_flag MOVS r0, #1 STR r0, [r1] diff --git a/libcpu/arm/lpc1100/interrupt.c b/libcpu/arm/lpc1100/interrupt.c index a1a3eb2441..ce43a7781a 100644 --- a/libcpu/arm/lpc1100/interrupt.c +++ b/libcpu/arm/lpc1100/interrupt.c @@ -16,6 +16,6 @@ /* exception and interrupt handler table */ rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint8_t rt_thread_switch_interrput_flag; +rt_uint8_t rt_thread_switch_interrupt_flag; /*@}*/ diff --git a/libcpu/arm/lpc122x/context_rvds.S b/libcpu/arm/lpc122x/context_rvds.S index 9eb913f27a..097f43bf85 100644 --- a/libcpu/arm/lpc122x/context_rvds.S +++ b/libcpu/arm/lpc122x/context_rvds.S @@ -27,7 +27,7 @@ NVIC_PENDSVSET EQU 0x10000000 ; value to trigger PendSV excep REQUIRE8 PRESERVE8 - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread @@ -60,8 +60,8 @@ rt_hw_context_switch_interrupt rt_hw_context_switch PROC EXPORT rt_hw_context_switch - ; set rt_thread_switch_interrput_flag to 1 - LDR r2, =rt_thread_switch_interrput_flag + ; set rt_thread_switch_interrupt_flag to 1 + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch @@ -92,12 +92,12 @@ rt_hw_pend_sv PROC CPSID I ; get rt_thread_switch_interrupt_flag - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CMP r1, #0x00 BEQ pendsv_exit ; pendsv already handled - ; clear rt_thread_switch_interrput_flag to 0 + ; clear rt_thread_switch_interrupt_flag to 0 MOVS r1, #0x00 STR r1, [r0] @@ -146,7 +146,7 @@ rt_hw_context_switch_to PROC STR r0, [r1] ; set interrupt flag to 1 - LDR r1, =rt_thread_switch_interrput_flag + LDR r1, =rt_thread_switch_interrupt_flag MOVS r0, #1 STR r0, [r1] diff --git a/libcpu/arm/lpc122x/interrupt.c b/libcpu/arm/lpc122x/interrupt.c index a1a3eb2441..ce43a7781a 100644 --- a/libcpu/arm/lpc122x/interrupt.c +++ b/libcpu/arm/lpc122x/interrupt.c @@ -16,6 +16,6 @@ /* exception and interrupt handler table */ rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint8_t rt_thread_switch_interrput_flag; +rt_uint8_t rt_thread_switch_interrupt_flag; /*@}*/ diff --git a/libcpu/arm/lpc17xx/context_iar.S b/libcpu/arm/lpc17xx/context_iar.S index 3c8f2d3599..5333a3452f 100644 --- a/libcpu/arm/lpc17xx/context_iar.S +++ b/libcpu/arm/lpc17xx/context_iar.S @@ -29,7 +29,7 @@ NVIC_PENDSVSET EQU 0x10000000 ; value to trigger PendSV excep REQUIRE8 PRESERVE8 - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread @@ -61,8 +61,8 @@ rt_hw_interrupt_enable: rt_hw_context_switch_interrupt: rt_hw_context_switch: - ; set rt_thread_switch_interrput_flag to 1 - LDR r2, =rt_thread_switch_interrput_flag + ; set rt_thread_switch_interrupt_flag to 1 + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch @@ -92,11 +92,11 @@ rt_hw_pend_sv: CPSID I ; get rt_thread_switch_interrupt_flag - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CBZ r1, pendsv_exit ; pendsv already handled - ; clear rt_thread_switch_interrput_flag to 0 + ; clear rt_thread_switch_interrupt_flag to 0 MOV r1, #0x00 STR r1, [r0] @@ -141,7 +141,7 @@ rt_hw_context_switch_to: STR r0, [r1] ; set interrupt flag to 1 - LDR r1, =rt_thread_switch_interrput_flag + LDR r1, =rt_thread_switch_interrupt_flag MOV r0, #1 STR r0, [r1] diff --git a/libcpu/arm/lpc17xx/context_rvds.S b/libcpu/arm/lpc17xx/context_rvds.S index b59c5da3da..48f34d520a 100644 --- a/libcpu/arm/lpc17xx/context_rvds.S +++ b/libcpu/arm/lpc17xx/context_rvds.S @@ -28,7 +28,7 @@ NVIC_PENDSVSET EQU 0x10000000 ; value to trigger PendSV excep REQUIRE8 PRESERVE8 - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread @@ -61,8 +61,8 @@ rt_hw_context_switch_interrupt rt_hw_context_switch PROC EXPORT rt_hw_context_switch - ; set rt_thread_switch_interrput_flag to 1 - LDR r2, =rt_thread_switch_interrput_flag + ; set rt_thread_switch_interrupt_flag to 1 + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch @@ -93,11 +93,11 @@ rt_hw_pend_sv PROC CPSID I ; get rt_thread_switch_interrupt_flag - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CBZ r1, pendsv_exit ; pendsv already handled - ; clear rt_thread_switch_interrput_flag to 0 + ; clear rt_thread_switch_interrupt_flag to 0 MOV r1, #0x00 STR r1, [r0] @@ -143,7 +143,7 @@ rt_hw_context_switch_to PROC STR r0, [r1] ; set interrupt flag to 1 - LDR r1, =rt_thread_switch_interrput_flag + LDR r1, =rt_thread_switch_interrupt_flag MOV r0, #1 STR r0, [r1] diff --git a/libcpu/arm/lpc17xx/interrupt.c b/libcpu/arm/lpc17xx/interrupt.c index 8cf81a620f..5db4eaef3e 100644 --- a/libcpu/arm/lpc17xx/interrupt.c +++ b/libcpu/arm/lpc17xx/interrupt.c @@ -16,6 +16,6 @@ /* exception and interrupt handler table */ rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; /*@}*/ diff --git a/libcpu/arm/lpc214x/context_gcc.S b/libcpu/arm/lpc214x/context_gcc.S index 3a77976073..0a4b1ce731 100644 --- a/libcpu/arm/lpc214x/context_gcc.S +++ b/libcpu/arm/lpc214x/context_gcc.S @@ -84,11 +84,11 @@ rt_hw_context_switch_to: rt_hw_context_switch_interrupt: //EXPORT rt_hw_context_switch_interrupt - LDR r2, =rt_thread_switch_interrput_flag + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] /* 载入中断中切换标致地址 */ CMP r3, #1 /* 等于 1 ？*/ BEQ _reswitch /* 如果等于1，跳转到_reswitch*/ - MOV r3, #1 /* set rt_thread_switch_interrput_flag to 1*/ + MOV r3, #1 /* set rt_thread_switch_interrupt_flag to 1*/ /* 设置中断中切换标志位1 */ STR r3, [r2] /* */ LDR r2, =rt_interrupt_from_thread /* set rt_interrupt_from_thread*/ diff --git a/libcpu/arm/lpc214x/context_rvds.S b/libcpu/arm/lpc214x/context_rvds.S index 82c5adc574..e24fa62a3d 100644 --- a/libcpu/arm/lpc214x/context_rvds.S +++ b/libcpu/arm/lpc214x/context_rvds.S @@ -84,17 +84,17 @@ rt_hw_context_switch_to PROC ;/* ; * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); ; */ - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread rt_hw_context_switch_interrupt PROC EXPORT rt_hw_context_switch_interrupt - LDR r2, =rt_thread_switch_interrput_flag + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch - MOV r3, #1 ; set rt_thread_switch_interrput_flag to 1 + MOV r3, #1 ; set rt_thread_switch_interrupt_flag to 1 STR r3, [r2] LDR r2, =rt_interrupt_from_thread ; set rt_interrupt_from_thread STR r0, [r2] diff --git a/libcpu/arm/lpc214x/cpuport.c b/libcpu/arm/lpc214x/cpuport.c index 3af1d61a72..702db0b21e 100644 --- a/libcpu/arm/lpc214x/cpuport.c +++ b/libcpu/arm/lpc214x/cpuport.c @@ -65,7 +65,7 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, /* exception and interrupt handler table */ rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; void rt_hw_interrupt_handler(int vector) { @@ -99,7 +99,7 @@ void rt_hw_interrupt_init() rt_interrupt_nest = 0; rt_interrupt_from_thread = 0; rt_interrupt_to_thread = 0; - rt_thread_switch_interrput_flag = 0; + rt_thread_switch_interrupt_flag = 0; } /** diff --git a/libcpu/arm/lpc214x/start_rvds.S b/libcpu/arm/lpc214x/start_rvds.S index 9d603a4709..50e3fdcf94 100644 --- a/libcpu/arm/lpc214x/start_rvds.S +++ b/libcpu/arm/lpc214x/start_rvds.S @@ -417,7 +417,7 @@ MEMMAP EQU 0xE01FC040 ; Memory Mapping Control IMPORT rt_interrupt_enter IMPORT rt_interrupt_leave - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread IMPORT rt_hw_trap_irq @@ -429,9 +429,9 @@ IRQ_Handler PROC BL rt_hw_trap_irq BL rt_interrupt_leave - ; if rt_thread_switch_interrput_flag set, jump to + ; if rt_thread_switch_interrupt_flag set, jump to ; rt_hw_context_switch_interrupt_do and don't return - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CMP r1, #1 BEQ rt_hw_context_switch_interrupt_do diff --git a/libcpu/arm/lpc214x/startup_gcc.S b/libcpu/arm/lpc214x/startup_gcc.S index 33073c8da5..1c25f3bd2e 100644 --- a/libcpu/arm/lpc214x/startup_gcc.S +++ b/libcpu/arm/lpc214x/startup_gcc.S @@ -2,7 +2,7 @@ .extern rt_interrupt_enter .extern rt_interrupt_leave - .extern rt_thread_switch_interrput_flag + .extern rt_thread_switch_interrupt_flag .extern rt_interrupt_from_thread .extern rt_interrupt_to_thread .extern rt_hw_trap_irq @@ -224,8 +224,8 @@ IRQ_Handler : bl rt_hw_trap_irq /* 相应中断服务例程处理 */ bl rt_interrupt_leave /* ; 通知RT-Thread要离开中断模式 */ - /* 如果设置了rt_thread_switch_interrput_flag，进行中断中的线程上下文处理 */ - ldr r0, =rt_thread_switch_interrput_flag + /* 如果设置了rt_thread_switch_interrupt_flag，进行中断中的线程上下文处理 */ + ldr r0, =rt_thread_switch_interrupt_flag ldr r1, [r0] cmp r1, #1 beq rt_hw_context_switch_interrupt_do /* 中断中切换发生 */ diff --git a/libcpu/arm/lpc24xx/context_gcc.S b/libcpu/arm/lpc24xx/context_gcc.S index c83ac53dfc..df22aacbed 100644 --- a/libcpu/arm/lpc24xx/context_gcc.S +++ b/libcpu/arm/lpc24xx/context_gcc.S @@ -80,16 +80,16 @@ rt_hw_context_switch_to: /* * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); */ -.globl rt_thread_switch_interrput_flag +.globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread .globl rt_hw_context_switch_interrupt rt_hw_context_switch_interrupt: - ldr r2, =rt_thread_switch_interrput_flag + ldr r2, =rt_thread_switch_interrupt_flag ldr r3, [r2] cmp r3, #1 beq _reswitch - mov r3, #1 @ set rt_thread_switch_interrput_flag to 1 + mov r3, #1 @ set rt_thread_switch_interrupt_flag to 1 str r3, [r2] ldr r2, =rt_interrupt_from_thread @ set rt_interrupt_from_thread str r0, [r2] diff --git a/libcpu/arm/lpc24xx/context_rvds.S b/libcpu/arm/lpc24xx/context_rvds.S index c889e93281..4d77f6591b 100644 --- a/libcpu/arm/lpc24xx/context_rvds.S +++ b/libcpu/arm/lpc24xx/context_rvds.S @@ -87,17 +87,17 @@ rt_hw_context_switch_to PROC ;/* ; * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); ; */ - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread rt_hw_context_switch_interrupt PROC EXPORT rt_hw_context_switch_interrupt - LDR r2, =rt_thread_switch_interrput_flag + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch - MOV r3, #1 ; set rt_thread_switch_interrput_flag to 1 + MOV r3, #1 ; set rt_thread_switch_interrupt_flag to 1 STR r3, [r2] LDR r2, =rt_interrupt_from_thread ; set rt_interrupt_from_thread STR r0, [r2] diff --git a/libcpu/arm/lpc24xx/interrupt.c b/libcpu/arm/lpc24xx/interrupt.c index d697fb1c52..b18c1e10ff 100644 --- a/libcpu/arm/lpc24xx/interrupt.c +++ b/libcpu/arm/lpc24xx/interrupt.c @@ -21,7 +21,7 @@ extern rt_uint32_t rt_interrupt_nest; /* exception and interrupt handler table */ rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; /** @@ -57,7 +57,7 @@ void rt_hw_interrupt_init() rt_interrupt_nest = 0; rt_interrupt_from_thread = 0; rt_interrupt_to_thread = 0; - rt_thread_switch_interrput_flag = 0; + rt_thread_switch_interrupt_flag = 0; } void rt_hw_interrupt_mask(int vector) diff --git a/libcpu/arm/lpc24xx/start_gcc.S b/libcpu/arm/lpc24xx/start_gcc.S index 370ffffdeb..feab6f0216 100644 --- a/libcpu/arm/lpc24xx/start_gcc.S +++ b/libcpu/arm/lpc24xx/start_gcc.S @@ -189,7 +189,7 @@ vector_resv: bl rt_hw_trap_resv .globl rt_interrupt_enter .globl rt_interrupt_leave -.globl rt_thread_switch_interrput_flag +.globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread vector_irq: @@ -198,10 +198,10 @@ vector_irq: bl rt_hw_trap_irq bl rt_interrupt_leave - /* if rt_thread_switch_interrput_flag set, + /* if rt_thread_switch_interrupt_flag set, * jump to _interrupt_thread_switch and don't return */ - ldr r0, =rt_thread_switch_interrput_flag + ldr r0, =rt_thread_switch_interrupt_flag ldr r1, [r0] cmp r1, #1 beq _interrupt_thread_switch @@ -217,7 +217,7 @@ vector_fiq: subs pc,lr,#4 _interrupt_thread_switch: - mov r1, #0 /* clear rt_thread_switch_interrput_flag */ + mov r1, #0 /* clear rt_thread_switch_interrupt_flag */ str r1, [r0] ldmfd sp!, {r0-r12,lr} /* reload saved registers */ diff --git a/libcpu/arm/lpc24xx/start_rvds.S b/libcpu/arm/lpc24xx/start_rvds.S index 1b166b133e..312df25f26 100644 --- a/libcpu/arm/lpc24xx/start_rvds.S +++ b/libcpu/arm/lpc24xx/start_rvds.S @@ -1489,7 +1489,7 @@ MEMMAP EQU 0xE01FC040 ; Memory Mapping Control IMPORT rt_interrupt_enter IMPORT rt_interrupt_leave - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread IMPORT rt_hw_trap_irq @@ -1501,9 +1501,9 @@ IRQ_Handler PROC BL rt_hw_trap_irq BL rt_interrupt_leave - ; if rt_thread_switch_interrput_flag set, jump to + ; if rt_thread_switch_interrupt_flag set, jump to ; rt_hw_context_switch_interrupt_do and don't return - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CMP r1, #1 BEQ rt_hw_context_switch_interrupt_do diff --git a/libcpu/arm/nuc1xx/context_rvds.S b/libcpu/arm/nuc1xx/context_rvds.S index a2771d0945..0ecd8427d7 100644 --- a/libcpu/arm/nuc1xx/context_rvds.S +++ b/libcpu/arm/nuc1xx/context_rvds.S @@ -27,7 +27,7 @@ NVIC_PENDSVSET EQU 0x10000000 ; value to trigger PendSV excep REQUIRE8 PRESERVE8 - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread @@ -60,8 +60,8 @@ rt_hw_context_switch_interrupt rt_hw_context_switch PROC EXPORT rt_hw_context_switch - ; set rt_thread_switch_interrput_flag to 1 - LDR r2, =rt_thread_switch_interrput_flag + ; set rt_thread_switch_interrupt_flag to 1 + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch @@ -92,12 +92,12 @@ rt_hw_pend_sv PROC CPSID I ; get rt_thread_switch_interrupt_flag - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CMP r1, #0x00 BEQ pendsv_exit ; pendsv already handled - ; clear rt_thread_switch_interrput_flag to 0 + ; clear rt_thread_switch_interrupt_flag to 0 MOVS r1, #0x00 STR r1, [r0] @@ -146,7 +146,7 @@ rt_hw_context_switch_to PROC STR r0, [r1] ; set interrupt flag to 1 - LDR r1, =rt_thread_switch_interrput_flag + LDR r1, =rt_thread_switch_interrupt_flag MOVS r0, #1 STR r0, [r1] diff --git a/libcpu/arm/nuc1xx/interrupt.c b/libcpu/arm/nuc1xx/interrupt.c index a1a3eb2441..ce43a7781a 100644 --- a/libcpu/arm/nuc1xx/interrupt.c +++ b/libcpu/arm/nuc1xx/interrupt.c @@ -16,6 +16,6 @@ /* exception and interrupt handler table */ rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint8_t rt_thread_switch_interrput_flag; +rt_uint8_t rt_thread_switch_interrupt_flag; /*@}*/ diff --git a/libcpu/arm/s3c24x0/context_gcc.S b/libcpu/arm/s3c24x0/context_gcc.S index 80e9245698..bc614aec13 100644 --- a/libcpu/arm/s3c24x0/context_gcc.S +++ b/libcpu/arm/s3c24x0/context_gcc.S @@ -80,16 +80,16 @@ rt_hw_context_switch_to: /* * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); */ -.globl rt_thread_switch_interrput_flag +.globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread .globl rt_hw_context_switch_interrupt rt_hw_context_switch_interrupt: - ldr r2, =rt_thread_switch_interrput_flag + ldr r2, =rt_thread_switch_interrupt_flag ldr r3, [r2] cmp r3, #1 beq _reswitch - mov r3, #1 @ set rt_thread_switch_interrput_flag to 1 + mov r3, #1 @ set rt_thread_switch_interrupt_flag to 1 str r3, [r2] ldr r2, =rt_interrupt_from_thread @ set rt_interrupt_from_thread str r0, [r2] diff --git a/libcpu/arm/s3c24x0/context_rvds.S b/libcpu/arm/s3c24x0/context_rvds.S index 82c5adc574..e24fa62a3d 100644 --- a/libcpu/arm/s3c24x0/context_rvds.S +++ b/libcpu/arm/s3c24x0/context_rvds.S @@ -84,17 +84,17 @@ rt_hw_context_switch_to PROC ;/* ; * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); ; */ - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread rt_hw_context_switch_interrupt PROC EXPORT rt_hw_context_switch_interrupt - LDR r2, =rt_thread_switch_interrput_flag + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch - MOV r3, #1 ; set rt_thread_switch_interrput_flag to 1 + MOV r3, #1 ; set rt_thread_switch_interrupt_flag to 1 STR r3, [r2] LDR r2, =rt_interrupt_from_thread ; set rt_interrupt_from_thread STR r0, [r2] diff --git a/libcpu/arm/s3c24x0/interrupt.c b/libcpu/arm/s3c24x0/interrupt.c index 8cbd6230b6..18cdbaa09f 100644 --- a/libcpu/arm/s3c24x0/interrupt.c +++ b/libcpu/arm/s3c24x0/interrupt.c @@ -22,7 +22,7 @@ extern rt_uint32_t rt_interrupt_nest; /* exception and interrupt handler table */ rt_isr_handler_t isr_table[MAX_HANDLERS]; rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; /** * @addtogroup S3C24X0 @@ -70,7 +70,7 @@ void rt_hw_interrupt_init(void) rt_interrupt_nest = 0; rt_interrupt_from_thread = 0; rt_interrupt_to_thread = 0; - rt_thread_switch_interrput_flag = 0; + rt_thread_switch_interrupt_flag = 0; } /** diff --git a/libcpu/arm/s3c24x0/start_gcc.S b/libcpu/arm/s3c24x0/start_gcc.S index c82b999640..72f5164053 100644 --- a/libcpu/arm/s3c24x0/start_gcc.S +++ b/libcpu/arm/s3c24x0/start_gcc.S @@ -291,7 +291,7 @@ vector_resv: .globl rt_interrupt_enter .globl rt_interrupt_leave -.globl rt_thread_switch_interrput_flag +.globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread vector_irq: @@ -300,8 +300,8 @@ vector_irq: bl rt_hw_trap_irq bl rt_interrupt_leave - /* if rt_thread_switch_interrput_flag set, jump to _interrupt_thread_switch and don't return */ - ldr r0, =rt_thread_switch_interrput_flag + /* if rt_thread_switch_interrupt_flag set, jump to _interrupt_thread_switch and don't return */ + ldr r0, =rt_thread_switch_interrupt_flag ldr r1, [r0] cmp r1, #1 beq _interrupt_thread_switch @@ -317,7 +317,7 @@ vector_fiq: subs pc,lr,#4 _interrupt_thread_switch: - mov r1, #0 /* clear rt_thread_switch_interrput_flag*/ + mov r1, #0 /* clear rt_thread_switch_interrupt_flag*/ str r1, [r0] ldmfd sp!, {r0-r12,lr} /* reload saved registers */ diff --git a/libcpu/arm/s3c24x0/start_rvds.S b/libcpu/arm/s3c24x0/start_rvds.S index 89fca25c39..38872cd93b 100644 --- a/libcpu/arm/s3c24x0/start_rvds.S +++ b/libcpu/arm/s3c24x0/start_rvds.S @@ -1097,7 +1097,7 @@ Reset_Handler IMPORT rt_interrupt_enter IMPORT rt_interrupt_leave - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread IMPORT rt_hw_trap_irq @@ -1109,9 +1109,9 @@ IRQ_Handler PROC BL rt_hw_trap_irq BL rt_interrupt_leave - ; if rt_thread_switch_interrput_flag set, jump to + ; if rt_thread_switch_interrupt_flag set, jump to ; rt_hw_context_switch_interrupt_do and don't return - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CMP r1, #1 BEQ rt_hw_context_switch_interrupt_do diff --git a/libcpu/arm/s3c44b0/context_gcc.S b/libcpu/arm/s3c44b0/context_gcc.S index 7b39e32522..bbdc3989e4 100644 --- a/libcpu/arm/s3c44b0/context_gcc.S +++ b/libcpu/arm/s3c44b0/context_gcc.S @@ -80,16 +80,16 @@ rt_hw_context_switch_to: /* * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); */ -.globl rt_thread_switch_interrput_flag +.globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread .globl rt_hw_context_switch_interrupt rt_hw_context_switch_interrupt: - ldr r2, =rt_thread_switch_interrput_flag + ldr r2, =rt_thread_switch_interrupt_flag ldr r3, [r2] cmp r3, #1 beq _reswitch - mov r3, #1 @ set rt_thread_switch_interrput_flag to 1 + mov r3, #1 @ set rt_thread_switch_interrupt_flag to 1 str r3, [r2] ldr r2, =rt_interrupt_from_thread @ set rt_interrupt_from_thread str r0, [r2] diff --git a/libcpu/arm/s3c44b0/context_rvds.S b/libcpu/arm/s3c44b0/context_rvds.S index 82c5adc574..e24fa62a3d 100644 --- a/libcpu/arm/s3c44b0/context_rvds.S +++ b/libcpu/arm/s3c44b0/context_rvds.S @@ -84,17 +84,17 @@ rt_hw_context_switch_to PROC ;/* ; * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); ; */ - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread rt_hw_context_switch_interrupt PROC EXPORT rt_hw_context_switch_interrupt - LDR r2, =rt_thread_switch_interrput_flag + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch - MOV r3, #1 ; set rt_thread_switch_interrput_flag to 1 + MOV r3, #1 ; set rt_thread_switch_interrupt_flag to 1 STR r3, [r2] LDR r2, =rt_interrupt_from_thread ; set rt_interrupt_from_thread STR r0, [r2] diff --git a/libcpu/arm/s3c44b0/interrupt.c b/libcpu/arm/s3c44b0/interrupt.c index 8051459712..3fc4f8c5b0 100644 --- a/libcpu/arm/s3c44b0/interrupt.c +++ b/libcpu/arm/s3c44b0/interrupt.c @@ -24,7 +24,7 @@ extern rt_uint32_t rt_interrupt_nest; /* exception and interrupt handler table */ rt_isr_handler_t isr_table[MAX_HANDLERS]; rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; unsigned char interrupt_bank0[256]; unsigned char interrupt_bank1[256]; @@ -109,7 +109,7 @@ void rt_hw_interrupt_init() rt_interrupt_nest = 0; rt_interrupt_from_thread = 0; rt_interrupt_to_thread = 0; - rt_thread_switch_interrput_flag = 0; + rt_thread_switch_interrupt_flag = 0; } /** diff --git a/libcpu/arm/s3c44b0/start_gcc.S b/libcpu/arm/s3c44b0/start_gcc.S index 4108fc2462..ff9398c0b7 100644 --- a/libcpu/arm/s3c44b0/start_gcc.S +++ b/libcpu/arm/s3c44b0/start_gcc.S @@ -138,7 +138,7 @@ vector_resv: bl rt_hw_trap_resv .globl rt_interrupt_enter .globl rt_interrupt_leave -.globl rt_thread_switch_interrput_flag +.globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread vector_irq: @@ -148,8 +148,8 @@ vector_irq: bl rt_hw_trap_irq bl rt_interrupt_leave - /* if rt_thread_switch_interrput_flag set, jump to _interrupt_thread_switch and don't return */ - ldr r0, =rt_thread_switch_interrput_flag + /* if rt_thread_switch_interrupt_flag set, jump to _interrupt_thread_switch and don't return */ + ldr r0, =rt_thread_switch_interrupt_flag ldr r1, [r0] cmp r1, #1 beq _interrupt_thread_switch @@ -165,7 +165,7 @@ vector_fiq: subs pc,lr,#4 _interrupt_thread_switch: - mov r1, #0 @ clear rt_thread_switch_interrput_flag + mov r1, #0 @ clear rt_thread_switch_interrupt_flag str r1, [r0] ldmfd sp!, {r0-r12,lr} @ reload saved registers diff --git a/libcpu/arm/s3c44b0/start_rvds.S b/libcpu/arm/s3c44b0/start_rvds.S index 3154bf3751..192120dff5 100644 --- a/libcpu/arm/s3c44b0/start_rvds.S +++ b/libcpu/arm/s3c44b0/start_rvds.S @@ -980,7 +980,7 @@ Reset_Handler IMPORT rt_interrupt_enter IMPORT rt_interrupt_leave - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread IMPORT rt_hw_trap_irq @@ -992,9 +992,9 @@ IRQ_Handler PROC BL rt_hw_trap_irq BL rt_interrupt_leave - ; if rt_thread_switch_interrput_flag set, jump to + ; if rt_thread_switch_interrupt_flag set, jump to ; rt_hw_context_switch_interrupt_do and don't return - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CMP r1, #1 BEQ rt_hw_context_switch_interrupt_do diff --git a/libcpu/arm/sep4020/context_rvds.S b/libcpu/arm/sep4020/context_rvds.S index 82c5adc574..e24fa62a3d 100644 --- a/libcpu/arm/sep4020/context_rvds.S +++ b/libcpu/arm/sep4020/context_rvds.S @@ -84,17 +84,17 @@ rt_hw_context_switch_to PROC ;/* ; * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); ; */ - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread rt_hw_context_switch_interrupt PROC EXPORT rt_hw_context_switch_interrupt - LDR r2, =rt_thread_switch_interrput_flag + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch - MOV r3, #1 ; set rt_thread_switch_interrput_flag to 1 + MOV r3, #1 ; set rt_thread_switch_interrupt_flag to 1 STR r3, [r2] LDR r2, =rt_interrupt_from_thread ; set rt_interrupt_from_thread STR r0, [r2] diff --git a/libcpu/arm/sep4020/interrupt.c b/libcpu/arm/sep4020/interrupt.c index f18bd2d6b3..7126e5acc2 100644 --- a/libcpu/arm/sep4020/interrupt.c +++ b/libcpu/arm/sep4020/interrupt.c @@ -22,7 +22,7 @@ extern rt_uint32_t rt_interrupt_nest; /* exception and interrupt handler table */ rt_isr_handler_t isr_table[MAX_HANDLERS]; rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; /** * @addtogroup S3C24X0 @@ -75,7 +75,7 @@ void rt_hw_interrupt_init() rt_interrupt_nest = 0; rt_interrupt_from_thread = 0; rt_interrupt_to_thread = 0; - rt_thread_switch_interrput_flag = 0; + rt_thread_switch_interrupt_flag = 0; } /** diff --git a/libcpu/arm/sep4020/start_rvds.S b/libcpu/arm/sep4020/start_rvds.S index 15865e1360..bb4d20595c 100644 --- a/libcpu/arm/sep4020/start_rvds.S +++ b/libcpu/arm/sep4020/start_rvds.S @@ -290,7 +290,7 @@ Reset_Handler IMPORT rt_interrupt_enter IMPORT rt_interrupt_leave - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread IMPORT rt_hw_trap_irq @@ -302,9 +302,9 @@ IRQ_Handler PROC BL rt_hw_trap_irq BL rt_interrupt_leave - ; if rt_thread_switch_interrput_flag set, jump to + ; if rt_thread_switch_interrupt_flag set, jump to ; rt_hw_context_switch_interrupt_do and don't return - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CMP r1, #1 BEQ rt_hw_context_switch_interrupt_do diff --git a/libcpu/arm/stm32/context_gcc.S b/libcpu/arm/stm32/context_gcc.S index ea7213d2ac..189e7e6246 100644 --- a/libcpu/arm/stm32/context_gcc.S +++ b/libcpu/arm/stm32/context_gcc.S @@ -59,8 +59,8 @@ rt_hw_interrupt_enable: rt_hw_context_switch_interrupt: rt_hw_context_switch: - /* set rt_thread_switch_interrput_flag to 1 */ - LDR r2, =rt_thread_switch_interrput_flag + /* set rt_thread_switch_interrupt_flag to 1 */ + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch @@ -91,11 +91,11 @@ PendSV_Handler: CPSID I /* get rt_thread_switch_interrupt_flag */ - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CBZ r1, pendsv_exit /* pendsv already handled */ - /* clear rt_thread_switch_interrput_flag to 0 */ + /* clear rt_thread_switch_interrupt_flag to 0 */ MOV r1, #0x00 STR r1, [r0] @@ -139,7 +139,7 @@ rt_hw_context_switch_to: STR r0, [r1] /* set interrupt flag to 1 */ - LDR r1, =rt_thread_switch_interrput_flag + LDR r1, =rt_thread_switch_interrupt_flag MOV r0, #1 STR r0, [r1] diff --git a/libcpu/arm/stm32/context_iar.S b/libcpu/arm/stm32/context_iar.S index f465dcc5a9..c7d5c61d70 100644 --- a/libcpu/arm/stm32/context_iar.S +++ b/libcpu/arm/stm32/context_iar.S @@ -28,7 +28,7 @@ NVIC_PENDSVSET EQU 0x10000000 ; value to trigger PendSV excep REQUIRE8 PRESERVE8 - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread @@ -58,8 +58,8 @@ rt_hw_interrupt_enable: EXPORT rt_hw_context_switch rt_hw_context_switch_interrupt: rt_hw_context_switch: - ; set rt_thread_switch_interrput_flag to 1 - LDR r2, =rt_thread_switch_interrput_flag + ; set rt_thread_switch_interrupt_flag to 1 + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch @@ -89,11 +89,11 @@ PendSV_Handler: CPSID I ; get rt_thread_switch_interrupt_flag - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CBZ r1, pendsv_exit ; pendsv already handled - ; clear rt_thread_switch_interrput_flag to 0 + ; clear rt_thread_switch_interrupt_flag to 0 MOV r1, #0x00 STR r1, [r0] @@ -136,7 +136,7 @@ rt_hw_context_switch_to: STR r0, [r1] ; set interrupt flag to 1 - LDR r1, =rt_thread_switch_interrput_flag + LDR r1, =rt_thread_switch_interrupt_flag MOV r0, #1 STR r0, [r1] diff --git a/libcpu/arm/stm32/context_rvds.S b/libcpu/arm/stm32/context_rvds.S index 27d0981786..b38113239e 100644 --- a/libcpu/arm/stm32/context_rvds.S +++ b/libcpu/arm/stm32/context_rvds.S @@ -27,7 +27,7 @@ NVIC_PENDSVSET EQU 0x10000000 ; value to trigger PendSV excep REQUIRE8 PRESERVE8 - IMPORT rt_thread_switch_interrput_flag + IMPORT rt_thread_switch_interrupt_flag IMPORT rt_interrupt_from_thread IMPORT rt_interrupt_to_thread @@ -60,8 +60,8 @@ rt_hw_context_switch_interrupt rt_hw_context_switch PROC EXPORT rt_hw_context_switch - ; set rt_thread_switch_interrput_flag to 1 - LDR r2, =rt_thread_switch_interrput_flag + ; set rt_thread_switch_interrupt_flag to 1 + LDR r2, =rt_thread_switch_interrupt_flag LDR r3, [r2] CMP r3, #1 BEQ _reswitch @@ -92,11 +92,11 @@ PendSV_Handler PROC CPSID I ; get rt_thread_switch_interrupt_flag - LDR r0, =rt_thread_switch_interrput_flag + LDR r0, =rt_thread_switch_interrupt_flag LDR r1, [r0] CBZ r1, pendsv_exit ; pendsv already handled - ; clear rt_thread_switch_interrput_flag to 0 + ; clear rt_thread_switch_interrupt_flag to 0 MOV r1, #0x00 STR r1, [r0] @@ -142,7 +142,7 @@ rt_hw_context_switch_to PROC STR r0, [r1] ; set interrupt flag to 1 - LDR r1, =rt_thread_switch_interrput_flag + LDR r1, =rt_thread_switch_interrupt_flag MOV r0, #1 STR r0, [r1] diff --git a/libcpu/arm/stm32/cpuport.c b/libcpu/arm/stm32/cpuport.c index b71a166ed8..02d342ef25 100644 --- a/libcpu/arm/stm32/cpuport.c +++ b/libcpu/arm/stm32/cpuport.c @@ -16,7 +16,7 @@ /* exception and interrupt handler table */ rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; struct stack_contex { diff --git a/libcpu/ia32/context.S b/libcpu/ia32/context.S index 767a104b2b..9f987e77a0 100644 --- a/libcpu/ia32/context.S +++ b/libcpu/ia32/context.S @@ -87,7 +87,7 @@ rt_hw_context_switch_to: /* * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to); */ -.globl rt_thread_switch_interrput_flag +.globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread .globl rt_hw_context_switch_interrupt @@ -97,12 +97,12 @@ rt_hw_context_switch_interrupt: movl 0xc(%ebp), %eax movl 0x8(%ebp), %ebx - movl $rt_thread_switch_interrput_flag, %ecx + movl $rt_thread_switch_interrupt_flag, %ecx movl (%ecx), %edx cmp $0x1, %edx jz _reswitch - movl $0x1, %edx /*set rt_thread_switch_interrput_flag to 1*/ + movl $0x1, %edx /*set rt_thread_switch_interrupt_flag to 1*/ movl %edx, (%ecx) movl $rt_interrupt_from_thread, %edx /*set rt_interrupt_from_thread*/ movl %ebx, (%edx) diff --git a/libcpu/ia32/hdisr.S b/libcpu/ia32/hdisr.S index b16311641d..103b9031aa 100644 --- a/libcpu/ia32/hdisr.S +++ b/libcpu/ia32/hdisr.S @@ -60,7 +60,7 @@ HDINTERRUPTFNC(irq15, 15) .globl rt_interrupt_enter .globl rt_interrupt_leave .globl isr_table -.globl rt_thread_switch_interrput_flag +.globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread @@ -82,8 +82,8 @@ _hdinterrupts: call *(%ebx) call rt_interrupt_leave - /* if rt_thread_switch_interrput_flag set, jump to _interrupt_thread_switch and don't return */ - movl $rt_thread_switch_interrput_flag, %eax + /* if rt_thread_switch_interrupt_flag set, jump to _interrupt_thread_switch and don't return */ + movl $rt_thread_switch_interrupt_flag, %eax movl (%eax), %ebx cmp $0x1, %ebx jz _interrupt_thread_switch diff --git a/libcpu/ia32/interrupt.c b/libcpu/ia32/interrupt.c index fe0bf07a58..91df04c0ce 100644 --- a/libcpu/ia32/interrupt.c +++ b/libcpu/ia32/interrupt.c @@ -20,7 +20,7 @@ extern rt_uint32_t rt_interrupt_nest; extern void rt_hw_idt_init(void); rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; /* exception and interrupt handler table */ rt_isr_handler_t isr_table[MAX_HANDLERS]; @@ -61,7 +61,7 @@ void rt_hw_pic_init() rt_interrupt_nest = 0; rt_interrupt_from_thread = 0; rt_interrupt_to_thread = 0; - rt_thread_switch_interrput_flag = 0; + rt_thread_switch_interrupt_flag = 0; } void rt_hw_interrupt_handle(int vector) diff --git a/libcpu/mips/jz47xx/context_gcc.S b/libcpu/mips/jz47xx/context_gcc.S index 00576d8f48..42b0d13033 100644 --- a/libcpu/mips/jz47xx/context_gcc.S +++ b/libcpu/mips/jz47xx/context_gcc.S @@ -60,17 +60,17 @@ rt_hw_context_switch_to: /* * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to)/* */ - .globl rt_thread_switch_interrput_flag + .globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread .globl rt_hw_context_switch_interrupt rt_hw_context_switch_interrupt: - la t0, rt_thread_switch_interrput_flag + la t0, rt_thread_switch_interrupt_flag lw t1, 0(t0) nop bnez t1, _reswitch nop - li t1, 0x01 /* set rt_thread_switch_interrput_flag to 1 */ + li t1, 0x01 /* set rt_thread_switch_interrupt_flag to 1 */ sw t1, 0(t0) la t0, rt_interrupt_from_thread /* set rt_interrupt_from_thread */ sw a0, 0(t0) @@ -115,10 +115,10 @@ mips_irq_handle: move sp, k0 /* - * if rt_thread_switch_interrput_flag set, jump to + * if rt_thread_switch_interrupt_flag set, jump to * rt_hw_context_switch_interrupt_do and don't return */ - la k0, rt_thread_switch_interrput_flag + la k0, rt_thread_switch_interrupt_flag lw k1, 0(k0) beqz k1, spurious_interrupt nop diff --git a/libcpu/mips/jz47xx/interrupt.c b/libcpu/mips/jz47xx/interrupt.c index d7aa0ea209..78ba87c2e9 100644 --- a/libcpu/mips/jz47xx/interrupt.c +++ b/libcpu/mips/jz47xx/interrupt.c @@ -18,7 +18,7 @@ extern rt_uint32_t rt_interrupt_nest; rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; static rt_isr_handler_t irq_handle_table[JZ47XX_MAX_INTR]; @@ -48,7 +48,7 @@ void rt_hw_interrupt_init() rt_interrupt_nest = 0; rt_interrupt_from_thread = 0; rt_interrupt_to_thread = 0; - rt_thread_switch_interrput_flag = 0; + rt_thread_switch_interrupt_flag = 0; } /** diff --git a/libcpu/mips/loongson/context_gcc.S b/libcpu/mips/loongson/context_gcc.S index 1611f1cd86..65cab6e147 100644 --- a/libcpu/mips/loongson/context_gcc.S +++ b/libcpu/mips/loongson/context_gcc.S @@ -60,17 +60,17 @@ rt_hw_context_switch_to: /* * void rt_hw_context_switch_interrupt(rt_uint32 from, rt_uint32 to)/* */ - .globl rt_thread_switch_interrput_flag + .globl rt_thread_switch_interrupt_flag .globl rt_interrupt_from_thread .globl rt_interrupt_to_thread .globl rt_hw_context_switch_interrupt rt_hw_context_switch_interrupt: - la t0, rt_thread_switch_interrput_flag + la t0, rt_thread_switch_interrupt_flag lw t1, 0(t0) nop bnez t1, _reswitch nop - li t1, 0x01 /* set rt_thread_switch_interrput_flag to 1 */ + li t1, 0x01 /* set rt_thread_switch_interrupt_flag to 1 */ sw t1, 0(t0) la t0, rt_interrupt_from_thread /* set rt_interrupt_from_thread */ sw a0, 0(t0) @@ -110,10 +110,10 @@ mips_irq_handle: move sp, k0 /* - * if rt_thread_switch_interrput_flag set, jump to + * if rt_thread_switch_interrupt_flag set, jump to * rt_hw_context_switch_interrupt_do and don't return */ - la k0, rt_thread_switch_interrput_flag + la k0, rt_thread_switch_interrupt_flag lw k1, 0(k0) beqz k1, spurious_interrupt nop diff --git a/libcpu/mips/loongson/interrupt.c b/libcpu/mips/loongson/interrupt.c index 2d354269aa..20cc2f8b9b 100644 --- a/libcpu/mips/loongson/interrupt.c +++ b/libcpu/mips/loongson/interrupt.c @@ -18,7 +18,7 @@ extern rt_uint32_t rt_interrupt_nest; rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; static rt_isr_handler_t irq_handle_table[MAX_INTR]; void rt_interrupt_dispatch(void *ptreg); @@ -50,7 +50,7 @@ void rt_hw_interrupt_init() rt_interrupt_nest = 0; rt_interrupt_from_thread = 0; rt_interrupt_to_thread = 0; - rt_thread_switch_interrput_flag = 0; + rt_thread_switch_interrupt_flag = 0; } /** diff --git a/libcpu/nios/nios_ii/context_gcc.S b/libcpu/nios/nios_ii/context_gcc.S index a389db162d..3ccaff3b20 100644 --- a/libcpu/nios/nios_ii/context_gcc.S +++ b/libcpu/nios/nios_ii/context_gcc.S @@ -85,9 +85,9 @@ rt_hw_context_switch_interrupt_do: /* *r4(from_thread->sp) = sp */ stw sp, (r4) - /* clear rt_thread_switch_interrput_flag */ - /* rt_thread_switch_interrput_flag = 0 */ - stw zero,%gprel(rt_thread_switch_interrput_flag)(gp) + /* clear rt_thread_switch_interrupt_flag */ + /* rt_thread_switch_interrupt_flag = 0 */ + stw zero,%gprel(rt_thread_switch_interrupt_flag)(gp) /* load to thread sp */ /* r4 = rt_interrupt_to_thread(&to_thread->sp) */ @@ -213,8 +213,8 @@ rt_hw_context_switch: .global rt_hw_context_switch_interrupt .type rt_hw_context_switch_interrupt, %function rt_hw_context_switch_interrupt: - /* if( rt_thread_switch_interrput_flag != 0 ) _from_thread_not_change */ - ldw r2,%gprel(rt_thread_switch_interrput_flag)(gp) + /* if( rt_thread_switch_interrupt_flag != 0 ) _from_thread_not_change */ + ldw r2,%gprel(rt_thread_switch_interrupt_flag)(gp) bne r2,zero,_from_thread_not_change _from_thread_change: @@ -222,9 +222,9 @@ _from_thread_change: addi ea,ea,-4 stw ea,%gprel(rt_current_thread_entry)(gp) - /* set rt_thread_switch_interrput_flag to 1 */ + /* set rt_thread_switch_interrupt_flag to 1 */ movi r2, 1 - stw r2,%gprel(rt_thread_switch_interrput_flag)(gp) + stw r2,%gprel(rt_thread_switch_interrupt_flag)(gp) /* update rt_interrupt_from_thread */ stw r4,%gprel(rt_interrupt_from_thread)(gp) diff --git a/libcpu/nios/nios_ii/interrupt.c b/libcpu/nios/nios_ii/interrupt.c index 18c4abd6d8..15c574901b 100644 --- a/libcpu/nios/nios_ii/interrupt.c +++ b/libcpu/nios/nios_ii/interrupt.c @@ -16,7 +16,7 @@ /* exception and interrupt handler table */ rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrput_flag; +rt_uint32_t rt_thread_switch_interrupt_flag; rt_uint32_t rt_current_thread_entry; /*@}*/ diff --git a/libcpu/nios/nios_ii/vector.S b/libcpu/nios/nios_ii/vector.S index ab700aeee6..f8d43425b8 100644 --- a/libcpu/nios/nios_ii/vector.S +++ b/libcpu/nios/nios_ii/vector.S @@ -10,13 +10,13 @@ /* get exception back */ ldw ea, 72(sp) - /* if(rt_thread_switch_interrput_flag == 0) goto no_need_context */ - ldw r4,%gprel(rt_thread_switch_interrput_flag)(gp) + /* if(rt_thread_switch_interrupt_flag == 0) goto no_need_context */ + ldw r4,%gprel(rt_thread_switch_interrupt_flag)(gp) beq r4,zero,no_need_context need_context: movia ea, rt_hw_context_switch_interrupt_do - /* disable interrput */ + /* disable interrupt */ mov r5, zero no_need_context: -- GitLab