esp32/machine_i2s: Code review cleanup.

miketeachman · miketeachman · commit 7ed5b3481811 · 2024-02-26T12:03:44.000-08:00
- remove unneeded blank lines
- remove I2S warning suppressor macro
- change #include to reference new I2S driver

Signed-off-by: Mike Teachman &lt;mike.teachman@gmail.com&gt;
diff --git a/extmod/machine_i2s.c b/extmod/machine_i2s.c
@@ -600,7 +600,6 @@ STATIC mp_uint_t machine_i2s_stream_write(mp_obj_t self_in, const void *buf_in,
 
         return size;
     } else { // blocking or asyncio mode
-
         mp_buffer_info_t appbuf;
         appbuf.buf = (void *)buf_in;
         appbuf.len = size;
@@ -625,7 +624,6 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
 
         if (flags & MP_STREAM_POLL_RD) {
             if (self->mode != MICROPY_PY_MACHINE_I2S_CONSTANT_RX) {
-
                 *errcode = MP_EPERM;
                 return MP_STREAM_ERROR;
             }
@@ -642,7 +640,6 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
         }
 
         if (flags & MP_STREAM_POLL_WR) {
-
             if (self->mode != MICROPY_PY_MACHINE_I2S_CONSTANT_TX) {
                 *errcode = MP_EPERM;
                 return MP_STREAM_ERROR;
@@ -653,14 +650,12 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
                 ret |= MP_STREAM_POLL_WR;
             }
             #else
-
             if (self->dma_buffer_status == DMA_MEMORY_NOT_FULL) {
                 ret |= MP_STREAM_POLL_WR;
             }
             #endif
         }
     } else {
-
         *errcode = MP_EINVAL;
         ret = MP_STREAM_ERROR;
     }
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
@@ -112,7 +112,6 @@ CONFIG_UART_ISR_IN_IRAM=y
 # IDF 5 deprecated
 CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
-CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
 
 CONFIG_ETH_USE_SPI_ETHERNET=y
 CONFIG_ETH_SPI_ETHERNET_W5500=y
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
@@ -304,7 +304,6 @@ i2s_event_callbacks_t i2s_callbacks_null = {
     .on_send_q_ovf = NULL,
 };
 
-
 STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t *self, mp_arg_val_t *args) {
     // are Pins valid?
     int8_t sck = args[ARG_sck].u_obj == MP_OBJ_NULL ? -1 : machine_pin_get_id(args[ARG_sck].u_obj);
@@ -437,7 +436,6 @@ STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {
     }
 }
 
-
 STATIC void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {
     if (self->io_mode == NON_BLOCKING) {
         // create a queue linking the MicroPython task to a FreeRTOS task
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
@@ -9,7 +9,7 @@
 #include "esp_random.h"
 #include "esp_system.h"
 #include "freertos/FreeRTOS.h"
-#include "driver/i2s.h"
+#include "driver/i2s_std.h"
 #include "esp_wifi_types.h"
 
 #ifndef MICROPY_CONFIG_ROM_LEVEL

Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,6 @@ STATIC mp_uint_t machine_i2s_stream_write(mp_obj_t self_in, const void *buf_in,`
`600`	`600`
`601`	`601`	`return size;`
`602`	`602`	`} else { // blocking or asyncio mode`
`603`		`-`
`604`	`603`	`mp_buffer_info_t appbuf;`
`605`	`604`	`appbuf.buf = (void *)buf_in;`
`606`	`605`	`appbuf.len = size;`
`@@ -625,7 +624,6 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_`
`625`	`624`
`626`	`625`	`if (flags & MP_STREAM_POLL_RD) {`
`627`	`626`	`if (self->mode != MICROPY_PY_MACHINE_I2S_CONSTANT_RX) {`
`628`		`-`
`629`	`627`	`*errcode = MP_EPERM;`
`630`	`628`	`return MP_STREAM_ERROR;`
`631`	`629`	`}`
`@@ -642,7 +640,6 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_`
`642`	`640`	`}`
`643`	`641`
`644`	`642`	`if (flags & MP_STREAM_POLL_WR) {`
`645`		`-`
`646`	`643`	`if (self->mode != MICROPY_PY_MACHINE_I2S_CONSTANT_TX) {`
`647`	`644`	`*errcode = MP_EPERM;`
`648`	`645`	`return MP_STREAM_ERROR;`
`@@ -653,14 +650,12 @@ STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_`
`653`	`650`	`ret \|= MP_STREAM_POLL_WR;`
`654`	`651`	`}`
`655`	`652`	`#else`
`656`		`-`
`657`	`653`	`if (self->dma_buffer_status == DMA_MEMORY_NOT_FULL) {`
`658`	`654`	`ret \|= MP_STREAM_POLL_WR;`
`659`	`655`	`}`
`660`	`656`	`#endif`
`661`	`657`	`}`
`662`	`658`	`} else {`
`663`		`-`
`664`	`659`	`*errcode = MP_EINVAL;`
`665`	`660`	`ret = MP_STREAM_ERROR;`
`666`	`661`	`}`
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,6 @@ i2s_event_callbacks_t i2s_callbacks_null = {`
`304`	`304`	`.on_send_q_ovf = NULL,`
`305`	`305`	`};`
`306`	`306`
`307`		`-`
`308`	`307`	`STATIC void mp_machine_i2s_init_helper(machine_i2s_obj_t self, mp_arg_val_t args) {`
`309`	`308`	`// are Pins valid?`
`310`	`309`	`int8_t sck = args[ARG_sck].u_obj == MP_OBJ_NULL ? -1 : machine_pin_get_id(args[ARG_sck].u_obj);`
`@@ -437,7 +436,6 @@ STATIC void mp_machine_i2s_deinit(machine_i2s_obj_t *self) {`
`437`	`436`	`}`
`438`	`437`	`}`
`439`	`438`
`440`		`-`
`441`	`439`	`STATIC void mp_machine_i2s_irq_update(machine_i2s_obj_t *self) {`
`442`	`440`	`if (self->io_mode == NON_BLOCKING) {`
`443`	`441`	`// create a queue linking the MicroPython task to a FreeRTOS task`