Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wwsmg1
rt-thread
提交
8e6a534f
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,发现更多精彩内容 >>
提交
8e6a534f
编写于
3月 26, 2013
作者:
B
Bernard Xiong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix compiling issue in Jz47XX
上级
e9c86a17
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
29 addition
and
44 deletion
+29
-44
bsp/jz47xx/board.c
bsp/jz47xx/board.c
+2
-29
bsp/jz47xx/rtconfig.h
bsp/jz47xx/rtconfig.h
+1
-0
bsp/jz47xx/uart.c
bsp/jz47xx/uart.c
+3
-3
libcpu/mips/jz47xx/interrupt.c
libcpu/mips/jz47xx/interrupt.c
+23
-12
未找到文件。
bsp/jz47xx/board.c
浏览文件 @
8e6a534f
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
/**
/**
* This is the timer interrupt service routine.
* This is the timer interrupt service routine.
*/
*/
void
rt_hw_timer_handler
()
void
rt_hw_timer_handler
(
int
vector
,
void
*
param
)
{
{
/* increase a OS tick */
/* increase a OS tick */
rt_tick_increase
();
rt_tick_increase
();
...
@@ -52,33 +52,6 @@ void rt_hw_timer_init()
...
@@ -52,33 +52,6 @@ void rt_hw_timer_init()
/* clear counter */
/* clear counter */
OST_CNT
=
0
;
OST_CNT
=
0
;
#if 0
switch (RTC_DIV)
{
case 1:
val = OST_TCSR_PRESCALE1;
break;
case 4:
val = OST_TCSR_PRESCALE4;
break;
case 16:
val = OST_TCSR_PRESCALE16;
break;
case 64:
val = OST_TCSR_PRESCALE64;
break;
case 256:
val = OST_TCSR_PRESCALE256;
break;
case 1024:
val = OST_TCSR_PRESCALE1024;
break;
default:
val = OST_TCSR_PRESCALE4;
break;
}
#endif
#ifdef RTC_SRC_EXTAL
#ifdef RTC_SRC_EXTAL
OST_CSR
=
(
val
|
OST_TCSR_EXT_EN
);
OST_CSR
=
(
val
|
OST_TCSR_EXT_EN
);
#else
#else
...
@@ -89,7 +62,7 @@ void rt_hw_timer_init()
...
@@ -89,7 +62,7 @@ void rt_hw_timer_init()
TCU_TMCR
=
TCU_TMCR_OSTMCL
;
TCU_TMCR
=
TCU_TMCR_OSTMCL
;
TCU_TESR
=
TCU_TESR_OSTST
;
TCU_TESR
=
TCU_TESR_OSTST
;
rt_hw_interrupt_install
(
IRQ_TCU0
,
rt_hw_timer_handler
,
RT_NULL
);
rt_hw_interrupt_install
(
IRQ_TCU0
,
rt_hw_timer_handler
,
RT_NULL
,
"tick"
);
rt_hw_interrupt_umask
(
IRQ_TCU0
);
rt_hw_interrupt_umask
(
IRQ_TCU0
);
}
}
...
...
bsp/jz47xx/rtconfig.h
浏览文件 @
8e6a534f
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
/* Thread Debug */
/* Thread Debug */
#define RT_DEBUG
#define RT_DEBUG
#define RT_USING_OVERFLOW_CHECK
#define RT_USING_OVERFLOW_CHECK
#define RT_USING_INTERRUPT_INFO
/* Using Hook */
/* Using Hook */
#define RT_USING_HOOK
#define RT_USING_HOOK
...
...
bsp/jz47xx/uart.c
浏览文件 @
8e6a534f
...
@@ -129,10 +129,10 @@ struct rt_uart_jz
...
@@ -129,10 +129,10 @@ struct rt_uart_jz
rt_uint8_t
rx_buffer
[
RT_UART_RX_BUFFER_SIZE
];
rt_uint8_t
rx_buffer
[
RT_UART_RX_BUFFER_SIZE
];
}
uart_device
;
}
uart_device
;
static
void
rt_uart_irqhandler
(
int
irqno
)
static
void
rt_uart_irqhandler
(
int
vector
,
void
*
param
)
{
{
rt_ubase_t
level
,
isr
;
rt_ubase_t
level
,
isr
;
struct
rt_uart_jz
*
uart
=
&
uart_device
;
struct
rt_uart_jz
*
uart
=
param
;
/* read interrupt status and clear it */
/* read interrupt status and clear it */
isr
=
UART_ISR
(
uart
->
hw_base
);
isr
=
UART_ISR
(
uart
->
hw_base
);
...
@@ -212,7 +212,7 @@ static rt_err_t rt_uart_open(rt_device_t dev, rt_uint16_t oflag)
...
@@ -212,7 +212,7 @@ static rt_err_t rt_uart_open(rt_device_t dev, rt_uint16_t oflag)
UART_IER
(
uart
->
hw_base
)
|=
(
UARTIER_RIE
|
UARTIER_RTIE
);
UART_IER
(
uart
->
hw_base
)
|=
(
UARTIER_RIE
|
UARTIER_RTIE
);
/* install interrupt */
/* install interrupt */
rt_hw_interrupt_install
(
uart
->
irq
,
rt_uart_irqhandler
,
RT_NULL
);
rt_hw_interrupt_install
(
uart
->
irq
,
rt_uart_irqhandler
,
uart
,
"uart"
);
rt_hw_interrupt_umask
(
uart
->
irq
);
rt_hw_interrupt_umask
(
uart
->
irq
);
}
}
return
RT_EOK
;
return
RT_EOK
;
...
...
libcpu/mips/jz47xx/interrupt.c
浏览文件 @
8e6a534f
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
* Date Author Notes
* Date Author Notes
* 2010-07-09 Bernard first version
* 2010-07-09 Bernard first version
*/
*/
#include <rt
thread
.h>
#include <rt
hw
.h>
#include "jz47xx.h"
#include "jz47xx.h"
#define JZ47XX_MAX_INTR 32
#define JZ47XX_MAX_INTR 32
...
@@ -20,7 +20,7 @@ extern rt_uint32_t rt_interrupt_nest;
...
@@ -20,7 +20,7 @@ extern rt_uint32_t rt_interrupt_nest;
rt_uint32_t
rt_interrupt_from_thread
,
rt_interrupt_to_thread
;
rt_uint32_t
rt_interrupt_from_thread
,
rt_interrupt_to_thread
;
rt_uint32_t
rt_thread_switch_interrupt_flag
;
rt_uint32_t
rt_thread_switch_interrupt_flag
;
static
rt_isr_handler_t
irq_handle_table
[
JZ47XX_MAX_INTR
];
static
struct
rt_irq_desc
irq_handle_table
[
JZ47XX_MAX_INTR
];
/**
/**
* @addtogroup Jz47xx
* @addtogroup Jz47xx
...
@@ -39,9 +39,10 @@ void rt_hw_interrupt_init()
...
@@ -39,9 +39,10 @@ void rt_hw_interrupt_init()
{
{
rt_int32_t
index
;
rt_int32_t
index
;
rt_memset
(
irq_handle_table
,
0x00
,
sizeof
(
irq_handle_table
));
for
(
index
=
0
;
index
<
JZ47XX_MAX_INTR
;
index
++
)
for
(
index
=
0
;
index
<
JZ47XX_MAX_INTR
;
index
++
)
{
{
irq_handle_table
[
index
]
=
(
rt_isr_handler_t
)
rt_hw_interrupt_handler
;
irq_handle_table
[
index
]
.
handler
=
(
rt_isr_handler_t
)
rt_hw_interrupt_handler
;
}
}
/* init interrupt nest, and context in thread sp */
/* init interrupt nest, and context in thread sp */
...
@@ -73,18 +74,28 @@ void rt_hw_interrupt_umask(int vector)
...
@@ -73,18 +74,28 @@ void rt_hw_interrupt_umask(int vector)
/**
/**
* This function will install a interrupt service routine to a interrupt.
* This function will install a interrupt service routine to a interrupt.
* @param vector the interrupt number
* @param vector the interrupt number
* @param new_handler the interrupt service routine to be installed
* @param handler the interrupt service routine to be installed
* @param old_handler the old interrupt service routine
* @param param the interrupt service function parameter
* @param name the interrupt name
* @return old handler
*/
*/
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
<
JZ47XX_MAX_INTR
)
if
(
vector
>=
0
&&
vector
<
JZ47XX_MAX_INTR
)
{
{
if
(
old_handler
!=
RT_NULL
)
old_handler
=
irq_handle_table
[
vector
].
handler
;
*
old_handler
=
irq_handle_table
[
vector
];
if
(
new_handler
!=
RT_NULL
)
rt_strncpy
(
irq_handle_table
[
vector
].
name
,
name
,
RT_NAME_MAX
);
irq_handle_table
[
vector
]
=
(
rt_isr_handler_t
)
new_handler
;
irq_handle_table
[
vector
].
handler
=
handler
;
irq_handle_table
[
vector
].
param
=
param
;
}
}
return
old_handler
;
}
}
void
rt_interrupt_dispatch
(
void
*
ptreg
)
void
rt_interrupt_dispatch
(
void
*
ptreg
)
...
@@ -102,10 +113,10 @@ void rt_interrupt_dispatch(void *ptreg)
...
@@ -102,10 +113,10 @@ void rt_interrupt_dispatch(void *ptreg)
if
((
pending
&
(
1
<<
i
)))
if
((
pending
&
(
1
<<
i
)))
{
{
pending
&=
~
(
1
<<
i
);
pending
&=
~
(
1
<<
i
);
irq_func
=
irq_handle_table
[
i
];
irq_func
=
irq_handle_table
[
i
]
.
handler
;
/* do interrupt */
/* do interrupt */
(
*
irq_func
)(
i
);
(
*
irq_func
)(
i
,
irq_handle_table
[
i
].
param
);
/* ack interrupt */
/* ack interrupt */
INTC_IPR
=
(
1
<<
i
);
INTC_IPR
=
(
1
<<
i
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录