ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TARGET_STM_EMAC astyle

pull/7351/head
jeromecoutant 2018-06-27 15:00:51 +02:00
parent 057142167b
commit 6391b7f2fa
16 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
features/netsocket/emac-drivers/TARGET_STM_EMAC/TARGET_STM32F2/stm32f2_eth_conf.c
View File

@ -18,8 +18,7 @@
void _eth_config_mac(ETH_HandleTypeDef *heth) void _eth_config_mac(ETH_HandleTypeDef *heth)
{ {
ETH_MACInitTypeDef macconf = ETH_MACInitTypeDef macconf = {
{
.Watchdog = ETH_WATCHDOG_ENABLE, .Watchdog = ETH_WATCHDOG_ENABLE,
.Jabber = ETH_JABBER_ENABLE, .Jabber = ETH_JABBER_ENABLE,
.InterFrameGap = ETH_INTERFRAMEGAP_96BIT, .InterFrameGap = ETH_INTERFRAMEGAP_96BIT,

3
features/netsocket/emac-drivers/TARGET_STM_EMAC/TARGET_STM32F4/TARGET_ARCH_MAX/stm32f4_eth_conf.c
View File

@ -18,8 +18,7 @@
void _eth_config_mac(ETH_HandleTypeDef *heth) void _eth_config_mac(ETH_HandleTypeDef *heth)
{ {
ETH_MACInitTypeDef macconf = ETH_MACInitTypeDef macconf = {
{
.Watchdog = ETH_WATCHDOG_ENABLE, .Watchdog = ETH_WATCHDOG_ENABLE,
.Jabber = ETH_JABBER_ENABLE, .Jabber = ETH_JABBER_ENABLE,
.InterFrameGap = ETH_INTERFRAMEGAP_96BIT, .InterFrameGap = ETH_INTERFRAMEGAP_96BIT,

3
features/netsocket/emac-drivers/TARGET_STM_EMAC/TARGET_STM32F4/TARGET_NUCLEO_F429ZI/stm32f4_eth_conf.c
View File

@ -18,8 +18,7 @@
void _eth_config_mac(ETH_HandleTypeDef *heth) void _eth_config_mac(ETH_HandleTypeDef *heth)
{ {
ETH_MACInitTypeDef macconf = ETH_MACInitTypeDef macconf = {
{
.Watchdog = ETH_WATCHDOG_ENABLE, .Watchdog = ETH_WATCHDOG_ENABLE,
.Jabber = ETH_JABBER_ENABLE, .Jabber = ETH_JABBER_ENABLE,
.InterFrameGap = ETH_INTERFRAMEGAP_96BIT, .InterFrameGap = ETH_INTERFRAMEGAP_96BIT,

3
features/netsocket/emac-drivers/TARGET_STM_EMAC/TARGET_STM32F4/TARGET_NUCLEO_F439ZI/stm32f4_eth_conf.c
View File

@ -18,8 +18,7 @@
void _eth_config_mac(ETH_HandleTypeDef *heth) void _eth_config_mac(ETH_HandleTypeDef *heth)
{ {
ETH_MACInitTypeDef macconf = ETH_MACInitTypeDef macconf = {
{
.Watchdog = ETH_WATCHDOG_ENABLE, .Watchdog = ETH_WATCHDOG_ENABLE,
.Jabber = ETH_JABBER_ENABLE, .Jabber = ETH_JABBER_ENABLE,
.InterFrameGap = ETH_INTERFRAMEGAP_96BIT, .InterFrameGap = ETH_INTERFRAMEGAP_96BIT,

3
features/netsocket/emac-drivers/TARGET_STM_EMAC/TARGET_STM32F7/stm32f7_eth_conf.c
View File

@ -18,8 +18,7 @@
void _eth_config_mac(ETH_HandleTypeDef *heth) void _eth_config_mac(ETH_HandleTypeDef *heth)
{ {
ETH_MACInitTypeDef macconf = ETH_MACInitTypeDef macconf = {
{
.Watchdog = ETH_WATCHDOG_ENABLE, .Watchdog = ETH_WATCHDOG_ENABLE,
.Jabber = ETH_JABBER_ENABLE, .Jabber = ETH_JABBER_ENABLE,
.InterFrameGap = ETH_INTERFRAMEGAP_96BIT, .InterFrameGap = ETH_INTERFRAMEGAP_96BIT,

15
features/netsocket/emac-drivers/TARGET_STM_EMAC/stm32xx_emac.cpp
View File

@ -432,7 +432,8 @@ void STM32_EMAC::disable_interrupts(void)
* @param mac A 6-byte array to write the MAC address * @param mac A 6-byte array to write the MAC address
*/ */
void mbed_mac_address(char *mac) { void mbed_mac_address(char *mac)
{
if (mbed_otp_mac_address(mac)) { if (mbed_otp_mac_address(mac)) {
return; return;
} else { } else {
@ -441,11 +442,13 @@ void mbed_mac_address(char *mac) {
return; return;
} }
__weak uint8_t mbed_otp_mac_address(char *mac) { __weak uint8_t mbed_otp_mac_address(char *mac)
{
return 0; return 0;
} }
void mbed_default_mac_address(char *mac) { void mbed_default_mac_address(char *mac)
{
unsigned char ST_mac_addr[3] = {0x00, 0x80, 0xe1}; // default STMicro mac address unsigned char ST_mac_addr[3] = {0x00, 0x80, 0xe1}; // default STMicro mac address
// Read unic id // Read unic id
@ -560,12 +563,14 @@ void STM32_EMAC::set_memory_manager(EMACMemoryManager &mem_mngr)
memory_manager = &mem_mngr; memory_manager = &mem_mngr;
} }
STM32_EMAC &STM32_EMAC::get_instance() { STM32_EMAC &STM32_EMAC::get_instance()
{
static STM32_EMAC emac; static STM32_EMAC emac;
return emac; return emac;
} }
// Weak so a module can override // Weak so a module can override
MBED_WEAK EMAC &EMAC::get_default_instance() { MBED_WEAK EMAC &EMAC::get_default_instance()
{
return STM32_EMAC::get_instance(); return STM32_EMAC::get_instance();
} }