Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wwsmg1
rt-thread
提交
83ce4309
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,发现更多精彩内容 >>
提交
83ce4309
编写于
3月 23, 2013
作者:
wuyangyong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update loongson 1B dev: Modify the interrupt interface implementations.
上级
93e04a13
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
43 addition
and
20 deletion
+43
-20
bsp/ls1bdev/drivers/uart.c
bsp/ls1bdev/drivers/uart.c
+2
-2
bsp/ls1bdev/rtconfig.h
bsp/ls1bdev/rtconfig.h
+2
-0
libcpu/mips/loongson_1b/interrupt.c
libcpu/mips/loongson_1b/interrupt.c
+39
-18
未找到文件。
bsp/ls1bdev/drivers/uart.c
浏览文件 @
83ce4309
...
...
@@ -37,7 +37,7 @@ struct rt_uart_ls1b
rt_uint8_t
rx_buffer
[
RT_UART_RX_BUFFER_SIZE
];
}
uart_device
;
static
void
rt_uart_irqhandler
(
int
irqno
)
static
void
rt_uart_irqhandler
(
int
irqno
,
void
*
param
)
{
rt_ubase_t
level
;
rt_uint8_t
isr
;
...
...
@@ -121,7 +121,7 @@ static rt_err_t rt_uart_open(rt_device_t dev, rt_uint16_t oflag)
UART_IER
(
uart
->
hw_base
)
|=
UARTIER_IRXE
;
/* install interrupt */
rt_hw_interrupt_install
(
uart
->
irq
,
rt_uart_irqhandler
,
RT_NULL
);
rt_hw_interrupt_install
(
uart
->
irq
,
rt_uart_irqhandler
,
RT_NULL
,
"UART"
);
rt_hw_interrupt_umask
(
uart
->
irq
);
}
return
RT_EOK
;
...
...
bsp/ls1bdev/rtconfig.h
浏览文件 @
83ce4309
...
...
@@ -21,6 +21,8 @@
// #define RT_THREAD_DEBUG
// <bool name="RT_USING_OVERFLOW_CHECK" description="Thread stack over flow detect" default="true" />
#define RT_USING_OVERFLOW_CHECK
// <bool name="RT_USING_INTERRUPT_INFO" description="Show more interrupt description" default="true" />
#define RT_USING_INTERRUPT_INFO
// </section>
// <bool name="RT_USING_HOOK" description="Using hook functions" default="true" />
...
...
libcpu/mips/loongson_1b/interrupt.c
浏览文件 @
83ce4309
...
...
@@ -11,9 +11,11 @@
* Date Author Notes
* 2010-10-15 Bernard first version
* 2010-10-15 lgnq modified for LS1B
* 2013-03-29 aozima Modify the interrupt interface implementations.
*/
#include <rtthread.h>
#include <rthw.h>
#include "ls1b.h"
#define MAX_INTR 32
...
...
@@ -23,7 +25,7 @@ rt_uint32_t rt_interrupt_from_thread;
rt_uint32_t
rt_interrupt_to_thread
;
rt_uint32_t
rt_thread_switch_interrupt_flag
;
static
rt_isr_handler_t
irq_handle_table
[
MAX_INTR
];
static
struct
rt_irq_desc
irq_handle_table
[
MAX_INTR
];
void
rt_interrupt_dispatch
(
void
*
ptreg
);
void
rt_hw_timer_handler
();
...
...
@@ -36,7 +38,7 @@ static struct ls1b_intc_regs volatile *ls1b_hw0_icregs
/*@{*/
void
rt_hw_interrupt_handler
(
int
vector
)
static
void
rt_hw_interrupt_handler
(
int
vector
,
void
*
param
)
{
rt_kprintf
(
"Unhandled interrupt %d occured!!!
\n
"
,
vector
);
}
...
...
@@ -46,7 +48,7 @@ void rt_hw_interrupt_handler(int vector)
*/
void
rt_hw_interrupt_init
(
void
)
{
rt_int32_t
i
nde
x
;
rt_int32_t
i
d
x
;
/* pci active low */
ls1b_hw0_icregs
->
int_pol
=
-
1
;
//must be done here 20110802 lgnq
...
...
@@ -55,9 +57,10 @@ void rt_hw_interrupt_init(void)
/* mask all interrupts */
(
ls1b_hw0_icregs
+
0
)
->
int_clr
=
0xffffffff
;
for
(
index
=
0
;
index
<
MAX_INTR
;
index
++
)
rt_memset
(
irq_handle_table
,
0x00
,
sizeof
(
irq_handle_table
));
for
(
idx
=
0
;
idx
<
MAX_INTR
;
idx
++
)
{
irq_handle_table
[
i
ndex
]
=
(
rt_isr_handler_t
)
rt_hw_interrupt_handler
;
irq_handle_table
[
i
dx
].
handler
=
rt_hw_interrupt_handler
;
}
/* init interrupt nest, and context in thread sp */
...
...
@@ -92,20 +95,32 @@ void rt_hw_interrupt_umask(int vector)
* @param new_handler the interrupt service routine to be installed
* @param old_handler the old interrupt service routine
*/
void
rt_hw_interrupt_install
(
int
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
>=
0
&&
vector
<
MAX_INTR
)
{
if
(
old_handler
!=
RT_NULL
)
*
old_handler
=
irq_handle_table
[
vector
];
if
(
new_handler
!=
RT_NULL
)
irq_handle_table
[
vector
]
=
(
rt_isr_handler_t
)
new_handler
;
}
old_handler
=
irq_handle_table
[
vector
].
handler
;
if
(
handler
!=
RT_NULL
)
{
#ifdef RT_USING_INTERRUPT_INFO
rt_strncpy
(
irq_handle_table
[
vector
].
name
,
name
,
RT_NAME_MAX
);
#endif
/* RT_USING_INTERRUPT_INFO */
irq_handle_table
[
vector
].
handler
=
handler
;
irq_handle_table
[
vector
].
param
=
param
;
}
}
return
old_handler
;
}
void
rt_interrupt_dispatch
(
void
*
ptreg
)
{
int
i
;
int
irq
;
void
*
param
;
rt_isr_handler_t
irq_func
;
static
rt_uint32_t
status
=
0
;
rt_uint32_t
c0_status
;
...
...
@@ -134,18 +149,24 @@ void rt_interrupt_dispatch(void *ptreg)
if
(
!
status
)
return
;
for
(
i
=
MAX_INTR
;
i
>
0
;
--
i
)
for
(
i
rq
=
MAX_INTR
;
irq
>
0
;
--
irq
)
{
if
((
status
&
(
1
<<
i
)))
if
((
status
&
(
1
<<
irq
)))
{
status
&=
~
(
1
<<
i
);
irq_func
=
irq_handle_table
[
i
];
status
&=
~
(
1
<<
irq
);
irq_func
=
irq_handle_table
[
irq
].
handler
;
param
=
irq_handle_table
[
irq
].
param
;
/* do interrupt */
(
*
irq_func
)(
i
);
(
*
irq_func
)(
irq
,
param
);
#ifdef RT_USING_INTERRUPT_INFO
irq_handle_table
[
irq
].
counter
++
;
#endif
/* RT_USING_INTERRUPT_INFO */
/* ack interrupt */
ls1b_hw0_icregs
->
int_clr
|=
(
1
<<
i
);
ls1b_hw0_icregs
->
int_clr
|=
(
1
<<
i
rq
);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录