Skip to content

Commit 32a5668

Browse files
authored
Merge pull request #5558 from rtthread-bot/rtt_bot
[update] RT-Thread Robot automatic submission
2 parents 5a0fea6 + 759ae19 commit 32a5668

File tree

3 files changed

+50
-7
lines changed

3 files changed

+50
-7
lines changed

bsp/at91sam9260/platform/interrupt.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,28 @@ void rt_hw_interrupt_ack(rt_uint32_t fiq_irq, rt_uint32_t id)
396396
at91_sys_write(AT91_AIC_EOICR, 0x0);
397397
}
398398

399+
void rt_interrupt_dispatch(rt_uint32_t fiq_irq)
400+
{
401+
rt_isr_handler_t isr_func;
402+
rt_uint32_t irq;
403+
void *param;
404+
405+
/* get irq number */
406+
irq = rt_hw_interrupt_get_active(fiq_irq);
407+
408+
/* get interrupt service routine */
409+
isr_func = irq_desc[irq].handler;
410+
param = irq_desc[irq].param;
411+
412+
/* turn to interrupt service routine */
413+
isr_func(irq, param);
414+
415+
rt_hw_interrupt_ack(fiq_irq, irq);
416+
#ifdef RT_USING_INTERRUPT_INFO
417+
irq_desc[irq].counter ++;
418+
#endif
419+
}
420+
399421
#ifdef RT_USING_FINSH
400422
#ifdef RT_USING_INTERRUPT_INFO
401423
void list_irq(void)

bsp/at91sam9260/template.uvopt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<tExt>*.txt; *.h; *.inc</tExt>
1414
<pExt>*.plm</pExt>
1515
<CppX>*.cpp</CppX>
16+
<nMigrate>0</nMigrate>
1617
</Extensions>
1718

1819
<DaveTm>
@@ -31,6 +32,7 @@
3132
<BeepAtEnd>1</BeepAtEnd>
3233
<RunSim>1</RunSim>
3334
<RunTarget>0</RunTarget>
35+
<RunAbUc>0</RunAbUc>
3436
</OPTTT>
3537
<OPTHX>
3638
<HexSelection>1</HexSelection>
@@ -108,10 +110,10 @@
108110
<tRtrace>1</tRtrace>
109111
<sRSysVw>1</sRSysVw>
110112
<tRSysVw>1</tRSysVw>
111-
<tPdscDbg>1</tPdscDbg>
112113
<sRunDeb>0</sRunDeb>
113114
<sLrtime>0</sLrtime>
114-
<nTsel>5</nTsel>
115+
<bEvRecOn>1</bEvRecOn>
116+
<nTsel>18</nTsel>
115117
<sDll></sDll>
116118
<sDllPa></sDllPa>
117119
<sDlgDll></sDlgDll>
@@ -168,6 +170,13 @@
168170
</DebugFlag>
169171
<LintExecutable></LintExecutable>
170172
<LintConfigFile></LintConfigFile>
173+
<bLintAuto>0</bLintAuto>
174+
<bAutoGenD>0</bAutoGenD>
175+
<LntExFlags>0</LntExFlags>
176+
<pMisraName></pMisraName>
177+
<pszMrule></pszMrule>
178+
<pSingCmds></pSingCmds>
179+
<pMultCmds></pMultCmds>
171180
</TargetOption>
172181
</Target>
173182

bsp/at91sam9260/template.uvproj

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,18 @@
7272
<UserProg2Name></UserProg2Name>
7373
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
7474
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
75+
<nStopB1X>0</nStopB1X>
76+
<nStopB2X>0</nStopB2X>
7577
</BeforeMake>
7678
<AfterMake>
77-
<RunUserProg1>0</RunUserProg1>
79+
<RunUserProg1>1</RunUserProg1>
7880
<RunUserProg2>0</RunUserProg2>
79-
<UserProg1Name></UserProg1Name>
81+
<UserProg1Name>fromelf.exe --bin -o [email protected] #L</UserProg1Name>
8082
<UserProg2Name></UserProg2Name>
8183
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
8284
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
85+
<nStopA1X>0</nStopA1X>
86+
<nStopA2X>0</nStopA2X>
8387
</AfterMake>
8488
<SelectedForBatchBuild>0</SelectedForBatchBuild>
8589
<SVCSIdString></SVCSIdString>
@@ -141,10 +145,9 @@
141145
<RestoreToolbox>1</RestoreToolbox>
142146
<RestoreTracepoints>1</RestoreTracepoints>
143147
<RestoreSysVw>1</RestoreSysVw>
144-
<UsePdscDebugDescription>1</UsePdscDebugDescription>
145148
</Target>
146149
<RunDebugAfterBuild>0</RunDebugAfterBuild>
147-
<TargetSelection>5</TargetSelection>
150+
<TargetSelection>18</TargetSelection>
148151
<SimDlls>
149152
<CpuDll></CpuDll>
150153
<CpuDllArguments></CpuDllArguments>
@@ -224,6 +227,7 @@
224227
<useUlib>0</useUlib>
225228
<EndSel>0</EndSel>
226229
<uLtcg>0</uLtcg>
230+
<nSecure>0</nSecure>
227231
<RoSelD>3</RoSelD>
228232
<RwSelD>3</RwSelD>
229233
<CodeSel>0</CodeSel>
@@ -356,8 +360,15 @@
356360
<wLevel>2</wLevel>
357361
<uThumb>0</uThumb>
358362
<uSurpInc>0</uSurpInc>
359-
<uC99>0</uC99>
363+
<uC99>1</uC99>
360364
<useXO>0</useXO>
365+
<v6Lang>1</v6Lang>
366+
<v6LangP>1</v6LangP>
367+
<vShortEn>1</vShortEn>
368+
<vShortWch>1</vShortWch>
369+
<v6Lto>0</v6Lto>
370+
<v6WtE>0</v6WtE>
371+
<v6Rtti>0</v6Rtti>
361372
<VariousControls>
362373
<MiscControls></MiscControls>
363374
<Define>RT_USING_INTERRUPT_INFO</Define>
@@ -375,6 +386,7 @@
375386
<NoWarn>0</NoWarn>
376387
<uSurpInc>0</uSurpInc>
377388
<useXO>0</useXO>
389+
<uClangAs>0</uClangAs>
378390
<VariousControls>
379391
<MiscControls></MiscControls>
380392
<Define></Define>

0 commit comments

Comments
 (0)