diff options
| author | Rogerz Zhang <[email protected]> | 2013-04-01 19:06:22 +0800 |
|---|---|---|
| committer | Rogerz Zhang <[email protected]> | 2013-04-01 19:06:22 +0800 |
| commit | 489b3822f04878737eb0736a123ef7e1fa21e58c (patch) | |
| tree | 226b28a3a8d67558431f509b8db55e5d26a8773d /include | |
| parent | 158e9cdf9132e1d51c526f103d31eb07e56adace (diff) | |
| parent | d781e564606ab40184612bacf0a0bfa5dc094400 (diff) | |
Merge remote-tracking branch 'official/master' into auto-ci
Diffstat (limited to 'include')
| -rw-r--r-- | include/rthw.h | 35 | ||||
| -rw-r--r-- | include/rtthread.h | 1 |
2 files changed, 30 insertions, 6 deletions
diff --git a/include/rthw.h b/include/rthw.h index 204f822a69..d92b5e8590 100644 --- a/include/rthw.h +++ b/include/rthw.h @@ -24,6 +24,9 @@ extern "C" { #endif +/* + * CPU interfaces + */ void rt_hw_cpu_icache_enable(void); void rt_hw_cpu_icache_disable(void); rt_base_t rt_hw_cpu_icache_status(void); @@ -38,16 +41,38 @@ rt_uint8_t *rt_hw_stack_init(void *entry, rt_uint8_t *stack_addr, void *exit); +/* + * Interrupt handler definition + */ +typedef void (*rt_isr_handler_t)(int vector, void *param); + +struct rt_irq_desc { + rt_isr_handler_t handler; + void *param; + +#ifdef RT_USING_INTERRUPT_INFO + char name[RT_NAME_MAX]; + rt_uint32_t counter; +#endif +}; + +/* + * Interrupt interfaces + */ void rt_hw_interrupt_init(void); void rt_hw_interrupt_mask(int vector); void rt_hw_interrupt_umask(int vector); -void rt_hw_interrupt_install(int vector, - rt_isr_handler_t new_handler, - rt_isr_handler_t *old_handler); -void rt_hw_interrupt_handle(int vector); +rt_isr_handler_t rt_hw_interrupt_install(int vector, + rt_isr_handler_t handler, + void *param, + char *name); rt_base_t rt_hw_interrupt_disable(void); void rt_hw_interrupt_enable(rt_base_t level); + +/* + * Context interfaces + */ void rt_hw_context_switch(rt_uint32_t from, rt_uint32_t to); void rt_hw_context_switch_to(rt_uint32_t to); void rt_hw_context_switch_interrupt(rt_uint32_t from, rt_uint32_t to); @@ -58,7 +83,7 @@ void rt_hw_backtrace(rt_uint32_t *fp, rt_uint32_t thread_entry); void rt_hw_show_memory(rt_uint32_t addr, rt_uint32_t size); /* - * exception interfaces + * Exception interfaces */ void rt_hw_exception_install(rt_err_t (*exception_handle)(void* context)); diff --git a/include/rtthread.h b/include/rtthread.h index 0048366fed..be43f36ec9 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -425,7 +425,6 @@ void rt_module_unload_sethook(void (*hook)(rt_module_t module)); /* * interrupt service */ -typedef void (*rt_isr_handler_t)(int vector); /* * rt_interrupt_enter and rt_interrupt_leave only can be called by BSP |