Merge branch 'feature/sdio_slave_support_hal_new' into 'master'

sdio_slave: support HAL layer See merge request espressif/esp-idf!6314
2019-12-16 07:22:04 +08:00
parent 433d046a2a 0ec08ca21b
commit 1843630ef3
9 changed files with 1997 additions and 809 deletions
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -184,6 +184,7 @@ INPUT = \
    ../../components/driver/include/driver/sdspi_host.h \
    ## SDIO slave
    ../../components/driver/include/driver/sdio_slave.h \
+    ../../components/soc/include/hal/sdio_slave_types.h \
    ## Non-Volatile Storage
    ../../components/nvs_flash/include/nvs.h \
    ../../components/nvs_flash/include/nvs_flash.h \
--- a/docs/en/api-reference/peripherals/sdio_slave.rst
+++ b/docs/en/api-reference/peripherals/sdio_slave.rst
@@ -277,5 +277,6 @@ Slave/master communication: :example:`peripherals/sdio`.
 API Reference
 -------------

+.. include:: /_build/inc/sdio_slave_types.inc
 .. include:: /_build/inc/sdio_slave.inc