mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-06-06 12:29:03 -04:00
Update to use the latest Yagarto and change the C handler part of the interrupt routines to use the noinline attribute.
This commit is contained in:
parent
9a76bc39cb
commit
6bdf14c33f
|
@ -105,7 +105,8 @@ THUMB_SOURCE= \
|
||||||
$(RTOS_SOURCE_DIR)/tasks.c \
|
$(RTOS_SOURCE_DIR)/tasks.c \
|
||||||
$(RTOS_SOURCE_DIR)/portable/GCC/ARM7_AT91SAM7S/port.c \
|
$(RTOS_SOURCE_DIR)/portable/GCC/ARM7_AT91SAM7S/port.c \
|
||||||
$(RTOS_SOURCE_DIR)/portable/MemMang/heap_2.c \
|
$(RTOS_SOURCE_DIR)/portable/MemMang/heap_2.c \
|
||||||
./USB/USBSample.c
|
./USB/USBSample.c \
|
||||||
|
syscalls.c
|
||||||
|
|
||||||
ARM_SOURCE= \
|
ARM_SOURCE= \
|
||||||
$(RTOS_SOURCE_DIR)/portable/GCC/ARM7_AT91SAM7S/portISR.c \
|
$(RTOS_SOURCE_DIR)/portable/GCC/ARM7_AT91SAM7S/portISR.c \
|
||||||
|
|
|
@ -83,7 +83,7 @@ void vUSB_ISR_Wrapper( void ) __attribute__((naked));
|
||||||
* Actual ISR handler. This must be separate from the entry point as the stack
|
* Actual ISR handler. This must be separate from the entry point as the stack
|
||||||
* is used.
|
* is used.
|
||||||
*/
|
*/
|
||||||
void vUSB_ISR_Handler( void );
|
void vUSB_ISR_Handler( void ) __attribute__((noinline));
|
||||||
|
|
||||||
/*-----------------------------------------------------------*/
|
/*-----------------------------------------------------------*/
|
||||||
|
|
||||||
|
@ -182,7 +182,7 @@ void vUSB_ISR_Wrapper( void )
|
||||||
|
|
||||||
/* Call the handler itself. This must be a separate function as it uses
|
/* Call the handler itself. This must be a separate function as it uses
|
||||||
the stack. */
|
the stack. */
|
||||||
vUSB_ISR_Handler();
|
__asm volatile ("bl vUSB_ISR_Handler");
|
||||||
|
|
||||||
/* Restore the context of the task that is going to
|
/* Restore the context of the task that is going to
|
||||||
execute next. This might not be the same as the originally
|
execute next. This might not be the same as the originally
|
||||||
|
|
|
@ -36,6 +36,12 @@ SECTIONS
|
||||||
*(.bss)
|
*(.bss)
|
||||||
} >ram
|
} >ram
|
||||||
|
|
||||||
|
. = ALIGN(4);
|
||||||
|
.eh_frame :
|
||||||
|
{
|
||||||
|
KEEP (*(.eh_frame))
|
||||||
|
} > ram
|
||||||
|
|
||||||
/* Align here to ensure that the .bss section occupies space up to
|
/* Align here to ensure that the .bss section occupies space up to
|
||||||
_end. Align after .bss to ensure correct alignment even if the
|
_end. Align after .bss to ensure correct alignment even if the
|
||||||
.bss section disappears because there are no input sections. */
|
.bss section disappears because there are no input sections. */
|
||||||
|
|
162
Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/syscalls.c
Normal file
162
Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/syscalls.c
Normal file
|
@ -0,0 +1,162 @@
|
||||||
|
/****************************************************************************
|
||||||
|
* Copyright (c) 2009 by Michael Fischer. All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* 3. Neither the name of the author nor the names of its contributors may
|
||||||
|
* be used to endorse or promote products derived from this software
|
||||||
|
* without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||||
|
* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||||
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||||
|
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||||
|
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||||
|
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||||
|
* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
|
* SUCH DAMAGE.
|
||||||
|
*
|
||||||
|
****************************************************************************
|
||||||
|
* History:
|
||||||
|
*
|
||||||
|
* 28.03.09 mifi First Version, based on the original syscall.c from
|
||||||
|
* newlib version 1.17.0
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
/***************************************************************************/
|
||||||
|
|
||||||
|
int _read_r (struct _reent *r, int file, char * ptr, int len)
|
||||||
|
{
|
||||||
|
r = r;
|
||||||
|
file = file;
|
||||||
|
ptr = ptr;
|
||||||
|
len = len;
|
||||||
|
|
||||||
|
errno = EINVAL;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/***************************************************************************/
|
||||||
|
|
||||||
|
int _lseek_r (struct _reent *r, int file, int ptr, int dir)
|
||||||
|
{
|
||||||
|
r = r;
|
||||||
|
file = file;
|
||||||
|
ptr = ptr;
|
||||||
|
dir = dir;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/***************************************************************************/
|
||||||
|
|
||||||
|
int _write_r (struct _reent *r, int file, char * ptr, int len)
|
||||||
|
{
|
||||||
|
r = r;
|
||||||
|
file = file;
|
||||||
|
ptr = ptr;
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
int index;
|
||||||
|
|
||||||
|
/* For example, output string by UART */
|
||||||
|
for(index=0; index<len; index++)
|
||||||
|
{
|
||||||
|
if (ptr[index] == '\n')
|
||||||
|
{
|
||||||
|
uart_putc('\r');
|
||||||
|
}
|
||||||
|
|
||||||
|
uart_putc(ptr[index]);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return len;
|
||||||
|
}
|
||||||
|
|
||||||
|
/***************************************************************************/
|
||||||
|
|
||||||
|
int _close_r (struct _reent *r, int file)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/***************************************************************************/
|
||||||
|
|
||||||
|
/* Register name faking - works in collusion with the linker. */
|
||||||
|
register char * stack_ptr asm ("sp");
|
||||||
|
|
||||||
|
caddr_t _sbrk_r (struct _reent *r, int incr)
|
||||||
|
{
|
||||||
|
extern char end asm ("end"); /* Defined by the linker. */
|
||||||
|
static char * heap_end;
|
||||||
|
char * prev_heap_end;
|
||||||
|
|
||||||
|
if (heap_end == NULL)
|
||||||
|
heap_end = & end;
|
||||||
|
|
||||||
|
prev_heap_end = heap_end;
|
||||||
|
|
||||||
|
if (heap_end + incr > stack_ptr)
|
||||||
|
{
|
||||||
|
/* Some of the libstdc++-v3 tests rely upon detecting
|
||||||
|
out of memory errors, so do not abort here. */
|
||||||
|
#if 0
|
||||||
|
extern void abort (void);
|
||||||
|
|
||||||
|
_write (1, "_sbrk: Heap and stack collision\n", 32);
|
||||||
|
|
||||||
|
abort ();
|
||||||
|
#else
|
||||||
|
errno = ENOMEM;
|
||||||
|
return (caddr_t) -1;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
heap_end += incr;
|
||||||
|
|
||||||
|
return (caddr_t) prev_heap_end;
|
||||||
|
}
|
||||||
|
|
||||||
|
/***************************************************************************/
|
||||||
|
|
||||||
|
int _fstat_r (struct _reent *r, int file, struct stat * st)
|
||||||
|
{
|
||||||
|
r = r;
|
||||||
|
file = file;
|
||||||
|
|
||||||
|
memset (st, 0, sizeof (* st));
|
||||||
|
st->st_mode = S_IFCHR;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/***************************************************************************/
|
||||||
|
|
||||||
|
int _isatty_r(struct _reent *r, int fd)
|
||||||
|
{
|
||||||
|
r = r;
|
||||||
|
fd = fd;
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*** EOF ***/
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ void vEMACISR_Wrapper( void ) __attribute__((naked));
|
||||||
|
|
||||||
/* Handler called by the ISR wrapper. This must be kept a separate
|
/* Handler called by the ISR wrapper. This must be kept a separate
|
||||||
function to ensure the stack frame is correctly set up. */
|
function to ensure the stack frame is correctly set up. */
|
||||||
void vEMACISR_Handler( void );
|
void vEMACISR_Handler( void ) __attribute__((noinline));
|
||||||
|
|
||||||
static xSemaphoreHandle xEMACSemaphore;
|
static xSemaphoreHandle xEMACSemaphore;
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@ void vEMACISR_Wrapper( void )
|
||||||
|
|
||||||
/* Call the handler task to do the actual work. This must be a separate
|
/* Call the handler task to do the actual work. This must be a separate
|
||||||
function to ensure the stack frame is correctly set up. */
|
function to ensure the stack frame is correctly set up. */
|
||||||
vEMACISR_Handler();
|
__asm volatile ("bl vEMACISR_Handler");
|
||||||
|
|
||||||
/* Restore the context of whichever task is the next to run. */
|
/* Restore the context of whichever task is the next to run. */
|
||||||
portRESTORE_CONTEXT();
|
portRESTORE_CONTEXT();
|
||||||
|
|
Loading…
Reference in a new issue