Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wwsmg1
rt-thread
提交
7cd6cec8
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,发现更多精彩内容 >>
提交
7cd6cec8
编写于
12月 19, 2017
作者:
wuyangyong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[BSP] update stm32107/stm32407 Ethernet driver: support multicast filter.
上级
d483f25f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
243 addition
and
2 deletion
+243
-2
bsp/stm32f107/drivers/stm32_eth.c
bsp/stm32f107/drivers/stm32_eth.c
+122
-1
bsp/stm32f40x/drivers/stm32f4xx_eth.c
bsp/stm32f40x/drivers/stm32f4xx_eth.c
+121
-1
未找到文件。
bsp/stm32f107/drivers/stm32_eth.c
浏览文件 @
7cd6cec8
...
@@ -3027,6 +3027,9 @@ struct rt_stm32_eth
...
@@ -3027,6 +3027,9 @@ struct rt_stm32_eth
/* interface address info. */
/* interface address info. */
rt_uint8_t
dev_addr
[
MAX_ADDR_LEN
];
/* hw address */
rt_uint8_t
dev_addr
[
MAX_ADDR_LEN
];
/* hw address */
uint32_t
ETH_HashTableHigh
;
uint32_t
ETH_HashTableLow
;
};
};
static
struct
rt_stm32_eth
stm32_eth_device
;
static
struct
rt_stm32_eth
stm32_eth_device
;
static
struct
rt_semaphore
tx_buf_free
;
static
struct
rt_semaphore
tx_buf_free
;
...
@@ -3082,10 +3085,118 @@ void ETH_IRQHandler(void)
...
@@ -3082,10 +3085,118 @@ void ETH_IRQHandler(void)
/* RT-Thread Device Interface */
/* RT-Thread Device Interface */
#if (LWIP_IPV4 && LWIP_IGMP) || (LWIP_IPV6 && LWIP_IPV6_MLD)
/* polynomial: 0x04C11DB7 */
static
uint32_t
ethcrc
(
const
uint8_t
*
data
,
size_t
length
)
{
uint32_t
crc
=
0xffffffff
;
size_t
i
;
int
j
;
for
(
i
=
0
;
i
<
length
;
i
++
)
{
for
(
j
=
0
;
j
<
8
;
j
++
)
{
if
(((
crc
>>
31
)
^
(
data
[
i
]
>>
j
))
&
0x01
)
{
/* x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1 */
crc
=
(
crc
<<
1
)
^
0x04C11DB7
;
}
else
{
crc
=
crc
<<
1
;
}
}
}
return
~
crc
;
}
#define HASH_BITS 6
/* #bits in hash */
static
void
register_multicast_address
(
struct
rt_stm32_eth
*
stm32_eth
,
const
uint8_t
*
mac
)
{
uint32_t
crc
;
uint8_t
hash
;
/* calculate crc32 value of mac address */
crc
=
ethcrc
(
mac
,
6
);
/* only upper 6 bits (HASH_BITS) are used
* which point to specific bit in he hash registers
*/
hash
=
(
crc
>>
26
)
&
0x3F
;
//rt_kprintf("register_multicast_address crc: %08X hash: %02X\n", crc, hash);
if
(
hash
>
31
)
{
stm32_eth
->
ETH_HashTableHigh
|=
1
<<
(
hash
-
32
);
ETH
->
MACHTHR
=
stm32_eth
->
ETH_HashTableHigh
;
}
else
{
stm32_eth
->
ETH_HashTableLow
|=
1
<<
hash
;
ETH
->
MACHTLR
=
stm32_eth
->
ETH_HashTableLow
;
}
}
#endif
/* (LWIP_IPV4 && LWIP_IGMP) || (LWIP_IPV6 && LWIP_IPV6_MLD) */
#if LWIP_IPV4 && LWIP_IGMP
static
err_t
igmp_mac_filter
(
struct
netif
*
netif
,
const
ip4_addr_t
*
ip4_addr
,
u8_t
action
)
{
uint8_t
mac
[
6
];
const
uint8_t
*
p
=
(
const
uint8_t
*
)
ip4_addr
;
struct
rt_stm32_eth
*
stm32_eth
=
(
struct
rt_stm32_eth
*
)
netif
->
state
;
mac
[
0
]
=
0x01
;
mac
[
1
]
=
0x00
;
mac
[
2
]
=
0x5E
;
mac
[
3
]
=
*
(
p
+
1
)
&
0x7F
;
mac
[
4
]
=
*
(
p
+
2
);
mac
[
5
]
=
*
(
p
+
3
);
register_multicast_address
(
stm32_eth
,
mac
);
if
(
1
)
{
rt_kprintf
(
"%s %s %s "
,
__FUNCTION__
,
(
action
==
NETIF_ADD_MAC_FILTER
)
?
"add"
:
"del"
,
ip4addr_ntoa
(
ip4_addr
));
rt_kprintf
(
"%02X:%02X:%02X:%02X:%02X:%02X
\n
"
,
mac
[
0
],
mac
[
1
],
mac
[
2
],
mac
[
3
],
mac
[
4
],
mac
[
5
]);
}
return
0
;
}
#endif
/* LWIP_IPV4 && LWIP_IGMP */
#if LWIP_IPV6 && LWIP_IPV6_MLD
static
err_t
mld_mac_filter
(
struct
netif
*
netif
,
const
ip6_addr_t
*
ip6_addr
,
u8_t
action
)
{
uint8_t
mac
[
6
];
const
uint8_t
*
p
=
(
const
uint8_t
*
)
&
ip6_addr
->
addr
[
3
];
struct
rt_stm32_eth
*
stm32_eth
=
(
struct
rt_stm32_eth
*
)
netif
->
state
;
mac
[
0
]
=
0x33
;
mac
[
1
]
=
0x33
;
mac
[
2
]
=
*
(
p
+
0
);
mac
[
3
]
=
*
(
p
+
1
);
mac
[
4
]
=
*
(
p
+
2
);
mac
[
5
]
=
*
(
p
+
3
);
register_multicast_address
(
stm32_eth
,
mac
);
if
(
1
)
{
rt_kprintf
(
"%s %s %s "
,
__FUNCTION__
,
(
action
==
NETIF_ADD_MAC_FILTER
)
?
"add"
:
"del"
,
ip6addr_ntoa
(
ip6_addr
));
rt_kprintf
(
"%02X:%02X:%02X:%02X:%02X:%02X
\n
"
,
mac
[
0
],
mac
[
1
],
mac
[
2
],
mac
[
3
],
mac
[
4
],
mac
[
5
]);
}
return
0
;
}
#endif
/* LWIP_IPV6 && LWIP_IPV6_MLD */
/* initialize the interface */
/* initialize the interface */
static
rt_err_t
rt_stm32_eth_init
(
rt_device_t
dev
)
static
rt_err_t
rt_stm32_eth_init
(
rt_device_t
dev
)
{
{
vu32
Value
=
0
;
vu32
Value
=
0
;
struct
rt_stm32_eth
*
stm32_eth
=
(
struct
rt_stm32_eth
*
)
dev
;
/* Reset ETHERNET on AHB Bus */
/* Reset ETHERNET on AHB Bus */
ETH_DeInit
();
ETH_DeInit
();
...
@@ -3112,7 +3223,9 @@ static rt_err_t rt_stm32_eth_init(rt_device_t dev)
...
@@ -3112,7 +3223,9 @@ static rt_err_t rt_stm32_eth_init(rt_device_t dev)
ETH_InitStructure
.
ETH_ReceiveAll
=
ETH_ReceiveAll_Enable
;
ETH_InitStructure
.
ETH_ReceiveAll
=
ETH_ReceiveAll_Enable
;
ETH_InitStructure
.
ETH_BroadcastFramesReception
=
ETH_BroadcastFramesReception_Disable
;
ETH_InitStructure
.
ETH_BroadcastFramesReception
=
ETH_BroadcastFramesReception_Disable
;
ETH_InitStructure
.
ETH_PromiscuousMode
=
ETH_PromiscuousMode_Disable
;
ETH_InitStructure
.
ETH_PromiscuousMode
=
ETH_PromiscuousMode_Disable
;
ETH_InitStructure
.
ETH_MulticastFramesFilter
=
ETH_MulticastFramesFilter_Perfect
;
ETH_InitStructure
.
ETH_MulticastFramesFilter
=
ETH_MulticastFramesFilter_HashTable
;
ETH_InitStructure
.
ETH_HashTableHigh
=
stm32_eth
->
ETH_HashTableHigh
;
ETH_InitStructure
.
ETH_HashTableLow
=
stm32_eth
->
ETH_HashTableLow
;
ETH_InitStructure
.
ETH_UnicastFramesFilter
=
ETH_UnicastFramesFilter_Perfect
;
ETH_InitStructure
.
ETH_UnicastFramesFilter
=
ETH_UnicastFramesFilter_Perfect
;
#if CHECKSUM_BY_HARDWARE
#if CHECKSUM_BY_HARDWARE
ETH_InitStructure
.
ETH_ChecksumOffload
=
ETH_ChecksumOffload_Enable
;
ETH_InitStructure
.
ETH_ChecksumOffload
=
ETH_ChecksumOffload_Enable
;
...
@@ -3153,6 +3266,14 @@ static rt_err_t rt_stm32_eth_init(rt_device_t dev)
...
@@ -3153,6 +3266,14 @@ static rt_err_t rt_stm32_eth_init(rt_device_t dev)
/* Enable MAC and DMA transmission and reception */
/* Enable MAC and DMA transmission and reception */
ETH_Start
();
ETH_Start
();
#if LWIP_IPV4 && LWIP_IGMP
netif_set_igmp_mac_filter
(
stm32_eth
->
parent
.
netif
,
igmp_mac_filter
);
#endif
/* LWIP_IPV4 && LWIP_IGMP */
#if LWIP_IPV6 && LWIP_IPV6_MLD
netif_set_mld_mac_filter
(
stm32_eth
->
parent
.
netif
,
mld_mac_filter
);
#endif
/* LWIP_IPV6 && LWIP_IPV6_MLD */
return
RT_EOK
;
return
RT_EOK
;
}
}
...
...
bsp/stm32f40x/drivers/stm32f4xx_eth.c
浏览文件 @
7cd6cec8
...
@@ -3274,6 +3274,9 @@ struct rt_stm32_eth
...
@@ -3274,6 +3274,9 @@ struct rt_stm32_eth
uint32_t
ETH_Speed
;
/*!< @ref ETH_Speed */
uint32_t
ETH_Speed
;
/*!< @ref ETH_Speed */
uint32_t
ETH_Mode
;
/*!< @ref ETH_Duplex_Mode */
uint32_t
ETH_Mode
;
/*!< @ref ETH_Duplex_Mode */
uint32_t
ETH_HashTableHigh
;
uint32_t
ETH_HashTableLow
;
};
};
static
struct
rt_stm32_eth
stm32_eth_device
;
static
struct
rt_stm32_eth
stm32_eth_device
;
static
struct
rt_semaphore
tx_wait
;
static
struct
rt_semaphore
tx_wait
;
...
@@ -3408,6 +3411,113 @@ void ETH_IRQHandler(void)
...
@@ -3408,6 +3411,113 @@ void ETH_IRQHandler(void)
#include <lwip/icmp.h>
#include <lwip/icmp.h>
#include "lwipopts.h"
#include "lwipopts.h"
#if (LWIP_IPV4 && LWIP_IGMP) || (LWIP_IPV6 && LWIP_IPV6_MLD)
/* polynomial: 0x04C11DB7 */
static
uint32_t
ethcrc
(
const
uint8_t
*
data
,
size_t
length
)
{
uint32_t
crc
=
0xffffffff
;
size_t
i
;
int
j
;
for
(
i
=
0
;
i
<
length
;
i
++
)
{
for
(
j
=
0
;
j
<
8
;
j
++
)
{
if
(((
crc
>>
31
)
^
(
data
[
i
]
>>
j
))
&
0x01
)
{
/* x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1 */
crc
=
(
crc
<<
1
)
^
0x04C11DB7
;
}
else
{
crc
=
crc
<<
1
;
}
}
}
return
~
crc
;
}
#define HASH_BITS 6
/* #bits in hash */
static
void
register_multicast_address
(
struct
rt_stm32_eth
*
stm32_eth
,
const
uint8_t
*
mac
)
{
uint32_t
crc
;
uint8_t
hash
;
/* calculate crc32 value of mac address */
crc
=
ethcrc
(
mac
,
6
);
/* only upper 6 bits (HASH_BITS) are used
* which point to specific bit in he hash registers
*/
hash
=
(
crc
>>
26
)
&
0x3F
;
//rt_kprintf("register_multicast_address crc: %08X hash: %02X\n", crc, hash);
if
(
hash
>
31
)
{
stm32_eth
->
ETH_HashTableHigh
|=
1
<<
(
hash
-
32
);
ETH
->
MACHTHR
=
stm32_eth
->
ETH_HashTableHigh
;
}
else
{
stm32_eth
->
ETH_HashTableLow
|=
1
<<
hash
;
ETH
->
MACHTLR
=
stm32_eth
->
ETH_HashTableLow
;
}
}
#endif
/* (LWIP_IPV4 && LWIP_IGMP) || (LWIP_IPV6 && LWIP_IPV6_MLD) */
#if LWIP_IPV4 && LWIP_IGMP
static
err_t
igmp_mac_filter
(
struct
netif
*
netif
,
const
ip4_addr_t
*
ip4_addr
,
u8_t
action
)
{
uint8_t
mac
[
6
];
const
uint8_t
*
p
=
(
const
uint8_t
*
)
ip4_addr
;
struct
rt_stm32_eth
*
stm32_eth
=
(
struct
rt_stm32_eth
*
)
netif
->
state
;
mac
[
0
]
=
0x01
;
mac
[
1
]
=
0x00
;
mac
[
2
]
=
0x5E
;
mac
[
3
]
=
*
(
p
+
1
)
&
0x7F
;
mac
[
4
]
=
*
(
p
+
2
);
mac
[
5
]
=
*
(
p
+
3
);
register_multicast_address
(
stm32_eth
,
mac
);
if
(
1
)
{
rt_kprintf
(
"%s %s %s "
,
__FUNCTION__
,
(
action
==
NETIF_ADD_MAC_FILTER
)
?
"add"
:
"del"
,
ip4addr_ntoa
(
ip4_addr
));
rt_kprintf
(
"%02X:%02X:%02X:%02X:%02X:%02X
\n
"
,
mac
[
0
],
mac
[
1
],
mac
[
2
],
mac
[
3
],
mac
[
4
],
mac
[
5
]);
}
return
0
;
}
#endif
/* LWIP_IPV4 && LWIP_IGMP */
#if LWIP_IPV6 && LWIP_IPV6_MLD
static
err_t
mld_mac_filter
(
struct
netif
*
netif
,
const
ip6_addr_t
*
ip6_addr
,
u8_t
action
)
{
uint8_t
mac
[
6
];
const
uint8_t
*
p
=
(
const
uint8_t
*
)
&
ip6_addr
->
addr
[
3
];
struct
rt_stm32_eth
*
stm32_eth
=
(
struct
rt_stm32_eth
*
)
netif
->
state
;
mac
[
0
]
=
0x33
;
mac
[
1
]
=
0x33
;
mac
[
2
]
=
*
(
p
+
0
);
mac
[
3
]
=
*
(
p
+
1
);
mac
[
4
]
=
*
(
p
+
2
);
mac
[
5
]
=
*
(
p
+
3
);
register_multicast_address
(
stm32_eth
,
mac
);
if
(
1
)
{
rt_kprintf
(
"%s %s %s "
,
__FUNCTION__
,
(
action
==
NETIF_ADD_MAC_FILTER
)
?
"add"
:
"del"
,
ip6addr_ntoa
(
ip6_addr
));
rt_kprintf
(
"%02X:%02X:%02X:%02X:%02X:%02X
\n
"
,
mac
[
0
],
mac
[
1
],
mac
[
2
],
mac
[
3
],
mac
[
4
],
mac
[
5
]);
}
return
0
;
}
#endif
/* LWIP_IPV6 && LWIP_IPV6_MLD */
/* initialize the interface */
/* initialize the interface */
static
rt_err_t
rt_stm32_eth_init
(
rt_device_t
dev
)
static
rt_err_t
rt_stm32_eth_init
(
rt_device_t
dev
)
{
{
...
@@ -3445,7 +3555,9 @@ static rt_err_t rt_stm32_eth_init(rt_device_t dev)
...
@@ -3445,7 +3555,9 @@ static rt_err_t rt_stm32_eth_init(rt_device_t dev)
ETH_InitStructure
.
ETH_ReceiveAll
=
ETH_ReceiveAll_Disable
;
ETH_InitStructure
.
ETH_ReceiveAll
=
ETH_ReceiveAll_Disable
;
ETH_InitStructure
.
ETH_BroadcastFramesReception
=
ETH_BroadcastFramesReception_Enable
;
ETH_InitStructure
.
ETH_BroadcastFramesReception
=
ETH_BroadcastFramesReception_Enable
;
ETH_InitStructure
.
ETH_PromiscuousMode
=
ETH_PromiscuousMode_Disable
;
ETH_InitStructure
.
ETH_PromiscuousMode
=
ETH_PromiscuousMode_Disable
;
ETH_InitStructure
.
ETH_MulticastFramesFilter
=
ETH_MulticastFramesFilter_Perfect
;
ETH_InitStructure
.
ETH_MulticastFramesFilter
=
ETH_MulticastFramesFilter_HashTable
;
ETH_InitStructure
.
ETH_HashTableHigh
=
stm32_eth
->
ETH_HashTableHigh
;
ETH_InitStructure
.
ETH_HashTableLow
=
stm32_eth
->
ETH_HashTableLow
;
ETH_InitStructure
.
ETH_UnicastFramesFilter
=
ETH_UnicastFramesFilter_Perfect
;
ETH_InitStructure
.
ETH_UnicastFramesFilter
=
ETH_UnicastFramesFilter_Perfect
;
#ifdef CHECKSUM_BY_HARDWARE
#ifdef CHECKSUM_BY_HARDWARE
ETH_InitStructure
.
ETH_ChecksumOffload
=
ETH_ChecksumOffload_Enable
;
ETH_InitStructure
.
ETH_ChecksumOffload
=
ETH_ChecksumOffload_Enable
;
...
@@ -3486,6 +3598,14 @@ static rt_err_t rt_stm32_eth_init(rt_device_t dev)
...
@@ -3486,6 +3598,14 @@ static rt_err_t rt_stm32_eth_init(rt_device_t dev)
/* Enable MAC and DMA transmission and reception */
/* Enable MAC and DMA transmission and reception */
ETH_Start
();
ETH_Start
();
#if LWIP_IPV4 && LWIP_IGMP
netif_set_igmp_mac_filter
(
stm32_eth
->
parent
.
netif
,
igmp_mac_filter
);
#endif
/* LWIP_IPV4 && LWIP_IGMP */
#if LWIP_IPV6 && LWIP_IPV6_MLD
netif_set_mld_mac_filter
(
stm32_eth
->
parent
.
netif
,
mld_mac_filter
);
#endif
/* LWIP_IPV6 && LWIP_IPV6_MLD */
return
RT_EOK
;
return
RT_EOK
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录