3d-print/anadyr-marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Safe changes from HAL cleanup

Browse Source
This commit is contained in:
Scott Lahteine
2019-08-28 21:21:38 -05:00
parent 95963121b0
commit 1d8ad7cf71
8 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
View File

@@ -160,9 +160,6 @@ uint8_t HAL_get_reset_source(void);
void _delay_ms(const int delay);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
/*
extern "C" {
int freeMemory(void);
@@ -172,14 +169,17 @@ extern "C" {
extern "C" char* _sbrk(int incr);
/*
static int freeMemory() {
int freeMemory() {
volatile int top;
top = (int)((char*)&top - reinterpret_cast<char*>(_sbrk(0)));
return top;
}
*/
static int freeMemory() {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
static inline int freeMemory(void) {
volatile char top;
return &top - reinterpret_cast<char*>(_sbrk(0));
}