Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wwsmg1
rt-thread
提交
29a3ae43
R
rt-thread
项目概览
wwsmg1
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
29a3ae43
编写于
3月 23, 2013
作者:
wuyangyong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update sep4020: Modify the interrupt interface implementations.
上级
fbc1b05d
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
91 addition
and
67 deletion
+91
-67
bsp/mini4020/drivers/board.c
bsp/mini4020/drivers/board.c
+6
-5
bsp/mini4020/drivers/dm9161.c
bsp/mini4020/drivers/dm9161.c
+3
-3
bsp/mini4020/rtconfig.h
bsp/mini4020/rtconfig.h
+1
-0
bsp/mini4020/template.Uv2
bsp/mini4020/template.Uv2
+2
-2
libcpu/arm/sep4020/interrupt.c
libcpu/arm/sep4020/interrupt.c
+50
-36
libcpu/arm/sep4020/trap.c
libcpu/arm/sep4020/trap.c
+29
-21
未找到文件。
bsp/mini4020/drivers/board.c
浏览文件 @
29a3ae43
...
...
@@ -34,7 +34,7 @@ struct serial_device uart0 =
/**
* This function will handle rtos timer
*/
void
rt_timer_handler
(
int
vector
)
void
rt_timer_handler
(
int
vector
,
void
*
param
)
{
rt_uint32_t
clear_int
;
rt_tick_increase
();
...
...
@@ -47,7 +47,7 @@ void rt_timer_handler(int vector)
/**
* This function will handle serial
*/
void
rt_serial_handler
(
int
vector
)
void
rt_serial_handler
(
int
vector
,
void
*
param
)
{
//rt_kprintf("in rt_serial_handler\n");
rt_int32_t
stat
=
*
(
RP
)
UART0_IIR
;
...
...
@@ -78,16 +78,17 @@ static void rt_hw_board_led_init(void)
*
(
RP
)
GPIO_PORTE_DATA
&=
~
0x38
;
/* low */
}
/**
* This function will init timer4 for system ticks
*/
void
rt_hw_timer_init
(
void
)
void
rt_hw_timer_init
(
void
)
{
/*Set timer1*/
*
(
RP
)
TIMER_T1LCR
=
880000
;
*
(
RP
)
TIMER_T1CR
=
0x06
;
rt_hw_interrupt_install
(
INTSRC_TIMER1
,
rt_timer_handler
,
RT_NULL
);
rt_hw_interrupt_install
(
INTSRC_TIMER1
,
rt_timer_handler
,
RT_NULL
,
"tick"
);
rt_hw_interrupt_umask
(
INTSRC_TIMER1
);
/*Enable timer1*/
...
...
@@ -119,7 +120,7 @@ void rt_hw_uart_init(void)
/*Disable tx interrupt*/
*
(
RP
)(
UART0_IER
)
&=
~
(
0x1
<<
1
);
rt_hw_interrupt_install
(
INTSRC_UART0
,
rt_serial_handler
,
RT_NULL
);
rt_hw_interrupt_install
(
INTSRC_UART0
,
rt_serial_handler
,
RT_NULL
,
"UART0"
);
rt_hw_interrupt_umask
(
INTSRC_UART0
);
/* register uart0 */
rt_hw_serial_register
(
&
uart0_device
,
"uart0"
,
...
...
bsp/mini4020/drivers/dm9161.c
浏览文件 @
29a3ae43
...
...
@@ -81,7 +81,7 @@ struct rt_dm9161_eth
static
struct
rt_dm9161_eth
dm9161_device
;
static
struct
rt_semaphore
sem_ack
,
sem_lock
;
void
rt_dm9161_isr
(
int
irqno
);
void
rt_dm9161_isr
(
int
irqno
,
void
*
param
);
static
void
udelay
(
unsigned
long
ns
)
{
...
...
@@ -201,7 +201,7 @@ static void read_phy(unsigned char phy_addr, unsigned char address, unsigned int
}
/* interrupt service routine */
void
rt_dm9161_isr
(
int
irqno
)
void
rt_dm9161_isr
(
int
irqno
,
void
*
param
)
{
unsigned
long
intstatus
;
rt_uint32_t
address
;
...
...
@@ -469,7 +469,7 @@ static rt_err_t rt_dm9161_open(rt_device_t dev, rt_uint16_t oflag)
*
(
volatile
unsigned
long
*
)
GPIO_PORTA_INTRCLR
|=
0x0080
;
//清除中断
*
(
volatile
unsigned
long
*
)
GPIO_PORTA_INTRCLR
=
0x0000
;
//清除中断
rt_hw_interrupt_install
(
INTSRC_MAC
,
rt_dm9161_isr
,
RT_NULL
);
rt_hw_interrupt_install
(
INTSRC_MAC
,
rt_dm9161_isr
,
RT_NULL
,
"EMAC"
);
enable_irq
(
INTSRC_EXINT7
);
...
...
bsp/mini4020/rtconfig.h
浏览文件 @
29a3ae43
...
...
@@ -20,6 +20,7 @@
/* #define RT_THREAD_DEBUG */
#define RT_USING_OVERFLOW_CHECK
#define RT_USING_INTERRUPT_INFO
/* Using Hook */
#define RT_USING_HOOK
...
...
bsp/mini4020/template.Uv2
浏览文件 @
29a3ae43
...
...
@@ -31,14 +31,14 @@ Options 1,0,0 // Target 'RT-Thread_Mini4020'
EnvReg ()
OrgReg ()
TgStat=16
OutDir (.\)
OutDir (.\
build\
)
OutName (rtthread-mini4020)
GenApp=1
GenLib=0
GenHex=0
Debug=1
Browse=0
LstDir (.\)
LstDir (.\
build\
)
HexSel=1
MG32K=0
TGMORE=0
...
...
libcpu/arm/sep4020/interrupt.c
浏览文件 @
29a3ae43
...
...
@@ -10,9 +10,11 @@
* Change Logs:
* Date Author Notes
* 2006-03-13 Bernard first version
* 2013-03-29 aozima Modify the interrupt interface implementations.
*/
#include <rtthread.h>
#include <rthw.h>
#include <sep4020.h>
#define MAX_HANDLERS 32
...
...
@@ -20,7 +22,7 @@
extern
rt_uint32_t
rt_interrupt_nest
;
/* exception and interrupt handler table */
rt_isr_handler_t
isr_table
[
MAX_HANDLERS
];
struct
rt_irq_desc
isr_table
[
MAX_HANDLERS
];
rt_uint32_t
rt_interrupt_from_thread
,
rt_interrupt_to_thread
;
rt_uint32_t
rt_thread_switch_interrupt_flag
;
...
...
@@ -38,7 +40,7 @@ rt_isr_handler_t rt_hw_interrupt_handle(rt_uint32_t vector)
/**
* This function will initialize hardware interrupt
*/
void
rt_hw_interrupt_init
()
void
rt_hw_interrupt_init
(
void
)
{
register
rt_uint32_t
idx
;
...
...
@@ -66,9 +68,10 @@ void rt_hw_interrupt_init()
*
(
RP
)(
INTC_IPLR
)
=
0x0
;
/* init exceptions table */
rt_memset
(
isr_table
,
0x00
,
sizeof
(
isr_table
));
for
(
idx
=
0
;
idx
<
MAX_HANDLERS
;
idx
++
)
{
isr_table
[
idx
]
=
(
rt_isr_handler_t
)
rt_hw_interrupt_handle
;
isr_table
[
idx
].
handler
=
rt_hw_interrupt_handle
;
}
/* init interrupt nest, and context in thread sp */
...
...
@@ -108,15 +111,26 @@ void rt_hw_interrupt_umask(rt_uint32_t vector)
* @param new_handler the interrupt service routine to be installed
* @param old_handler the old interrupt service routine
*/
void
rt_hw_interrupt_install
(
rt_uint32_t
vector
,
rt_isr_handler_t
new_handler
,
rt_isr_handler_t
*
old_handler
)
rt_isr_handler_t
rt_hw_interrupt_install
(
int
vector
,
rt_isr_handler_t
handler
,
void
*
param
,
char
*
name
)
{
rt_isr_handler_t
old_handler
=
RT_NULL
;
if
(
vector
<
MAX_HANDLERS
)
{
if
(
*
old_handler
!=
RT_NULL
)
*
old_handler
=
isr_table
[
vector
];
if
(
new_handler
!=
RT_NULL
)
isr_table
[
vector
]
=
new_handler
;
old_handler
=
isr_table
[
vector
].
handler
;
if
(
handler
!=
RT_NULL
)
{
#ifdef RT_USING_INTERRUPT_INFO
rt_strncpy
(
isr_table
[
vector
].
name
,
name
,
RT_NAME_MAX
);
#endif
/* RT_USING_INTERRUPT_INFO */
isr_table
[
vector
].
handler
=
handler
;
isr_table
[
vector
].
param
=
param
;
}
}
return
old_handler
;
}
/*@}*/
libcpu/arm/sep4020/trap.c
浏览文件 @
29a3ae43
...
...
@@ -12,6 +12,7 @@
* 2006-03-13 Bernard first version
* 2006-05-27 Bernard add skyeye support
* 2007-11-19 Yi.Qiu fix rt_hw_trap_irq function
* 2013-03-29 aozima Modify the interrupt interface implementations.
*/
#include <rtthread.h>
...
...
@@ -131,13 +132,14 @@ void rt_hw_trap_resv(struct rt_hw_register *regs)
rt_hw_cpu_shutdown
();
}
extern
rt_isr_handler_t
isr_table
[];
extern
struct
rt_irq_desc
isr_table
[];
void
rt_hw_trap_irq
()
void
rt_hw_trap_irq
(
void
)
{
unsigned
long
intstat
;
rt_uint32_t
i
=
0
;
rt_uint32_t
irq
=
0
;
rt_isr_handler_t
isr_func
;
void
*
param
;
/*Get the final intrrupt source*/
intstat
=
*
(
RP
)(
INTC_IFSR
);;
...
...
@@ -146,16 +148,22 @@ void rt_hw_trap_irq()
while
(
intstat
!=
1
)
{
intstat
=
intstat
>>
1
;
i
++
;
irq
++
;
}
/* get interrupt service routine */
isr_func
=
isr_table
[
i
];
isr_func
=
isr_table
[
irq
].
isr_handle
;
param
=
isr_table
[
irq
].
param
;
/* turn to interrupt service routine */
isr_func
(
i
);
isr_func
(
irq
,
param
);
#ifdef RT_USING_INTERRUPT_INFO
isr_table
[
irq
].
counter
++
;
#endif
/* RT_USING_INTERRUPT_INFO */
}
void
rt_hw_trap_fiq
()
void
rt_hw_trap_fiq
(
void
)
{
rt_kprintf
(
"fast interrupt request
\n
"
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录