From 385366128f067bc0315a108bb046075f5d7366bf Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 27 Jun 2023 09:59:02 -0500 Subject: [PATCH] Don't use "cookie" variable/function name --- ports/raspberrypi/audio_dma.c | 4 ++-- ports/raspberrypi/audio_dma.h | 2 +- ports/raspberrypi/supervisor/internal_flash.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/raspberrypi/audio_dma.c b/ports/raspberrypi/audio_dma.c index 3b7ef5ec44..b5bd8c069c 100644 --- a/ports/raspberrypi/audio_dma.c +++ b/ports/raspberrypi/audio_dma.c @@ -400,10 +400,10 @@ uint32_t audio_dma_pause_all(void) { return result; } -void audio_dma_unpause_cookie(uint32_t cookie) { +void audio_dma_unpause_mask(uint32_t channel_mask) { for (size_t channel = 0; channel < NUM_DMA_CHANNELS; channel++) { audio_dma_t *dma = MP_STATE_PORT(playing_audio)[channel]; - if (dma != NULL && (cookie & (1 << channel))) { + if (dma != NULL && (channel_mask & (1 << channel))) { audio_dma_resume(dma); } } diff --git a/ports/raspberrypi/audio_dma.h b/ports/raspberrypi/audio_dma.h index 91d692f8ac..e84a79df26 100644 --- a/ports/raspberrypi/audio_dma.h +++ b/ports/raspberrypi/audio_dma.h @@ -90,6 +90,6 @@ void audio_dma_resume(audio_dma_t *dma); bool audio_dma_get_paused(audio_dma_t *dma); uint32_t audio_dma_pause_all(void); -void audio_dma_unpause_cookie(uint32_t cookie); +void audio_dma_unpause_mask(uint32_t channel_mask); #endif // MICROPY_INCLUDED_RASPBERRYPI_AUDIO_DMA_OUT_H diff --git a/ports/raspberrypi/supervisor/internal_flash.c b/ports/raspberrypi/supervisor/internal_flash.c index b0b89d38f1..42223b29e3 100644 --- a/ports/raspberrypi/supervisor/internal_flash.c +++ b/ports/raspberrypi/supervisor/internal_flash.c @@ -99,11 +99,11 @@ void port_internal_flash_flush(void) { // Make sure we don't have an interrupt while we do flash operations. common_hal_mcu_disable_interrupts(); // and audio DMA must be paused as well - uint32_t cookie = audio_dma_pause_all(); + uint32_t channel_mask = audio_dma_pause_all(); flash_range_erase(CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + _cache_lba, SECTOR_SIZE); flash_range_program(CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + _cache_lba, _cache, SECTOR_SIZE); _cache_lba = NO_CACHE; - audio_dma_unpause_cookie(cookie); + audio_dma_unpause_mask(channel_mask); common_hal_mcu_enable_interrupts(); }