]> granicus.if.org Git - esp-idf/commitdiff
fix(sdio_slave): fix minor issues like return value of send function, output arg...
authormichael <xiaoxufeng@espressif.com>
Fri, 6 Jul 2018 08:02:32 +0000 (16:02 +0800)
committermichael <xiaoxufeng@espressif.com>
Wed, 1 Aug 2018 07:23:23 +0000 (15:23 +0800)
components/driver/include/driver/sdio_slave.h
components/driver/sdio_slave.c

index 66b3bc5e21df06fd012297ddf1e180b737bc33eb..a54b824c99ea3f24ec15ccd2a3d0a14adb8115de 100644 (file)
@@ -197,12 +197,12 @@ uint8_t* sdio_slave_recv_get_buf( sdio_slave_buf_handle_t handle, size_t *len_o)
 esp_err_t sdio_slave_send_queue(uint8_t* addr, size_t len, void* arg, TickType_t wait);
 
 /** Return the ownership of a finished transaction.
- * @param arg_o Argument of the finished transaction.
+ * @param out_arg Argument of the finished transaction. Set to NULL if unused.
  * @param wait Time to wait if there's no finished sending transaction.
  *
  * @return ESP_ERR_TIMEOUT if no transaction finished, or ESP_OK if succeed.
  */
-esp_err_t sdio_slave_send_get_finished(void** arg_o, TickType_t wait);
+esp_err_t sdio_slave_send_get_finished(void** out_arg, TickType_t wait);
 
 /** Start a new sending transfer, and wait for it (blocked) to be finished.
  *
index c58c74bd2b79f8fccceb4a87b53e8b6d3627fe7e..5dd87093703eaa107ba2bf1c0dd3fe75f1b65aca 100644 (file)
@@ -952,9 +952,11 @@ esp_err_t sdio_slave_send_queue(uint8_t* addr, size_t len, void* arg, TickType_t
     return ESP_OK;
 }
 
-esp_err_t sdio_slave_send_get_finished(void** arg, TickType_t wait)
+esp_err_t sdio_slave_send_get_finished(void** out_arg, TickType_t wait)
 {
-    portBASE_TYPE err = xQueueReceive( context.ret_queue, arg, wait );
+    void* arg = NULL;
+    portBASE_TYPE err = xQueueReceive(context.ret_queue, &arg, wait);
+    if (out_arg) *out_arg = arg;
     if ( err != pdTRUE ) return ESP_ERR_TIMEOUT;
     return ESP_OK;
 }