Просмотр исходного кода

Merge branch 'fix/tinyusb_cdc_remove_logv_assert_mutex_fail' into 'master'

tinyusb: reduce annoying log under verbose level in CDC

See merge request espressif/esp-idf!11934
Michael (XIAO Xufeng) 5 лет назад
Родитель
Сommit
19d92ef6b2
1 измененных файлов с 3 добавлено и 6 удалено
  1. 3 6
      components/tinyusb/additions/src/tusb_cdc_acm.c

+ 3 - 6
components/tinyusb/additions/src/tusb_cdc_acm.c

@@ -248,11 +248,9 @@ static esp_err_t ringbuf_mux_take(esp_tusb_cdcacm_t *acm){
     return ESP_OK;
 }
 
-static esp_err_t ringbuf_mux_give(esp_tusb_cdcacm_t *acm){
-    if(xSemaphoreGive(acm->ringbuf_read_mux) != pdTRUE){
-        ESP_LOGW(TAG, "Can't return the ringbuff mutex: mutex hasn't been taken");
-        return ESP_ERR_INVALID_STATE;
-    }
+static esp_err_t ringbuf_mux_give(esp_tusb_cdcacm_t *acm) {
+    BaseType_t ret = xSemaphoreGive(acm->ringbuf_read_mux);
+    assert(ret == pdTRUE);
     return ESP_OK;
 }
 
@@ -277,7 +275,6 @@ esp_err_t tinyusb_cdcacm_read(tinyusb_cdcacm_itf_t itf, uint8_t *out_buf, size_t
     *rx_data_size = read_sz;
     /* Buffer's data can be wrapped, at that situations we should make another retrievement */
     if (read_from_rx_unread_to_buffer(acm, out_buf+read_sz, out_buf_sz-read_sz, &read_sz) == ESP_OK) {
-        ESP_LOGV(TAG, "Buffer was wrapped, data obtained using two read operations.");
         *rx_data_size += read_sz;
     }