mirror
/
micropython
kopia lustrzana https://github.com/micropython/micropython
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

stm32/machine_i2s: Allow I2S.deinit to be called multiple times. 

In particular, it is called by the constructor if the instance already
exists.  So if the previous instance was deinit'd then it will be deinit'd
a second time.

Signed-off-by: Damien George <damien@micropython.org>
pull/8457/head
Damien George 2022-03-25 14:29:48 +11:00
rodzic c90dfba04c
commit 2a91c8a888
1 zmienionych plików z 16 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

30
ports/stm32/machine_i2s.c
Wyświetl plik

@ -887,25 +887,27 @@ STATIC mp_obj_t machine_i2s_init(size_t n_pos_args, const mp_obj_t *pos_args, mp
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2s_init_obj, 1, machine_i2s_init);
STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
dma_deinit(self->dma_descr_tx);
dma_deinit(self->dma_descr_rx);
HAL_I2S_DeInit(&self->hi2s);
if (self->ring_buffer_storage != NULL) {
dma_deinit(self->dma_descr_tx);
dma_deinit(self->dma_descr_rx);
HAL_I2S_DeInit(&self->hi2s);
if (self->hi2s.Instance == I2S1) {
__SPI1_FORCE_RESET();
__SPI1_RELEASE_RESET();
__SPI1_CLK_DISABLE();
} else if (self->hi2s.Instance == I2S2) {
__SPI2_FORCE_RESET();
__SPI2_RELEASE_RESET();
__SPI2_CLK_DISABLE();
if (self->hi2s.Instance == I2S1) {
__SPI1_FORCE_RESET();
__SPI1_RELEASE_RESET();
__SPI1_CLK_DISABLE();
} else if (self->hi2s.Instance == I2S2) {
__SPI2_FORCE_RESET();
__SPI2_RELEASE_RESET();
__SPI2_CLK_DISABLE();
}
m_free(self->ring_buffer_storage);
self->ring_buffer_storage = NULL;
}
m_free(self->ring_buffer_storage);
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_i2s_deinit_obj, machine_i2s_deinit);