Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
rt-thread
提交
a900eaa0
R
rt-thread
项目概览
BaiXuePrincess
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
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,发现更多精彩内容 >>
提交
a900eaa0
编写于
5月 16, 2019
作者:
S
SummerGift
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'remotes/origin/master' into master_rt-thread
上级
e809ced6
361754e0
变更
11
显示空白变更内容
内联
并排
Showing
11 changed file
with
103 addition
and
64 deletion
+103
-64
bsp/allwinner_tina/libcpu/interrupt.c
bsp/allwinner_tina/libcpu/interrupt.c
+2
-1
bsp/at91sam9g45/drivers/board.c
bsp/at91sam9g45/drivers/board.c
+2
-2
bsp/at91sam9g45/link_scripts/at91sam9g45_ram.ld
bsp/at91sam9g45/link_scripts/at91sam9g45_ram.ld
+4
-4
bsp/at91sam9g45/platform/interrupt.c
bsp/at91sam9g45/platform/interrupt.c
+24
-1
bsp/at91sam9g45/rtconfig.py
bsp/at91sam9g45/rtconfig.py
+1
-1
bsp/stm32/libraries/HAL_Drivers/drv_eth.c
bsp/stm32/libraries/HAL_Drivers/drv_eth.c
+22
-19
components/net/freemodbus/port/portserial.c
components/net/freemodbus/port/portserial.c
+14
-15
components/net/freemodbus/port/portserial_m.c
components/net/freemodbus/port/portserial_m.c
+15
-16
components/net/sal_socket/impl/af_inet_lwip.c
components/net/sal_socket/impl/af_inet_lwip.c
+14
-1
libcpu/arm/arm926/trap.c
libcpu/arm/arm926/trap.c
+3
-3
tools/menuconfig.py
tools/menuconfig.py
+2
-1
未找到文件。
bsp/allwinner_tina/libcpu/interrupt.c
浏览文件 @
a900eaa0
...
...
@@ -102,6 +102,7 @@ void rt_hw_interrupt_mask(int vector)
}
/**
* This function will un-mask a interrupt.
* @param vector the interrupt number
*/
...
...
@@ -167,7 +168,7 @@ rt_isr_handler_t rt_hw_interrupt_install(int vector, rt_isr_handler_t handler,
return
old_handler
;
}
void
rt_interrupt_dispatch
(
void
)
void
rt_interrupt_dispatch
(
rt_uint32_t
fiq_irq
)
{
void
*
param
;
int
vector
;
...
...
bsp/at91sam9g45/drivers/board.c
浏览文件 @
a900eaa0
...
...
@@ -36,8 +36,8 @@
extern
int
Image
$$
ER_ZI
$$
ZI
$$
Limit
;
#define HEAP_BEGIN (&Image$$ER_ZI$$ZI$$Limit)
#elif (defined (__GNUC__))
extern
unsigned
char
__bss_end
__
;
#define HEAP_BEGIN (&__bss_end
__
)
extern
unsigned
char
__bss_end
;
#define HEAP_BEGIN (&__bss_end)
#elif (defined (__ICCARM__))
#pragma section=".noinit"
#define HEAP_BEGIN (__section_end(".noinit"))
...
...
bsp/at91sam9g45/link_scripts/at91sam9g45_ram.ld
浏览文件 @
a900eaa0
OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
OUTPUT_ARCH(arm)
ENTRY(s
tart
)
ENTRY(s
ystem_vectors
)
SECTIONS
{
. = 0x70000000;
...
...
@@ -8,7 +8,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
*(.
init
)
*(.
vectors
)
*(.text)
*(.gnu.linkonce.t*)
...
...
@@ -76,9 +76,9 @@ SECTIONS
.nobss : { *(.nobss) }
. = ALIGN(4);
__bss_start
__
= .;
__bss_start = .;
.bss : { *(.bss)}
__bss_end
__
= .;
__bss_end = .;
/* stabs debugging sections. */
.stab 0 : { *(.stab) }
...
...
bsp/at91sam9g45/platform/interrupt.c
浏览文件 @
a900eaa0
...
...
@@ -332,7 +332,7 @@ void rt_hw_interrupt_umask(int irq)
* @return old handler
*/
rt_isr_handler_t
rt_hw_interrupt_install
(
int
vector
,
rt_isr_handler_t
handler
,
void
*
param
,
char
*
name
)
void
*
param
,
c
onst
c
har
*
name
)
{
rt_isr_handler_t
old_handler
=
RT_NULL
;
...
...
@@ -419,6 +419,29 @@ void rt_hw_interrupt_ack(rt_uint32_t fiq_irq, rt_uint32_t id)
AT91C_BASE_AIC
->
AIC_EOICR
=
0x0
;
}
void
rt_interrupt_dispatch
(
rt_uint32_t
fiq_irq
)
{
rt_isr_handler_t
isr_func
;
rt_uint32_t
irq
;
void
*
param
;
/* get irq number */
irq
=
rt_hw_interrupt_get_active
(
fiq_irq
);
/* get interrupt service routine */
isr_func
=
irq_desc
[
irq
].
handler
;
param
=
irq_desc
[
irq
].
param
;
/* turn to interrupt service routine */
isr_func
(
irq
,
param
);
rt_hw_interrupt_ack
(
fiq_irq
,
irq
);
#ifdef RT_USING_INTERRUPT_INFO
irq_desc
[
irq
].
counter
++
;
#endif
}
#ifdef RT_USING_FINSH
#ifdef RT_USING_INTERRUPT_INFO
void
list_irq
(
void
)
...
...
bsp/at91sam9g45/rtconfig.py
浏览文件 @
a900eaa0
...
...
@@ -10,7 +10,7 @@ if os.getenv('RTT_CC'):
if
CROSS_TOOL
==
'gcc'
:
PLATFORM
=
'gcc'
EXEC_PATH
=
r
'D:\arm-2013.11\
bin'
EXEC_PATH
=
'/usr/
bin'
elif
CROSS_TOOL
==
'keil'
:
PLATFORM
=
'armcc'
EXEC_PATH
=
'C:/Keil_v5'
...
...
bsp/stm32/libraries/HAL_Drivers/drv_eth.c
浏览文件 @
a900eaa0
...
...
@@ -431,13 +431,15 @@ static void phy_monitor_thread_entry(void *parameter)
uint8_t
phy_addr
=
0xFF
;
uint8_t
phy_speed_new
=
0
;
rt_uint32_t
status
=
0
;
uint8_t
detected_count
=
0
;
while
(
phy_addr
==
0xFF
)
{
/* phy search */
rt_uint32_t
i
,
temp
;
for
(
i
=
0
;
i
<=
0x1F
;
i
++
)
{
EthHandle
.
Init
.
PhyAddress
=
i
;
HAL_ETH_ReadPHYRegister
(
&
EthHandle
,
PHY_ID1_REG
,
(
uint32_t
*
)
&
temp
);
if
(
temp
!=
0xFFFF
&&
temp
!=
0x00
)
...
...
@@ -447,16 +449,17 @@ static void phy_monitor_thread_entry(void *parameter)
}
}
if
(
phy_addr
==
0xFF
)
detected_count
++
;
rt_thread_mdelay
(
1000
);
if
(
detected_count
>
10
)
{
LOG_E
(
"phy not probe!"
);
return
;
LOG_E
(
"No PHY device was detected, please check hardware!"
);
}
else
{
LOG_D
(
"found a phy, address:0x%02X"
,
phy_addr
);
}
LOG_D
(
"Found a phy, address:0x%02X"
,
phy_addr
);
/* RESET PHY */
LOG_D
(
"RESET PHY!"
);
HAL_ETH_WritePHYRegister
(
&
EthHandle
,
PHY_BASIC_CONTROL_REG
,
PHY_RESET_MASK
);
...
...
components/net/freemodbus/port/portserial.c
浏览文件 @
a900eaa0
...
...
@@ -52,6 +52,8 @@ static void serial_soft_trans_irq(void* parameter);
BOOL
xMBPortSerialInit
(
UCHAR
ucPORT
,
ULONG
ulBaudRate
,
UCHAR
ucDataBits
,
eMBParity
eParity
)
{
rt_device_t
dev
=
RT_NULL
;
char
uart_name
[
20
];
/**
* set 485 mode receive and transmit control IO
* @note MODBUS_SLAVE_RT_CONTROL_PIN_INDEX need be defined by user
...
...
@@ -60,22 +62,19 @@ BOOL xMBPortSerialInit(UCHAR ucPORT, ULONG ulBaudRate, UCHAR ucDataBits,
rt_pin_mode
(
MODBUS_SLAVE_RT_CONTROL_PIN_INDEX
,
PIN_MODE_OUTPUT
);
#endif
/* set serial name */
if
(
ucPORT
==
1
)
{
#if defined(RT_USING_UART1) || defined(RT_USING_REMAP_UART1)
extern
struct
rt_serial_device
serial1
;
serial
=
&
serial1
;
#endif
}
else
if
(
ucPORT
==
2
)
{
#if defined(RT_USING_UART2)
extern
struct
rt_serial_device
serial2
;
serial
=
&
serial2
;
#endif
}
else
if
(
ucPORT
==
3
)
{
#if defined(RT_USING_UART3)
extern
struct
rt_serial_device
serial3
;
serial
=
&
serial3
;
#endif
rt_snprintf
(
uart_name
,
sizeof
(
uart_name
),
"uart%d"
,
ucPORT
);
dev
=
rt_device_find
(
uart_name
);
if
(
dev
==
RT_NULL
)
{
/* can not find uart */
return
FALSE
;
}
else
{
serial
=
(
struct
rt_serial_device
*
)
dev
;
}
/* set serial configure parameter */
serial
->
config
.
baud_rate
=
ulBaudRate
;
serial
->
config
.
stop_bits
=
STOP_BITS_1
;
...
...
components/net/freemodbus/port/portserial_m.c
浏览文件 @
a900eaa0
...
...
@@ -53,6 +53,9 @@ static void serial_soft_trans_irq(void* parameter);
BOOL
xMBMasterPortSerialInit
(
UCHAR
ucPORT
,
ULONG
ulBaudRate
,
UCHAR
ucDataBits
,
eMBParity
eParity
)
{
rt_device_t
dev
=
RT_NULL
;
char
uart_name
[
20
];
/**
* set 485 mode receive and transmit control IO
* @note MODBUS_MASTER_RT_CONTROL_PIN_INDEX need be defined by user
...
...
@@ -60,24 +63,20 @@ BOOL xMBMasterPortSerialInit(UCHAR ucPORT, ULONG ulBaudRate, UCHAR ucDataBits,
#if defined(RT_MODBUS_MASTER_USE_CONTROL_PIN)
rt_pin_mode
(
MODBUS_MASTER_RT_CONTROL_PIN_INDEX
,
PIN_MODE_OUTPUT
);
#endif
/* set serial name */
if
(
ucPORT
==
1
)
{
#if defined(RT_USING_UART1) || defined(RT_USING_REMAP_UART1)
extern
struct
rt_serial_device
serial1
;
serial
=
&
serial1
;
#endif
}
else
if
(
ucPORT
==
2
)
{
#if defined(RT_USING_UART2)
extern
struct
rt_serial_device
serial2
;
serial
=
&
serial2
;
#endif
}
else
if
(
ucPORT
==
3
)
{
#if defined(RT_USING_UART3)
extern
struct
rt_serial_device
serial3
;
serial
=
&
serial3
;
#endif
rt_snprintf
(
uart_name
,
sizeof
(
uart_name
),
"uart%d"
,
ucPORT
);
dev
=
rt_device_find
(
uart_name
);
if
(
dev
==
RT_NULL
)
{
/* can not find uart */
return
FALSE
;
}
else
{
serial
=
(
struct
rt_serial_device
*
)
dev
;
}
/* set serial configure parameter */
serial
->
config
.
baud_rate
=
ulBaudRate
;
serial
->
config
.
stop_bits
=
STOP_BITS_1
;
...
...
components/net/sal_socket/impl/af_inet_lwip.c
浏览文件 @
a900eaa0
...
...
@@ -217,6 +217,19 @@ static int inet_getsockname(int socket, struct sockaddr *name, socklen_t *namele
return
lwip_getsockname
(
socket
,
name
,
namelen
);
}
int
inet_ioctlsocket
(
int
socket
,
long
cmd
,
void
*
arg
)
{
switch
(
cmd
)
{
case
F_GETFL
:
case
F_SETFL
:
return
lwip_fcntl
(
socket
,
cmd
,
(
int
)
arg
);
default:
return
lwip_ioctl
(
socket
,
cmd
,
arg
);
}
}
#ifdef SAL_USING_POSIX
static
int
inet_poll
(
struct
dfs_fd
*
file
,
struct
rt_pollreq
*
req
)
{
...
...
@@ -278,7 +291,7 @@ static const struct sal_socket_ops lwip_socket_ops =
lwip_shutdown
,
lwip_getpeername
,
inet_getsockname
,
lwip_ioctl
,
inet_ioctlsocket
,
#ifdef SAL_USING_POSIX
inet_poll
,
#endif
...
...
libcpu/arm/arm926/trap.c
浏览文件 @
a900eaa0
...
...
@@ -197,14 +197,14 @@ void rt_hw_trap_resv(struct rt_hw_register *regs)
rt_hw_cpu_shutdown
();
}
extern
void
rt_interrupt_dispatch
(
void
);
extern
void
rt_interrupt_dispatch
(
rt_uint32_t
fiq_irq
);
void
rt_hw_trap_irq
(
void
)
{
rt_interrupt_dispatch
();
rt_interrupt_dispatch
(
INT_IRQ
);
}
void
rt_hw_trap_fiq
(
void
)
{
rt_interrupt_dispatch
();
rt_interrupt_dispatch
(
INT_FIQ
);
}
tools/menuconfig.py
浏览文件 @
a900eaa0
...
...
@@ -23,6 +23,7 @@
# 2018-07-31 weety Support pyconfig
import
os
import
re
import
sys
import
shutil
...
...
@@ -75,7 +76,7 @@ def mk_rtconfig(filename):
if
setting
[
1
]
==
'y'
:
rtconfig
.
write
(
'#define %s
\n
'
%
setting
[
0
])
else
:
rtconfig
.
write
(
'#define %s %s
\n
'
%
(
setting
[
0
],
setting
[
1
]))
rtconfig
.
write
(
'#define %s %s
\n
'
%
(
setting
[
0
],
re
.
findall
(
r
"^.*?=(.*)$"
,
line
)[
0
]))
if
os
.
path
.
isfile
(
'rtconfig_project.h'
):
rtconfig
.
write
(
'#include "rtconfig_project.h"
\n
'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录