Skip to content

Commit 69a76c5

Browse files
committed
refactor(hal_dma): move bitscrambler from hal component
because bitscrambler can't live without DMA, it's highly binded with the GDMA peripheral.
1 parent 88c6d19 commit 69a76c5

File tree

37 files changed

+30
-79
lines changed

37 files changed

+30
-79
lines changed

components/esp_driver_bitscrambler/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ if(CONFIG_SOC_BITSCRAMBLER_SUPPORTED)
1010
endif()
1111

1212
idf_component_register(SRCS ${srcs}
13+
REQUIRES "esp_hal_dma"
1314
PRIV_REQUIRES "esp_mm"
1415
INCLUDE_DIRS "include"
1516
LDFRAGMENTS "linker.lf")

components/esp_driver_bitscrambler/include/driver/bitscrambler.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
#include "esp_err.h"
1010
#include "soc/soc_caps.h"
1111
#include "hal/bitscrambler_types.h"
12-
#if SOC_BITSCRAMBLER_SUPPORTED
13-
#include "soc/bitscrambler_peri_select.h"
14-
#endif
1512

1613
#ifdef __cplusplus
1714
extern "C" {

components/esp_driver_bitscrambler/src/bitscrambler_esp32c5.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
6-
#include "soc/gdma_channel.h"
6+
#include "hal/gdma_channel.h"
77
#include "bitscrambler_soc_specific.h"
88

9-
// Note: these are indexed by the values of the SOC_BITSCRAMBLER_ATTACH_ defines
10-
// in soc/bitscrambler_peri_select.h
9+
// Note: these are indexed by the values of the SOC_BITSCRAMBLER_ATTACH_ defines in bitscrambler_peri_select.h
1110
// This map is used by the bitscrambler loopback driver only.
1211

1312
const bitscrambler_periph_desc_t g_bitscrambler_periph_desc[] = {

components/esp_driver_bitscrambler/src/bitscrambler_esp32p4.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
6-
#include "soc/gdma_channel.h"
6+
#include "hal/gdma_channel.h"
77
#include "bitscrambler_soc_specific.h"
88

9-
// Note: these are indexed by the values of the SOC_BITSCRAMBLER_ATTACH_ defines
10-
// in soc/bitscrambler_peri_select.h
9+
// Note: these are indexed by the values of the SOC_BITSCRAMBLER_ATTACH_ defines in bitscrambler_peri_select.h
1110
// This map is used by the bitscrambler loopback driver only.
1211

1312
const bitscrambler_periph_desc_t g_bitscrambler_periph_desc[] = {

components/esp_driver_bitscrambler/src/bitscrambler_soc_specific.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#pragma once
77

88
#include "esp_private/gdma.h"
9-
#include "soc/bitscrambler_peri_select.h"
9+
#include "hal/bitscrambler_peri_select.h"
1010

1111
#ifdef __cplusplus
1212
extern "C" {

components/esp_driver_bitscrambler/test_apps/.build-test-rules.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ components/esp_driver_bitscrambler/test_apps/bitscrambler:
33
- if: SOC_BITSCRAMBLER_SUPPORTED != 1
44
depends_components:
55
- esp_driver_bitscrambler
6+
- esp_hal_dma

components/esp_driver_parlio/src/parlio_priv.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "freertos/queue.h"
2828
#include "freertos/idf_additions.h"
2929
#include "soc/soc_caps.h"
30-
#include "soc/gdma_channel.h"
3130
#include "soc/parlio_periph.h"
3231
#include "hal/parlio_types.h"
3332
#include "hal/parlio_hal.h"

components/esp_driver_rmt/src/rmt_private.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "esp_check.h"
2727
#include "esp_err.h"
2828
#include "soc/soc_caps.h"
29-
#include "soc/gdma_channel.h"
3029
#include "soc/rmt_periph.h"
3130
#include "hal/rmt_types.h"
3231
#include "hal/rmt_hal.h"
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)