From 46a823ed917c34307dc5d7bb14b98a2dfce10812 Mon Sep 17 00:00:00 2001 From: dzzxzz Date: Fri, 9 Sep 2011 10:08:52 +0000 Subject: [PATCH] improve NEC V850 porting git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1705 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- bsp/upd70f3454/Debug/Obj/CG_main.r85 | Bin 3380 -> 0 bytes bsp/upd70f3454/Debug/Obj/CG_serial.r85 | Bin 9466 -> 0 bytes bsp/upd70f3454/Debug/Obj/CG_serial_user.r85 | Bin 4972 -> 0 bytes bsp/upd70f3454/Debug/Obj/upd70f3454.pbd | 43 ---- bsp/upd70f3454/settings/upd70f3454.cspy.bat | 33 ---- bsp/upd70f3454/settings/upd70f3454.dbgdt | 84 -------- bsp/upd70f3454/settings/upd70f3454.dni | 124 ------------ bsp/upd70f3454/settings/upd70f3454.wsdt | 66 ------- bsp/upd70f3454/upd70f3454.ewd | 208 +++++++++++++++++++- bsp/upd70f3454/upd70f3454.ewp | 51 ++--- libcpu/v850/context.asm | 46 +---- libcpu/v850/{stack.c => cpuport.c} | 47 ++++- libcpu/v850/interrupt.c | 22 --- 13 files changed, 276 insertions(+), 448 deletions(-) delete mode 100644 bsp/upd70f3454/Debug/Obj/CG_main.r85 delete mode 100644 bsp/upd70f3454/Debug/Obj/CG_serial.r85 delete mode 100644 bsp/upd70f3454/Debug/Obj/CG_serial_user.r85 delete mode 100644 bsp/upd70f3454/Debug/Obj/upd70f3454.pbd delete mode 100644 bsp/upd70f3454/settings/upd70f3454.cspy.bat delete mode 100644 bsp/upd70f3454/settings/upd70f3454.dbgdt delete mode 100644 bsp/upd70f3454/settings/upd70f3454.dni delete mode 100644 bsp/upd70f3454/settings/upd70f3454.wsdt rename libcpu/v850/{stack.c => cpuport.c} (67%) delete mode 100644 libcpu/v850/interrupt.c diff --git a/bsp/upd70f3454/Debug/Obj/CG_main.r85 b/bsp/upd70f3454/Debug/Obj/CG_main.r85 deleted file mode 100644 index 1764cb9b8de79835e2fbdb02f8b9fa40a4b0b679..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3380 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 diff --git a/bsp/upd70f3454/Debug/Obj/upd70f3454.pbd b/bsp/upd70f3454/Debug/Obj/upd70f3454.pbd deleted file mode 100644 index b759a07ea..000000000 --- a/bsp/upd70f3454/Debug/Obj/upd70f3454.pbd +++ /dev/null @@ -1,43 +0,0 @@ -This is an internal working file generated by the Source Browser. -10:24 01s -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\CG_port.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\CG_port_user.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\CG_system.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\CG_system_user.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\CG_systeminit.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\CG_timer.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\CG_timer_user.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\application.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\board.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\clock.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\cmd.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\device.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\finsh_compiler.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\finsh_error.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\finsh_heap.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\finsh_init.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\finsh_node.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\finsh_ops.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\finsh_parser.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\finsh_token.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\finsh_var.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\finsh_vm.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\idle.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\interrupt.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\ipc.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\irq.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\kservice.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\mem.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\mempool.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\module.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\object.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\rtm.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\scheduler.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\shell.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\slab.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\stack.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\startup.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\symbol.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\thread.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\timer.pbi -E:\RTT\RTTV850\rt-thread\bsp\upd70f3454\Debug\Obj\uart.pbi diff --git a/bsp/upd70f3454/settings/upd70f3454.cspy.bat b/bsp/upd70f3454/settings/upd70f3454.cspy.bat deleted file mode 100644 index d3e9c63e4..000000000 --- a/bsp/upd70f3454/settings/upd70f3454.cspy.bat +++ /dev/null @@ -1,33 +0,0 @@ -@REM This bat file has been generated by the IAR Embeddded Workbench -@REM C-SPY interactive debugger,as an aid to preparing a command -@REM line for running the cspybat command line utility with the -@REM appropriate settings. -@REM -@REM After making some adjustments to this file, you can launch cspybat -@REM by typing the name of this file followed by the name of the debug -@REM file (usually an ubrof file). Note that this file is generated -@REM every time a new debug session is initialized, so you may want to -@REM move or rename the file before making changes. -@REM -@REM Note: some command line arguments cannot be properly generated -@REM by this process. Specifically, the plugin which is responsible -@REM for the Terminal I/O window (and other C runtime functionality) -@REM comes in a special version for cspybat, and the name of that -@REM plugin dll is not known when generating this file. It resides in -@REM the $TOOLKIT_DIR$\bin folder and is usually called XXXbat.dll or -@REM XXXlibsupportbat.dll, where XXX is the name of the corresponding -@REM tool chain. Replace the '' parameter -@REM below with the appropriate file name. Other plugins loaded by -@REM C-SPY are usually not needed by, or will not work in, cspybat -@REM but they are listed at the end of this file for reference. - - -"C:\Program Files\IAR Systems\Embedded Workbench 5.4 Evaluation\common\bin\cspybat" "C:\Program Files\IAR Systems\Embedded Workbench 5.4 Evaluation\v850\bin\v850proc.dll" "C:\Program Files\IAR Systems\Embedded Workbench 5.4 Evaluation\v850\bin\v850minicube2.dll" %1 --plugin "C:\Program Files\IAR Systems\Embedded Workbench 5.4 Evaluation\v850\bin\" --backend -B "-v10" "-p" "C:\Program Files\IAR Systems\Embedded Workbench 5.4 Evaluation\v850\CONFIG\DDF\io70f3454.ddf" "-d" "minicube2" - - -@REM Loaded plugins: -@REM v850LibSupport.dll -@REM C:\Program Files\IAR Systems\Embedded Workbench 5.4 Evaluation\common\plugins\CodeCoverage\CodeCoverage.dll -@REM C:\Program Files\IAR Systems\Embedded Workbench 5.4 Evaluation\common\plugins\Profiling\Profiling.dll -@REM C:\Program Files\IAR Systems\Embedded Workbench 5.4 Evaluation\common\plugins\stack\stack.dll -@REM C:\Program Files\IAR Systems\Embedded Workbench 5.4 Evaluation\common\plugins\SymList\SymList.dll diff --git a/bsp/upd70f3454/settings/upd70f3454.dbgdt b/bsp/upd70f3454/settings/upd70f3454.dbgdt deleted file mode 100644 index e5162bc33..000000000 --- a/bsp/upd70f3454/settings/upd70f3454.dbgdt +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - 201381 - - 20 - 1035 - 276 - 69 - - - - - - - - 191272727 - - - 1 - 0 - 0 - - 4 - 254 - 143 - - - - 200 - - - - - - - TabID-7492-12225 - Debug Log - Debug-Log - - - - TabID-6969-12235 - Build - Build - - - - - 0 - - - TabID-18240-12229 - Workspace - Workspace - - - upd70f3454upd70f3454/libcpu - - - - 0 - - - - - - TextEditorE:\RTT\RTTV850\rt-thread\bsp\upd70f3454\applilet3_src\CG_systeminit.c06923422352TextEditorE:\RTT\RTTV850\rt-thread\bsp\upd70f3454\applilet3_src\CG_system.c05923292329TextEditorE:\RTT\RTTV850\rt-thread\bsp\upd70f3454\io70f3454.h05172739627456TextEditorE:\RTT\RTTV850\rt-thread\bsp\upd70f3454\cstartup.s850973377337730100000010000001 - - - - - - - iaridepm.enu1debuggergui.enu1v850minicube21-2-2472265-2-22749334319092361419315185417579462-2-22531442-2-21444255100277831173619092361419315 - - - - diff --git a/bsp/upd70f3454/settings/upd70f3454.dni b/bsp/upd70f3454/settings/upd70f3454.dni deleted file mode 100644 index 0bd8f532e..000000000 --- a/bsp/upd70f3454/settings/upd70f3454.dni +++ /dev/null @@ -1,124 +0,0 @@ -[Interrupts] -Enabled=1 -[MemoryMap] -Enabled=0 -Base=0 -UseAuto=0 -TypeViolation=1 -UnspecRange=1 -ActionState=1 -[DataAlign] -Action=1 -Notification=1 -[DebugChecksum] -Checksum=576357238 -[DisAssemblyWindow] -NumStates=_ 1 -State 1=_ 1 -[InstructionProfiling] -Enabled=_ 0 -[CodeCoverage] -Enabled=_ 0 -[Profiling] -Enabled=0 -[StackPlugin] -Enabled=1 -OverflowWarningsEnabled=1 -WarningThreshold=90 -SpWarningsEnabled=1 -WarnHow=0 -UseTrigger=1 -TriggerName=main -LimitSize=0 -ByteLimit=50 -[MINICUBE2] -Map0=0,0,262143,256,3 -Map1=1,268419072,268431359,12,3 -MapEntries=2 -HWsettings=1,33024,8155,0,160,0,0,1 -HWsettings2=0 -HWsettings3=124,1 -NWsettings=0,8000,0,0,FFFFFFFFFFFFFFFFFFFF -NWsettings2=1 -AutoEventEntries=0 -EventEntries=0 -SeqName0= -SeqData0=0,0,0 -SeqEnable10=0,0,0,0,0,0,0,0,0,0 -SeqEnable20=0,0,0,0,0,0,0,0,0,0 -SeqEnable30=0,0,0,0,0,0,0,0,0,0 -SeqEnable40=0,0,0,0,0,0,0,0,0,0 -SeqDisable0=0,0,0,0,0,0,0,0,0,0 -SeqName1= -SeqData1=0,0,0 -SeqEnable11=0,0,0,0,0,0,0,0,0,0 -SeqEnable21=0,0,0,0,0,0,0,0,0,0 -SeqEnable31=0,0,0,0,0,0,0,0,0,0 -SeqEnable41=0,0,0,0,0,0,0,0,0,0 -SeqDisable1=0,0,0,0,0,0,0,0,0,0 -SeqName2= -SeqData2=0,0,0 -SeqEnable12=0,0,0,0,0,0,0,0,0,0 -SeqEnable22=0,0,0,0,0,0,0,0,0,0 -SeqEnable32=0,0,0,0,0,0,0,0,0,0 -SeqEnable42=0,0,0,0,0,0,0,0,0,0 -SeqDisable2=0,0,0,0,0,0,0,0,0,0 -TraceSettings=-1,0,0,0,0,0,0,2298478591,12,11,0,1,1,1,8192,0,4 -DataFlashSettings=0,0,0,0,0,0,0,0,0,0,0,1,0,1,1 -SelfProgrammingSettings=0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -TraceSave=1,v850trace.txt -TriggerOutSettings=0,0,0,0,0,0,0,0,0,0 -TimerSettings=0,0,0 -Tim2Name1= -Tim2Data1=0,0,0,0,0,0,0,0,0 -Tim2Start1=0,0,0,0,0,0,0,0,0,0 -Tim2Stop1=0,0,0,0,0,0,0,0,0,0 -Tim2Name2= -Tim2Data2=0,0,0,0,0,0,0,0,0 -Tim2Start2=0,0,0,0,0,0,0,0,0,0 -Tim2Stop2=0,0,0,0,0,0,0,0,0,0 -Tim2Name3= -Tim2Data3=0,0,0,0,0,0,0,0,0 -Tim2Start3=0,0,0,0,0,0,0,0,0,0 -Tim2Stop3=0,0,0,0,0,0,0,0,0,0 -Tim2Name4= -Tim2Data4=0,0,0,0,0,0,0,0,0 -Tim2Start4=0,0,0,0,0,0,0,0,0,0 -Tim2Stop4=0,0,0,0,0,0,0,0,0,0 -Tim2Name5= -Tim2Data5=0,0,0,0,0,0,0,0,0 -Tim2Start5=0,0,0,0,0,0,0,0,0,0 -Tim2Stop5=0,0,0,0,0,0,0,0,0,0 -Tim2Name6= -Tim2Data6=0,0,0,0,0,0,0,0,0 -Tim2Start6=0,0,0,0,0,0,0,0,0,0 -Tim2Stop6=0,0,0,0,0,0,0,0,0,0 -Tim2Name7= -Tim2Data7=0,0,0,0,0,0,0,0,0 -Tim2Start7=0,0,0,0,0,0,0,0,0,0 -Tim2Stop7=0,0,0,0,0,0,0,0,0,0 -Tim2Name8= -Tim2Data8=0,0,0,0,0,0,0,0,0 -Tim2Start8=0,0,0,0,0,0,0,0,0,0 -Tim2Stop8=0,0,0,0,0,0,0,0,0,0 -Tim2Name9= -Tim2Data9=0,0,0,0,0,0,0,0,0 -Tim2Start9=0,0,0,0,0,0,0,0,0,0 -Tim2Stop9=0,0,0,0,0,0,0,0,0,0 -CoverSettings=0,1048575,66060288,67108863,0,0,0 -CoverSettings2=0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -Version=1 -LastDevFile=DF3454.800 -LastSetupFailed=0 -[Log file] -LoggingEnabled=_ 0 -LogFile=_ "" -Category=_ 0 -[TermIOLog] -LoggingEnabled=_ 0 -LogFile=_ "" -[Breakpoints] -Count=0 -[TraceHelper] -Enabled=0 -ShowSource=1 diff --git a/bsp/upd70f3454/settings/upd70f3454.wsdt b/bsp/upd70f3454/settings/upd70f3454.wsdt deleted file mode 100644 index 5635ba624..000000000 --- a/bsp/upd70f3454/settings/upd70f3454.wsdt +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - upd70f3454/Debug - - - - - - - - - 198272727 - - - - - - - 2061516441 - 4967085018823 - - - - - - - TabID-10377-5417 - Workspace - Workspace - - - upd70f3454upd70f3454/Output - - - - 0 - - - TabID-17988-5479 - Build - Build - - - TabID-19670-27945Find in FilesFind-in-FilesTabID-31574-29955Debug LogDebug-Log - - 0 - - - - - - 0100000010000001 - - - - - - - iaridepm.enu1-2-2477272-2-21111694135697190278585575-2-22961442-2-214442981002778364303694135697 - - - - diff --git a/bsp/upd70f3454/upd70f3454.ewd b/bsp/upd70f3454/upd70f3454.ewd index dba25a192..7470c266b 100644 --- a/bsp/upd70f3454/upd70f3454.ewd +++ b/bsp/upd70f3454/upd70f3454.ewd @@ -25,7 +25,7 @@ + + E1NWIV850 + 6 + + 2 + 1 + 1 + + + + + + + + + + + E1NWIE2RV850 + 6 + + 0 + 1 + 1 + + + + + + + + + E1SERIALV850 + 6 + + 0 + 1 + 1 + + + + + + + + EMUV850 6 @@ -372,6 +471,10 @@ $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin 0 + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin 0 @@ -489,6 +592,105 @@ + + E1NWIV850 + 6 + + 2 + 1 + 0 + + + + + + + + + + + E1NWIE2RV850 + 6 + + 0 + 1 + 0 + + + + + + + + + E1SERIALV850 + 6 + + 0 + 1 + 0 + + + + + + + + EMUV850 6 @@ -768,6 +970,10 @@ $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin 0 + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin 0 diff --git a/bsp/upd70f3454/upd70f3454.ewp b/bsp/upd70f3454/upd70f3454.ewp index a5fc04e83..4cc072768 100644 --- a/bsp/upd70f3454/upd70f3454.ewp +++ b/bsp/upd70f3454/upd70f3454.ewp @@ -128,7 +128,7 @@ ICCV850 4 - 15 + 16 1 1 - - + + + @@ -955,7 +959,7 @@ ICCV850 4 - 15 + 16 1 0 - - + + + @@ -1799,10 +1807,7 @@ $PROJ_DIR$\..\..\libcpu\v850\context.asm - $PROJ_DIR$\..\..\libcpu\v850\interrupt.c - - - $PROJ_DIR$\..\..\libcpu\v850\stack.c + $PROJ_DIR$\..\..\libcpu\v850\cpuport.c diff --git a/libcpu/v850/context.asm b/libcpu/v850/context.asm index dc743f081..a384c2f06 100644 --- a/libcpu/v850/context.asm +++ b/libcpu/v850/context.asm @@ -40,8 +40,6 @@ PUBLIC rt_hw_interrupt_disable PUBLIC rt_hw_interrupt_enable PUBLIC rt_hw_context_switch_to - PUBLIC rt_hw_context_switch - PUBLIC rt_hw_context_switch_interrupt PUBLIC OSCtxSW PUBLIC OS_Restore_CPU_Context @@ -121,14 +119,6 @@ rt_hw_context_switch_to: OSCtxSW: SAVE_CPU_CTX ;Save all CPU registers - - mov rt_thread_switch_interrupt_flag, r1 - ld.w 0[r1],r5 - cmp 0, r5 - be exit - - mov 0, r5 - st.b r5, 0[r1] mov rt_interrupt_from_thread, r21 ld.w 0[r21], r21 @@ -138,44 +128,10 @@ OSCtxSW: ld.w 0[r1], r1 ld.w 0[r1], sp -exit: ;Restore all Processor registers from stack and return from interrupt jr OS_Restore_CPU_Context -;R1 -> rt_interrupt_from_thread -;R5 -> rt_interrupt_to_thread -rt_hw_context_switch: - mov rt_thread_switch_interrupt_flag, r8 - ld.w 0[r8],r9 - cmp 1, r9 - be jump1 - ;mov rt_thread_switch_interrupt_flag, r1 - mov 1, r9 - st.b r9, 0[r8] - mov rt_interrupt_from_thread, r10 - st.w r1, 0[r10] -jump1 - mov rt_interrupt_to_thread, r11 - st.w r5, 0[r11] - trap 0x10 - jmp [lp] - -rt_hw_context_switch_interrupt: - mov rt_thread_switch_interrupt_flag, r8 - ld.w 0[r8],r9 - cmp 1, r9 - be jump2 - ;mov rt_thread_switch_interrupt_flag, r1 - mov 1, r9 - st.b r9, 0[r8] - mov rt_interrupt_from_thread, r10 - st.w r1, 0[r10] -jump2 - mov rt_interrupt_to_thread, r11 - st.w r5, 0[r11] - jmp [lp] - -rt_hw_context_switch_interrupt_do +rt_hw_context_switch_interrupt_do: mov rt_thread_switch_interrupt_flag, r8 mov 0, r9 st.b r9, 0[r8] diff --git a/libcpu/v850/stack.c b/libcpu/v850/cpuport.c similarity index 67% rename from libcpu/v850/stack.c rename to libcpu/v850/cpuport.c index 265871648..d5fee8ffa 100644 --- a/libcpu/v850/stack.c +++ b/libcpu/v850/cpuport.c @@ -1,7 +1,7 @@ /* - * File : stack.c + * File : cpuport.c * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2009, RT-Thread Development Team + * COPYRIGHT (C) 2009 - 2011, RT-Thread Development Team * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at @@ -9,14 +9,30 @@ * * Change Logs: * Date Author Notes - * 2010-06-29 lgnq the first version - * - * For : NEC V850E - * Toolchain : IAR Embedded Workbench for V850 v3.71 -*/ + * 2011-02-23 Bernard the first version + */ #include +extern volatile rt_uint8_t rt_interrupt_nest; + +/* switch flag on interrupt and thread pointer to save switch record */ +rt_uint32_t rt_interrupt_from_thread; +rt_uint32_t rt_interrupt_to_thread; +rt_uint32_t rt_thread_switch_interrupt_flag; + +/** + * This function will initialize hardware interrupt + */ +void rt_hw_interrupt_init(void) +{ + /* init interrupt nest, and context in thread sp */ + rt_interrupt_nest = 0; + rt_interrupt_from_thread = 0; + rt_interrupt_to_thread = 0; + rt_thread_switch_interrupt_flag = 0; +} + /** * This function will initialize thread stack * @@ -59,3 +75,20 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *stack_ad *(--stk) = (rt_uint32_t) parameter; /* r1 */ return ((rt_uint8_t *)stk); } + +void rt_hw_context_switch(rt_uint32_t from, rt_uint32_t to) +{ + rt_interrupt_from_thread = from; + rt_interrupt_to_thread = to; + asm("trap 0x10"); +} + +void rt_hw_context_switch_interrupt(rt_uint32_t from, rt_uint32_t to) +{ + if (rt_thread_switch_interrupt_flag != 1) + { + rt_thread_switch_interrupt_flag = 1; + rt_interrupt_from_thread = from; + } + rt_interrupt_to_thread = to; +} \ No newline at end of file diff --git a/libcpu/v850/interrupt.c b/libcpu/v850/interrupt.c deleted file mode 100644 index cb85a053f..000000000 --- a/libcpu/v850/interrupt.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * File : interrupt.c - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2009, RT-Thread Development Team - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE - * - * Change Logs: - * Date Author Notes - * 2010-06-29 lgnq the first version - * - * For : NEC V850E - * Toolchain : IAR Embedded Workbench for V850 v3.71 -*/ - -#include - -rt_uint32_t rt_interrupt_from_thread; -rt_uint32_t rt_interrupt_to_thread; -rt_uint32_t rt_thread_switch_interrupt_flag; \ No newline at end of file