Merge branch 'feature/specify_includes_belonging_esp32' into 'master'

move esp32 chip specific includes to esp32/xxx.h See merge request idf/esp-idf!4534
2019-03-21 18:34:08 +08:00
parent 57e1b5dad8 956c25dedd
commit 106dc05903
44 changed files with 403 additions and 397 deletions
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -152,7 +152,7 @@ INPUT = \
    ../../components/heap/include/esp_heap_caps_init.h \
    ../../components/heap/include/multi_heap.h \
    ## Himem
-    ../../components/esp32/include/esp_himem.h \
+    ../../components/esp32/include/esp32/himem.h \
    ## Interrupt Allocation
    ../../components/esp32/include/esp_intr_alloc.h \
    ## Watchdogs
--- a/docs/en/api-reference/system/himem.rst
+++ b/docs/en/api-reference/system/himem.rst
@@ -30,4 +30,4 @@ An example doing a simple memory test of the high memory range is available in e
 API Reference
 -------------

-.. include:: /_build/inc/esp_himem.inc
+.. include:: /_build/inc/himem.inc