Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/multi_heap_get_info_typo' into 'master'

Browse source 
Fix multi_heap_get_info alias (from github)

See merge request !1357
This commit is contained in:
Angus Gratton 2017-10-10 13:14:09 +08:00
commit bb8ba76604
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/heap/include/multi_heap.h
View file

@ -134,7 +134,7 @@ size_t multi_heap_free_size(multi_heap_handle_t heap);
/** @brief Return the lifetime minimum free heap size /** @brief Return the lifetime minimum free heap size
* *
* Equivalent to the minimum_free_bytes member returned by multi_get_heap_info(). * Equivalent to the minimum_free_bytes member returned by multi_heap_get_info().
* *
* Returns the lifetime "low water mark" of possible values returned from multi_free_heap_size(), for the specified * Returns the lifetime "low water mark" of possible values returned from multi_free_heap_size(), for the specified
* heap. * heap.
@ -144,7 +144,7 @@ size_t multi_heap_free_size(multi_heap_handle_t heap);
*/ */
size_t multi_heap_minimum_free_size(multi_heap_handle_t heap); size_t multi_heap_minimum_free_size(multi_heap_handle_t heap);
/** @brief Structure to access heap metadata via multi_get_heap_info */ /** @brief Structure to access heap metadata via multi_heap_get_info */
typedef struct { typedef struct {
size_t total_free_bytes; ///< Total free bytes in the heap. Equivalent to multi_free_heap_size(). size_t total_free_bytes; ///< Total free bytes in the heap. Equivalent to multi_free_heap_size().
size_t total_allocated_bytes; ///< Total bytes allocated to data in the heap. size_t total_allocated_bytes; ///< Total bytes allocated to data in the heap.

2
components/heap/multi_heap.c
View file

@ -45,7 +45,7 @@ size_t multi_heap_get_allocated_size(multi_heap_handle_t heap, void *p)
multi_heap_handle_t multi_heap_register(void *start, size_t size) multi_heap_handle_t multi_heap_register(void *start, size_t size)
__attribute__((alias("multi_heap_register_impl"))); __attribute__((alias("multi_heap_register_impl")));
void multi_get_heap_info(multi_heap_handle_t heap, multi_heap_info_t *info) void multi_heap_get_info(multi_heap_handle_t heap, multi_heap_info_t *info)
__attribute__((alias("multi_heap_get_info_impl"))); __attribute__((alias("multi_heap_get_info_impl")));
size_t multi_heap_free_size(multi_heap_handle_t heap) size_t multi_heap_free_size(multi_heap_handle_t heap)