blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 09:39:10 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/fix_the_duplicated_type_name_in_i2s_v5.0' into 'release/v5.0'

Browse Source 
i2s: fix the duplicated type name in i2s (v5.0)

See merge request espressif/esp-idf!19999
This commit is contained in:
morris 2022-09-08 15:11:52 +08:00
commit 43b1c0c875
6 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/driver/i2s/i2s_common.c
View File

@ -242,7 +242,7 @@ static esp_err_t i2s_register_channel(i2s_controller_t *i2s_obj, i2s_dir_t dir,
esp_err_t ret = ESP_OK; esp_err_t ret = ESP_OK;
i2s_chan_handle_t new_chan = (i2s_chan_handle_t)heap_caps_calloc(1, sizeof(struct i2s_channel_t), I2S_MEM_ALLOC_CAPS); i2s_chan_handle_t new_chan = (i2s_chan_handle_t)heap_caps_calloc(1, sizeof(struct i2s_channel_obj_t), I2S_MEM_ALLOC_CAPS);
ESP_RETURN_ON_FALSE(new_chan, ESP_ERR_NO_MEM, TAG, "No memory for new channel"); ESP_RETURN_ON_FALSE(new_chan, ESP_ERR_NO_MEM, TAG, "No memory for new channel");
new_chan->mode = I2S_COMM_MODE_NONE; new_chan->mode = I2S_COMM_MODE_NONE;
new_chan->role = I2S_ROLE_MASTER; // Set default role to master new_chan->role = I2S_ROLE_MASTER; // Set default role to master

2
components/driver/i2s/i2s_private.h
View File

@ -68,7 +68,7 @@ typedef struct {
int mclk; /*!< MCK out pin, shared by tx/rx*/ int mclk; /*!< MCK out pin, shared by tx/rx*/
} i2s_controller_t; } i2s_controller_t;
struct i2s_channel_t { struct i2s_channel_obj_t {
/* Channel basic information */ /* Channel basic information */
i2s_controller_t *controller; /*!< Parent pointer to controller object */ i2s_controller_t *controller; /*!< Parent pointer to controller object */
i2s_comm_mode_t mode; /*!< i2s channel communication mode */ i2s_comm_mode_t mode; /*!< i2s channel communication mode */

2
components/driver/include/driver/i2s_types.h
View File

@ -63,7 +63,7 @@ typedef struct {
*/ */
} i2s_event_data_t; } i2s_event_data_t;
typedef struct i2s_channel_t *i2s_chan_handle_t; /*!< i2s channel handle, the control unit of the i2s driver*/ typedef struct i2s_channel_obj_t *i2s_chan_handle_t; /*!< i2s channel object handle, the control unit of the i2s driver*/
/** /**
* @brief I2S event callback * @brief I2S event callback

3
examples/peripherals/i2s/i2s_basic/i2s_pdm/main/i2s_pdm_rx.c
View File

@ -60,6 +60,9 @@ void i2s_example_pdm_rx_task(void *args)
i2s_chan_handle_t rx_chan = i2s_example_init_pdm_rx(); i2s_chan_handle_t rx_chan = i2s_example_init_pdm_rx();
size_t r_bytes = 0; size_t r_bytes = 0;
/* ATTENTION: The print and delay in the read task only for monitoring the data by human,
* Normally there shouldn't be any delays to ensure a short polling time,
* Otherwise the dma buffer will overflow and lead to the data lost */
while (1) { while (1) {
/* Read i2s data */ /* Read i2s data */
if (i2s_channel_read(rx_chan, r_buf, EXAMPLE_BUFF_SIZE, &r_bytes, 1000) == ESP_OK) { if (i2s_channel_read(rx_chan, r_buf, EXAMPLE_BUFF_SIZE, &r_bytes, 1000) == ESP_OK) {

3
examples/peripherals/i2s/i2s_basic/i2s_std/main/i2s_std_example_main.c
View File

@ -53,6 +53,9 @@ static void i2s_example_read_task(void *args)
uint8_t *r_buf = (uint8_t *)calloc(1, EXAMPLE_BUFF_SIZE); uint8_t *r_buf = (uint8_t *)calloc(1, EXAMPLE_BUFF_SIZE);
assert(r_buf); // Check if r_buf allocation success assert(r_buf); // Check if r_buf allocation success
size_t r_bytes = 0; size_t r_bytes = 0;
/* ATTENTION: The print and delay in the read task only for monitoring the data by human,
* Normally there shouldn't be any delays to ensure a short polling time,
* Otherwise the dma buffer will overflow and lead to the data lost */
while (1) { while (1) {
/* Read i2s data */ /* Read i2s data */
if (i2s_channel_read(rx_chan, r_buf, EXAMPLE_BUFF_SIZE, &r_bytes, 1000) == ESP_OK) { if (i2s_channel_read(rx_chan, r_buf, EXAMPLE_BUFF_SIZE, &r_bytes, 1000) == ESP_OK) {

3
examples/peripherals/i2s/i2s_basic/i2s_tdm/main/i2s_tdm_example_main.c
View File

@ -38,6 +38,9 @@ static void i2s_example_read_task(void *args)
uint8_t *r_buf = (uint8_t *)calloc(1, EXAMPLE_BUFF_SIZE); uint8_t *r_buf = (uint8_t *)calloc(1, EXAMPLE_BUFF_SIZE);
assert(r_buf); // Check if r_buf allocation success assert(r_buf); // Check if r_buf allocation success
size_t r_bytes = 0; size_t r_bytes = 0;
/* ATTENTION: The print and delay in the read task only for monitoring the data by human,
* Normally there shouldn't be any delays to ensure a short polling time,
* Otherwise the dma buffer will overflow and lead to the data lost */
while (1) { while (1) {
/* Read i2s data */ /* Read i2s data */
if (i2s_channel_read(rx_chan, r_buf, EXAMPLE_BUFF_SIZE, &r_bytes, 1000) == ESP_OK) { if (i2s_channel_read(rx_chan, r_buf, EXAMPLE_BUFF_SIZE, &r_bytes, 1000) == ESP_OK) {