Skip to content

Move emac-drivers from features into connectivity directory #13357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .astyleignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
^cmsis
^connectivity/libraries/mbed-coap
^connectivity/libraries/ppp
^connectivity/drivers/emac
^features/cryptocell
^features/FEATURE_BLE
^features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV
Expand All @@ -12,7 +13,6 @@
^features/mbedtls
^features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet
^features/nanostack/targets
^features/netsocket/emac-drivers
^storage/filesystem/fat/ChaN
^storage/filesystem/littlefs/littlefs/
^storage/filesystem/littlefsv2/littlefs/
Expand Down
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ as can be found in: LICENSE-apache-2.0.txt
Folders containing files under different permissive license than Apache 2.0 are listed below. Each folder should contain its own README file with license specified for its files. The original license text is included in those source files.

- [cmsis](./cmsis) - MIT, BSD-3-Clause
- [components/802.15.4_RF/mcr20a-rf-driver](./components/802.15.4_RF/mcr20a-rf-driver) - BSD-3-Clause
- [connectivity/drivers/802.15.4_RF/mcr20a-rf-driver](./connectivity/drivers/802.15.4_RF/mcr20a-rf-driver) - BSD-3-Clause
- [connectivity/drivers/emac](./connectivity/drivers/emac) - BSD-style
- [features/cryptocell/FEATURE_CRYPTOCELL310](./features/cryptocell/FEATURE_CRYPTOCELL310) - ARM Object Code and Header Files License
- [features/FEATURE_BOOTLOADER](./features/FEATURE_BOOTLOADER) - PBL
- [features/FEATURE_BLE/targets](./features/FEATURE_BLE/targets) - BSD-style, PBL, MIT-style
Expand All @@ -14,7 +15,6 @@ Folders containing files under different permissive license than Apache 2.0 are
- [features/lorawan](./features/lorawan) - Revised BSD
- [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style
- [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause
- [features/netsocket/emac-drivers](./features/netsocket/emac-drivers) - BSD-style
- [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT
- [features/unsupported](./features/unsupported) - MIT-style, BSD-style
- [storage/blockdevice](./storage/blockdevice) - Apache 2.0, MIT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ to control your device. This must be derived from class `EMAC`.
This API is used by a network stack (or test framework) to control your driver.

The EMAC-derived driver would normally be installed in
features/netsocket/emac-drivers, often in a `TARGET_XXX` directory.
connectivity/drivers/emac, often in a `TARGET_XXX` directory.

Class EMAC is entirely abstract - you need to implement about a dozen calls
to activate the driver, send and receive packets, and perform other control
Expand Down
4 changes: 2 additions & 2 deletions doxyfile_options
Original file line number Diff line number Diff line change
Expand Up @@ -841,21 +841,21 @@ EXCLUDE_PATTERNS = */tools/* \
*/BUILD/* \
*/rtos/TARGET_CORTEX/rtx* \
*/cmsis/* \
*/connectivity/drivers/emac/* \
*/features/cryptocell/* \
*/features/mbedtls/* \
*/features/unsupported/* \
*/features/lwipstack/* \
*/features/nanostack/sal-stack-nanostack/* \
*/features/nanostack/coap-service/* \
*/features/netsocket/emac-drivers/* \
*/mbed-trace/* \
*/mbed-coap/* \
*/nanostack-libservice/* \
*/mbed-client-randlib/* \
*/nanostack/sal-stack-nanostack-eventloop/* \
*/ble/generic/* \
*/ble/pal/* \
*/components/802.15.4_RF/* \
*/connectivity/drivers/802.15.4_RF/* \
*/components/wifi/* \
*/UNITTESTS/* \
*/connectivity/cellular/framework/AT/* \
Expand Down
2 changes: 1 addition & 1 deletion doxygen_options.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"EXPAND_AS_DEFINED": "",
"SKIP_FUNCTION_MACROS": "NO",
"STRIP_CODE_COMMENTS": "NO",
"EXCLUDE_PATTERNS": "*/tools/* */targets/* */features/mbedtls/* */features/unsupported/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/lwipstack/* */nanostack/sal-stack-nanostack/* */nanostack/coap-service/* */ble/generic/* */ble/pal/* */mbed-trace/* */mbed-coap/* */nanostack-libservice/* */mbed-client-randlib/* */nanostack/sal-stack-nanostack-eventloop/* */components/802.15.4_RF/* */components/wifi/* */features/nfc/stack/* */UNITTESTS/* */features/cryptocell/*",
"EXCLUDE_PATTERNS": "*/tools/* */targets/* */features/mbedtls/* */features/unsupported/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/lwipstack/* */nanostack/sal-stack-nanostack/* */nanostack/coap-service/* */ble/generic/* */ble/pal/* */mbed-trace/* */mbed-coap/* */nanostack-libservice/* */mbed-client-randlib/* */nanostack/sal-stack-nanostack-eventloop/* */connectivity/drivers/802.15.4_RF/* */components/wifi/* */features/nfc/stack/* */UNITTESTS/* */features/cryptocell/*",
"ALPHABETICAL_INDEX": "NO",
"CASE_SENSE_NAMES": "NO",
"DOT_MULTI_TARGETS": "YES",
Expand Down
2 changes: 1 addition & 1 deletion targets/TARGET_STM/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ Depending on your PHY, you will have to customize several configuration values:
- Duplex mask information in the PHY status register

Check the default values in:
https://github.com/ARMmbed/mbed-os/blob/master/features/netsocket/emac-drivers/TARGET_STM/mbed_lib.json
https://github.com/ARMmbed/mbed-os/blob/master/connectivity/drivers/emac/TARGET_STM/mbed_lib.json

Option is also to define your own `HAL_ETH_MspInit` function,
you then have to add **USE_USER_DEFINED_HAL_ETH_MSPINIT** macro.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
#define ETH_TX_BUF_SIZE ETH_MAX_PACKET_SIZE /* buffer size for transmit */

#ifdef MBED_CONF_STM32_EMAC_ETH_RXBUFNB
/* default value in features/netsocket/emac-drivers/TARGET_STM/mbed_lib.json */
/* default value in connectivity/drivers/emac/TARGET_STM/mbed_lib.json */
#define ETH_RXBUFNB MBED_CONF_STM32_EMAC_ETH_RXBUFNB /* Rx buffers of size ETH_RX_BUF_SIZE */
#define ETH_TXBUFNB MBED_CONF_STM32_EMAC_ETH_TXBUFNB /* Tx buffers of size ETH_TX_BUF_SIZE */
#else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
#define ETH_TX_BUF_SIZE ETH_MAX_PACKET_SIZE /* buffer size for transmit */

#ifdef MBED_CONF_STM32_EMAC_ETH_RXBUFNB
/* default value in features/netsocket/emac-drivers/TARGET_STM/mbed_lib.json */
/* default value in connectivity/drivers/emac/TARGET_STM/mbed_lib.json */
#define ETH_RXBUFNB MBED_CONF_STM32_EMAC_ETH_RXBUFNB /* Rx buffers of size ETH_RX_BUF_SIZE */
#define ETH_TXBUFNB MBED_CONF_STM32_EMAC_ETH_TXBUFNB /* Tx buffers of size ETH_TX_BUF_SIZE */
#else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
#define ETH_TX_BUF_SIZE ETH_MAX_PACKET_SIZE /* buffer size for transmit */

#ifdef MBED_CONF_STM32_EMAC_ETH_RXBUFNB
/* default value in features/netsocket/emac-drivers/TARGET_STM/mbed_lib.json */
/* default value in connectivity/drivers/emac/TARGET_STM/mbed_lib.json */
#define ETH_RXBUFNB MBED_CONF_STM32_EMAC_ETH_RXBUFNB /* Rx buffers of size ETH_RX_BUF_SIZE */
#define ETH_TXBUFNB MBED_CONF_STM32_EMAC_ETH_TXBUFNB /* Tx buffers of size ETH_TX_BUF_SIZE */
#else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@

/* ########################### Ethernet Configuration ######################### */
#ifdef MBED_CONF_STM32_EMAC_ETH_RXBUFNB
/* default value in features/netsocket/emac-drivers/TARGET_STM/mbed_lib.json */
/* default value in connectivity/drivers/emac/TARGET_STM/mbed_lib.json */
#define ETH_TX_DESC_CNT MBED_CONF_STM32_EMAC_ETH_TXBUFNB /* number of Ethernet Tx DMA descriptors */
#define ETH_RX_DESC_CNT MBED_CONF_STM32_EMAC_ETH_RXBUFNB /* number of Ethernet Rx DMA descriptors */
#else
Expand Down