[mynewt-core] branch master updated: hw/drivers/i2s: Fix i2s_nrfx for microphone configuration

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 4ccfaeac6 hw/drivers/i2s: Fix i2s_nrfx for microphone configuration
4ccfaeac6 is described below

commit 4ccfaeac61d9a37efb0841f29e05d99532801c54
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Mon Oct 31 14:31:01 2022 +0100

    hw/drivers/i2s: Fix i2s_nrfx for microphone configuration
    
    If I2S was configured in input mode only sample_count
    that is used to calculate input buffer size passed to
    nrfx_i2s_start was incorrect (0) and nrfx would assert.
    
    For I2S configured in input direction only buffer size
    is taken from buffer capacity and can be updated later
    by driver after DMA finishes.
---
 hw/drivers/i2s/i2s_nrfx/src/i2s_nrfx.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hw/drivers/i2s/i2s_nrfx/src/i2s_nrfx.c b/hw/drivers/i2s/i2s_nrfx/src/i2s_nrfx.c
index 3136aaa9f..1243772cb 100644
--- a/hw/drivers/i2s/i2s_nrfx/src/i2s_nrfx.c
+++ b/hw/drivers/i2s/i2s_nrfx/src/i2s_nrfx.c
@@ -40,6 +40,7 @@ nrfx_add_buffer(struct i2s *i2s, struct i2s_sample_buffer *buffer)
 {
     nrfx_i2s_buffers_t nrfx_buffers = {0};
     nrfx_err_t err;
+    uint16_t buffer_size;
 
     assert(i2s != NULL);
     if (buffer == NULL) {
@@ -48,6 +49,9 @@ nrfx_add_buffer(struct i2s *i2s, struct i2s_sample_buffer *buffer)
 
     if (i2s->direction == I2S_OUT || i2s->direction == I2S_OUT_IN) {
         nrfx_buffers.p_tx_buffer = buffer->sample_data;
+        buffer_size = buffer->sample_count * i2s->sample_size_in_bytes / 4;
+    } else {
+        buffer_size = buffer->capacity * i2s->sample_size_in_bytes / 4;
     }
     if (i2s->direction == I2S_IN || i2s->direction == I2S_OUT_IN) {
         nrfx_buffers.p_rx_buffer = buffer->sample_data;
@@ -60,7 +64,7 @@ nrfx_add_buffer(struct i2s *i2s, struct i2s_sample_buffer *buffer)
     i2s_nrfx.nrfx_queued_count++;
     if (i2s_nrfx.nrfx_queued_count == 1) {
         i2s_driver_state_changed (i2s, I2S_STATE_RUNNING);
-        err = nrfx_i2s_start(&nrfx_buffers, buffer->sample_count * i2s->sample_size_in_bytes / 4, 0);
+        err = nrfx_i2s_start(&nrfx_buffers, buffer_size, 0);
     } else {
         err = nrfx_i2s_next_buffers_set(&nrfx_buffers);
     }