Merge pull request #4335 from tyomitch/main

[nrf] No need to store `buffer_length` as part of `audiopwmio_pwmaudioout_obj_t`
adafruit · Mar 5, 2021 · d2056a4 · d2056a4
2 parents bed96a9 + e0b96c0
commit d2056a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/ports/nrf/common-hal/audiopwmio/PWMAudioOut.c b/ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
@@ -259,10 +259,10 @@ void common_hal_audiopwmio_pwmaudioout_play(audiopwmio_pwmaudioout_obj_t* self,
     if (max_buffer_length > UINT16_MAX) {
         mp_raise_ValueError_varg(translate("Buffer length %d too big. It must be less than %d"), max_buffer_length, UINT16_MAX);
     }
-    self->buffer_length = (uint16_t)max_buffer_length;
-    self->buffers[0] = m_malloc(self->buffer_length * 2 * sizeof(uint16_t), false);
+    uint16_t buffer_length = (uint16_t)max_buffer_length;
+    self->buffers[0] = m_malloc(buffer_length * 2 * sizeof(uint16_t), false);
     if (!self->single_buffer)
-        self->buffers[1] = m_malloc(self->buffer_length * 2 * sizeof(uint16_t), false);
+        self->buffers[1] = m_malloc(buffer_length * 2 * sizeof(uint16_t), false);
 
 
     uint32_t top;

diff --git a/ports/nrf/common-hal/audiopwmio/PWMAudioOut.h b/ports/nrf/common-hal/audiopwmio/PWMAudioOut.h
@@ -35,7 +35,6 @@ typedef struct {
     NRF_PWM_Type *pwm;
     uint16_t *buffers[2];
 
-    uint16_t buffer_length;
     uint16_t quiescent_value;
     uint16_t scale;