j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #595 from Zaltora/ws2812_init_fix

Browse source 
ws2812 fix possible memory leak
This commit is contained in:
Ruslan V. Uss 2018-04-02 11:20:18 +05:00 committed by GitHub
commit 05af33fe0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
extras/ws2812_i2s/ws2812_i2s.c
View file

@ -117,7 +117,7 @@ static inline void init_descriptors_list(uint8_t *buf, uint32_t total_dma_data_s
} }
} }
void ws2812_i2s_init(uint32_t pixels_number, pixeltype_t type) int ws2812_i2s_init(uint32_t pixels_number, pixeltype_t type)
{ {
dma_buffer_size = pixels_number * type; dma_buffer_size = pixels_number * type;
dma_block_list_size = dma_buffer_size / MAX_DMA_BLOCK_SIZE; dma_block_list_size = dma_buffer_size / MAX_DMA_BLOCK_SIZE;
@ -130,11 +130,24 @@ void ws2812_i2s_init(uint32_t pixels_number, pixeltype_t type)
debug("allocating %d dma blocks\n", dma_block_list_size); debug("allocating %d dma blocks\n", dma_block_list_size);
dma_block_list = (dma_descriptor_t*)malloc( if(!dma_block_list)
dma_block_list_size * sizeof(dma_descriptor_t)); {
dma_block_list = (dma_descriptor_t*)malloc(
dma_block_list_size * sizeof(dma_descriptor_t));
if(!dma_block_list)
{
return -1;
}
}
debug("allocating %d bytes for DMA buffer\n", dma_buffer_size); debug("allocating %d bytes for DMA buffer\n", dma_buffer_size);
dma_buffer = malloc(dma_buffer_size); if(!dma_buffer)
{
dma_buffer = malloc(dma_buffer_size);
if(!dma_buffer)
{
return -1;
}
}
memset(dma_buffer, 0xFA, dma_buffer_size); memset(dma_buffer, 0xFA, dma_buffer_size);
init_descriptors_list(dma_buffer, dma_buffer_size); init_descriptors_list(dma_buffer, dma_buffer_size);
@ -146,6 +159,7 @@ void ws2812_i2s_init(uint32_t pixels_number, pixeltype_t type)
clock_div.bclk_div, clock_div.clkm_div); clock_div.bclk_div, clock_div.clkm_div);
i2s_dma_init(dma_isr_handler, NULL, clock_div, i2s_pins); i2s_dma_init(dma_isr_handler, NULL, clock_div, i2s_pins);
return 0;
} }
const IRAM_DATA int16_t bitpatterns[16] = const IRAM_DATA int16_t bitpatterns[16] =

2
extras/ws2812_i2s/ws2812_i2s.h
View file

@ -53,7 +53,7 @@ typedef enum {
* *
* @param pixels_number Number of pixels in the strip. * @param pixels_number Number of pixels in the strip.
*/ */
void ws2812_i2s_init(uint32_t pixels_number, pixeltype_t type); int ws2812_i2s_init(uint32_t pixels_number, pixeltype_t type);
/** /**
* Update ws2812 pixels. * Update ws2812 pixels.