libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix the cortex-m3 context switch bug when interrupt preempts pendsv exception; add RT_LWIP_ETH_PAD_SIZE option; fix device activate flag set issue in init function. 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@193 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong 2009-12-06 23:50:17 +00:00
parent af965befa9
commit 6db90b15af
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libcpu/arm/stm32/context_rvds.S
View File

@ -91,8 +91,12 @@ rt_hw_pend_sv PROC
MRS r2, PRIMASK MRS r2, PRIMASK
CPSID I CPSID I
; clear rt_thread_switch_interrput_flag to 0 ; get rt_thread_switch_interrupt_flag
LDR r0, =rt_thread_switch_interrput_flag LDR r0, =rt_thread_switch_interrput_flag
LDR r1, [r0]
CBZ r1, pendsv_exit ; pendsv already handled
; clear rt_thread_switch_interrput_flag to 0
MOV r1, #0x00 MOV r1, #0x00
STR r1, [r0] STR r1, [r0]
@ -103,6 +107,7 @@ rt_hw_pend_sv PROC
MRS r1, psp ; get from thread stack pointer MRS r1, psp ; get from thread stack pointer
STMFD r1!, {r4 - r11} ; push r4 - r11 register STMFD r1!, {r4 - r11} ; push r4 - r11 register
LDR r0, [r0] LDR r0, [r0]
STR r1, [r0] ; update from thread stack pointer STR r1, [r0] ; update from thread stack pointer
swtich_to_thread swtich_to_thread
@ -113,6 +118,7 @@ swtich_to_thread
LDMFD r1!, {r4 - r11} ; pop r4 - r11 register LDMFD r1!, {r4 - r11} ; pop r4 - r11 register
MSR psp, r1 ; update stack pointer MSR psp, r1 ; update stack pointer
pendsv_exit
; restore interrupt ; restore interrupt
MSR PRIMASK, r2 MSR PRIMASK, r2
@ -123,9 +129,11 @@ swtich_to_thread
;/* ;/*
; * void rt_hw_context_switch_to(rt_uint32 to); ; * void rt_hw_context_switch_to(rt_uint32 to);
; * r0 --> to ; * r0 --> to
; * this fucntion is used to perform the first thread switch
; */ ; */
rt_hw_context_switch_to PROC rt_hw_context_switch_to PROC
EXPORT rt_hw_context_switch_to EXPORT rt_hw_context_switch_to
; set to thread
LDR r1, =rt_interrupt_to_thread LDR r1, =rt_interrupt_to_thread
STR r0, [r1] STR r0, [r1]
@ -134,16 +142,23 @@ rt_hw_context_switch_to PROC
MOV r0, #0x0 MOV r0, #0x0
STR r0, [r1] STR r0, [r1]
; set interrupt flag to 1
LDR r1, =rt_thread_switch_interrput_flag
MOV r0, #1
STR r0, [r1]
; set the PendSV exception priority ; set the PendSV exception priority
LDR r0, =NVIC_SYSPRI2 LDR r0, =NVIC_SYSPRI2
LDR r1, =NVIC_PENDSV_PRI LDR r1, =NVIC_PENDSV_PRI
STR r1, [r0] STR r1, [r0]
LDR r0, =NVIC_INT_CTRL ; trigger the PendSV exception (causes context switch) ; trigger the PendSV exception (causes context switch)
LDR r0, =NVIC_INT_CTRL
LDR r1, =NVIC_PENDSVSET LDR r1, =NVIC_PENDSVSET
STR r1, [r0] STR r1, [r0]
CPSIE I ; enable interrupts at processor level ; enable interrupts at processor level
CPSIE I
; never reach here! ; never reach here!
ENDP ENDP

7
net/lwip/src/lwipopts.h
View File

@ -46,6 +46,9 @@
#define LWIP_DEBUG #define LWIP_DEBUG
#endif #endif
/* Enable SO_RCVTIMEO processing. */
#define LWIP_SO_RCVTIMEO 1
/* ---------- Debug options ---------- */ /* ---------- Debug options ---------- */
#ifdef LWIP_DEBUG #ifdef LWIP_DEBUG
#define SYS_DEBUG LWIP_DBG_OFF #define SYS_DEBUG LWIP_DBG_OFF
@ -142,7 +145,9 @@
link level header. */ link level header. */
#define PBUF_LINK_HLEN 16 #define PBUF_LINK_HLEN 16
#define ETH_PAD_SIZE 2 // default is 0 #ifdef RT_LWIP_ETH_PAD_SIZE
#define ETH_PAD_SIZE RT_LWIP_ETH_PAD_SIZE
#endif
/** SYS_LIGHTWEIGHT_PROT /** SYS_LIGHTWEIGHT_PROT
* define SYS_LIGHTWEIGHT_PROT in lwipopts.h if you want inter-task protection * define SYS_LIGHTWEIGHT_PROT in lwipopts.h if you want inter-task protection

4
src/device.c
View File

@ -84,6 +84,10 @@ rt_err_t rt_device_init_all()
rt_kprintf("init device:%s error:\n", device->parent.name); rt_kprintf("init device:%s error:\n", device->parent.name);
rt_kprintf("error code:%d\n", result); rt_kprintf("error code:%d\n", result);
} }
else
{
device->flag |= RT_DEVICE_FLAG_ACTIVATED;
}
} }
} }

2
src/mem.c
View File

@ -318,7 +318,7 @@ void *rt_malloc(rt_size_t size)
#ifdef RT_USING_HOOK #ifdef RT_USING_HOOK
if (rt_malloc_hook != RT_NULL) if (rt_malloc_hook != RT_NULL)
rt_malloc_hook((rt_uint8_t*)mem, size); rt_malloc_hook((rt_uint8_t *)mem + SIZEOF_STRUCT_MEM, size);
#endif #endif
/* return the memory data except mem struct */ /* return the memory data except mem struct */
return (rt_uint8_t *)mem + SIZEOF_STRUCT_MEM; return (rt_uint8_t *)mem + SIZEOF_STRUCT_MEM;