Jelajahi Sumber

Merge branch 'bugfix/periph-warnings' into 'master'

peripherals: minor warning fixes

See merge request espressif/esp-idf!18312
Anton Maklakov 3 tahun lalu
induk
melakukan
d1aa08eefb

+ 4 - 4
components/driver/test/test_spi_param.c

@@ -527,10 +527,10 @@ TEST_SPI_LOCAL(MODE, mode_pgroup)
 TEST_CASE("Slave receive correct data", "[spi]")
 {
    // Initialize device handle and spi bus
-    uint32_t master_seed_send = MASTER_DATA_RAND_SEED;
-    uint32_t slave_seed_send = SLAVE_DATA_RAND_SEED;
-    uint32_t master_seed_cmp = slave_seed_send;
-    uint32_t slave_seed_cmp = master_seed_send;
+    unsigned int master_seed_send = MASTER_DATA_RAND_SEED;
+    unsigned int slave_seed_send = SLAVE_DATA_RAND_SEED;
+    unsigned int master_seed_cmp = slave_seed_send;
+    unsigned int slave_seed_cmp = master_seed_send;
 
     const int buf_size = 20;
 

+ 2 - 1
components/hal/sdio_slave_hal.c

@@ -422,7 +422,8 @@ static esp_err_t send_get_inflight_desc(sdio_slave_context_t *hal, void **out_ar
 static esp_err_t send_get_unsent_desc(sdio_slave_context_t *hal, void **out_arg, uint32_t *out_return_cnt)
 {
     esp_err_t ret;
-    sdio_slave_hal_send_desc_t *head, *tail;
+    sdio_slave_hal_send_desc_t *head = NULL;
+    sdio_slave_hal_send_desc_t *tail = NULL;
     ret = sdio_ringbuf_recv(&(hal->send_desc_queue), (uint8_t **) &head, (uint8_t **) &tail, RINGBUF_GET_ONE);
 
     if (ret == ESP_OK) {