Merge remote-tracking branch 'origin/next' into

bsongis/Issue592_sticky_switches

Conflicts:
	radio/src/gui/menu_model.cpp
This commit is contained in:
Bertrand Songis
2014-02-05 08:01:40 +01:00
54 changed files with 32439 additions and 30506 deletions
+3 -5
View File
@@ -4845,8 +4845,9 @@ void stack_paint()
p = (unsigned char *) STACKPTR ;
q = &__bss_end ;
p -= 2 ;
while ( p > q )
while ( p > q ) {
*p-- = 0x55 ;
}
}
uint16_t stack_free()
@@ -4854,10 +4855,7 @@ uint16_t stack_free()
unsigned char *p ;
p = &__bss_end + 1 ;
while ( *p == 0x55 )
{
p+= 1 ;
}
while ( *p++ == 0x55 );
return p - &__bss_end ;
}
#endif