diff --git a/.astyleignore b/.astyleignore index 6c78beb..9fdbee2 100644 --- a/.astyleignore +++ b/.astyleignore @@ -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 @@ -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/ diff --git a/LICENSE.md b/LICENSE.md index 9f8a85f..32f4705 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -4,7 +4,8 @@ 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 @@ -14,7 +15,6 @@ - [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 diff --git a/connectivity/drivers/emac/README.md b/connectivity/drivers/emac/README.md index fc3361a..f83a3f0 100644 --- a/connectivity/drivers/emac/README.md +++ b/connectivity/drivers/emac/README.md @@ -32,7 +32,7 @@ This API is used by a network stack (or test framework) to control your driver. The EMAC-derived driver would normally be installed in -connectivity/drivers/emac/targets, 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 diff --git a/doxyfile_options b/doxyfile_options index 3a720f8..3ae390d 100644 --- a/doxyfile_options +++ b/doxyfile_options @@ -841,13 +841,13 @@ */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/* \ @@ -855,7 +855,7 @@ */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/* \ diff --git a/doxygen_options.json b/doxygen_options.json index 0c7d39c..7f6c17f 100644 --- a/doxygen_options.json +++ b/doxygen_options.json @@ -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", diff --git a/targets/TARGET_STM/README.md b/targets/TARGET_STM/README.md index e718462..c9a5a50 100644 --- a/targets/TARGET_STM/README.md +++ b/targets/TARGET_STM/README.md @@ -292,7 +292,7 @@ - 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. diff --git a/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_conf.h b/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_conf.h index dddd415..a25bb21 100644 --- a/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_conf.h +++ b/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_conf.h @@ -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 diff --git a/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/stm32f4xx_hal_conf.h b/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/stm32f4xx_hal_conf.h index 200cd5e..2179457 100644 --- a/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/stm32f4xx_hal_conf.h +++ b/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/stm32f4xx_hal_conf.h @@ -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 diff --git a/targets/TARGET_STM/TARGET_STM32F7/STM32Cube_FW/stm32f7xx_hal_conf.h b/targets/TARGET_STM/TARGET_STM32F7/STM32Cube_FW/stm32f7xx_hal_conf.h index 7d20bb8..e8cdd51 100644 --- a/targets/TARGET_STM/TARGET_STM32F7/STM32Cube_FW/stm32f7xx_hal_conf.h +++ b/targets/TARGET_STM/TARGET_STM32F7/STM32Cube_FW/stm32f7xx_hal_conf.h @@ -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 diff --git a/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/stm32h7xx_hal_conf.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/stm32h7xx_hal_conf.h index 6b40f99..249046c 100644 --- a/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/stm32h7xx_hal_conf.h +++ b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/stm32h7xx_hal_conf.h @@ -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