Skip to content

Commit f7ffd63

Browse files
authored
Merge pull request #13357 from rajkan01/emac_dir_restructure
Move emac-drivers from features into connectivity directory
2 parents 6bd5271 + 2add706 commit f7ffd63

File tree

139 files changed

+12
-12
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+12
-12
lines changed

.astyleignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
^cmsis
33
^connectivity/libraries/mbed-coap
44
^connectivity/libraries/ppp
5+
^connectivity/drivers/emac
56
^features/cryptocell
67
^features/FEATURE_BLE
78
^features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV
@@ -12,7 +13,6 @@
1213
^features/mbedtls
1314
^features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet
1415
^features/nanostack/targets
15-
^features/netsocket/emac-drivers
1616
^storage/filesystem/fat/ChaN
1717
^storage/filesystem/littlefs/littlefs/
1818
^storage/filesystem/littlefsv2/littlefs/

LICENSE.md

Lines changed: 2 additions & 2 deletions

features/netsocket/emac-drivers/README.md renamed to connectivity/drivers/emac/README.md

Lines changed: 1 addition & 1 deletion

doxyfile_options

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -841,21 +841,21 @@ EXCLUDE_PATTERNS = */tools/* \
841841
*/BUILD/* \
842842
*/rtos/TARGET_CORTEX/rtx* \
843843
*/cmsis/* \
844+
*/connectivity/drivers/emac/* \
844845
*/features/cryptocell/* \
845846
*/features/mbedtls/* \
846847
*/features/unsupported/* \
847848
*/features/lwipstack/* \
848849
*/features/nanostack/sal-stack-nanostack/* \
849850
*/features/nanostack/coap-service/* \
850-
*/features/netsocket/emac-drivers/* \
851851
*/mbed-trace/* \
852852
*/mbed-coap/* \
853853
*/nanostack-libservice/* \
854854
*/mbed-client-randlib/* \
855855
*/nanostack/sal-stack-nanostack-eventloop/* \
856856
*/ble/generic/* \
857857
*/ble/pal/* \
858-
*/components/802.15.4_RF/* \
858+
*/connectivity/drivers/802.15.4_RF/* \
859859
*/components/wifi/* \
860860
*/UNITTESTS/* \
861861
*/connectivity/cellular/framework/AT/* \

doxygen_options.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"EXPAND_AS_DEFINED": "",
1111
"SKIP_FUNCTION_MACROS": "NO",
1212
"STRIP_CODE_COMMENTS": "NO",
13-
"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/*",
13+
"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/*",
1414
"ALPHABETICAL_INDEX": "NO",
1515
"CASE_SENSE_NAMES": "NO",
1616
"DOT_MULTI_TARGETS": "YES",

targets/TARGET_STM/README.md

Lines changed: 1 addition & 1 deletion

targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_conf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
#define ETH_TX_BUF_SIZE ETH_MAX_PACKET_SIZE /* buffer size for transmit */
168168

169169
#ifdef MBED_CONF_STM32_EMAC_ETH_RXBUFNB
170-
/* default value in features/netsocket/emac-drivers/TARGET_STM/mbed_lib.json */
170+
/* default value in connectivity/drivers/emac/TARGET_STM/mbed_lib.json */
171171
#define ETH_RXBUFNB MBED_CONF_STM32_EMAC_ETH_RXBUFNB /* Rx buffers of size ETH_RX_BUF_SIZE */
172172
#define ETH_TXBUFNB MBED_CONF_STM32_EMAC_ETH_TXBUFNB /* Tx buffers of size ETH_TX_BUF_SIZE */
173173
#else

targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/stm32f4xx_hal_conf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
#define ETH_TX_BUF_SIZE ETH_MAX_PACKET_SIZE /* buffer size for transmit */
201201

202202
#ifdef MBED_CONF_STM32_EMAC_ETH_RXBUFNB
203-
/* default value in features/netsocket/emac-drivers/TARGET_STM/mbed_lib.json */
203+
/* default value in connectivity/drivers/emac/TARGET_STM/mbed_lib.json */
204204
#define ETH_RXBUFNB MBED_CONF_STM32_EMAC_ETH_RXBUFNB /* Rx buffers of size ETH_RX_BUF_SIZE */
205205
#define ETH_TXBUFNB MBED_CONF_STM32_EMAC_ETH_TXBUFNB /* Tx buffers of size ETH_TX_BUF_SIZE */
206206
#else

targets/TARGET_STM/TARGET_STM32F7/STM32Cube_FW/stm32f7xx_hal_conf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
#define ETH_TX_BUF_SIZE ETH_MAX_PACKET_SIZE /* buffer size for transmit */
202202

203203
#ifdef MBED_CONF_STM32_EMAC_ETH_RXBUFNB
204-
/* default value in features/netsocket/emac-drivers/TARGET_STM/mbed_lib.json */
204+
/* default value in connectivity/drivers/emac/TARGET_STM/mbed_lib.json */
205205
#define ETH_RXBUFNB MBED_CONF_STM32_EMAC_ETH_RXBUFNB /* Rx buffers of size ETH_RX_BUF_SIZE */
206206
#define ETH_TXBUFNB MBED_CONF_STM32_EMAC_ETH_TXBUFNB /* Tx buffers of size ETH_TX_BUF_SIZE */
207207
#else

targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/stm32h7xx_hal_conf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216

217217
/* ########################### Ethernet Configuration ######################### */
218218
#ifdef MBED_CONF_STM32_EMAC_ETH_RXBUFNB
219-
/* default value in features/netsocket/emac-drivers/TARGET_STM/mbed_lib.json */
219+
/* default value in connectivity/drivers/emac/TARGET_STM/mbed_lib.json */
220220
#define ETH_TX_DESC_CNT MBED_CONF_STM32_EMAC_ETH_TXBUFNB /* number of Ethernet Tx DMA descriptors */
221221
#define ETH_RX_DESC_CNT MBED_CONF_STM32_EMAC_ETH_RXBUFNB /* number of Ethernet Rx DMA descriptors */
222222
#else

0 commit comments

Comments
 (0)