Revert some last changes so that there is no problem with Lua

Conflicts:
	radio/src/Makefile
	radio/src/opentx.cpp
This commit is contained in:
bsongis
2014-09-15 10:05:55 +02:00
parent 47499e9e7d
commit 871e9f0be3
8 changed files with 28 additions and 52 deletions
+8 -6
View File
@@ -46,7 +46,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#include "debug.h"
/*----------------------------------------------------------------------------
* Exported variables
@@ -54,8 +53,10 @@
#undef errno
extern int errno;
extern int _end;
extern int _main_stack_start;
extern int _end;
extern int _estack;
#define RAM_END (unsigned char *)&_estack
/*----------------------------------------------------------------------------
* Exported functions
@@ -67,7 +68,7 @@ extern int _getpid ( void ) ;
unsigned char *heap = (unsigned char *)&_end;
extern caddr_t _sbrk(int nbytes)
{
if (heap + nbytes < (unsigned char *)&_main_stack_start) {
if (heap + nbytes < RAM_END-4096) {
unsigned char *prev_heap = heap;
heap += nbytes;
return (caddr_t) prev_heap;
@@ -141,8 +142,9 @@ extern int _write( int file, char *ptr, int len )
extern void _exit( int status )
{
TRACE( "Exiting with status %d.\n", status ) ;
#if defined(SIMU)
printf( "Exiting with status %d.\n", status ) ;
#endif
for ( ; ; ) ;
}
@@ -98,23 +98,8 @@ LoopFillZerobss:
ldr r3, = _ebss
cmp r2, r3
bcc FillZerobss
/*Paint Main Stack */
ldr r2, = _main_stack_start
PaintMainStack:
movs r3, #0x55555555
str r3, [r2], #4
LoopPaintMainStack:
ldr r3, = _estack
cmp r2, r3
bcc PaintMainStack
/* Call the clock system intitialization function.*/
bl SystemInit
/* Call C++ constructors for static objects */
bl __libc_init_array
/* Call the application's entry point.*/
bl main
bx lr
@@ -34,8 +34,6 @@ ENTRY(Reset_Handler)
/* Highest address of the user mode stack */
_estack = 0x20020000; /* end of 128K SRAM */
_main_stack_size = 0x1000; /*size of main stack*/
_main_stack_start = _estack - _main_stack_size;
/* Generate a link error if heap and stack don't fit into RAM */
_Min_Heap_Size = 0; /* required amount of heap */
@@ -21,8 +21,6 @@ ENTRY(Reset_Handler)
/* Highest address of the user mode stack */
_estack = 0x20020000; /* end of 128K SRAM */
_main_stack_size = 0x1000; /*size of main stack*/
_main_stack_start = _estack - _main_stack_size;
/* Generate a link error if heap and stack don't fit into RAM */
_Min_Heap_Size = 0; /* required amount of heap */