RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2004-10-21 Ralf Corsepius <ralf_corsepius@rtems.org>

Browse Source 
* start/preload.S, include/bsp.h, vectors/exceptionhandler.c,
	startup/bspstart.c: Misc. adaptations to rtems-4.7.
This commit is contained in:
Ralf Corsepius
2004-10-21 08:17:43 +00:00
parent 24c094c72e
commit f4a59e3376
5 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
View File

@@ -1,3 +1,8 @@
2004-10-21 Ralf Corsepius <ralf_corsepius@rtems.org>
* start/preload.S, include/bsp.h, vectors/exceptionhandler.c,
startup/bspstart.c: Misc. adaptations to rtems-4.7.
2004-10-21 Ralf Corsepius <ralf_corsepius@rtems.org>
* configure: Remove (Bogus).

4
c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
View File

@@ -17,8 +17,8 @@
#include <bspopts.h>
#include <rtems.h>
#include <console.h>
#include <clockdrv.h>
#include <rtems/console.h>
#include <rtems/clockdrv.h>
#include <libcpu/io.h>
#include <bsp/vectors.h>

2
c/src/lib/libbsp/powerpc/mvme5500/start/preload.S
View File

@@ -85,7 +85,7 @@
#endif
#include <rtems/score/cpu.h>
#include <asm.h>
#include <rtems/asm.h>
/* Note that major modifications may be needed
* if DESTINATION_ADDR is not 0

12
c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
View File

@@ -61,8 +61,8 @@
/* there is no public Workspace_Free() variant :-( */
#include <rtems/score/wkspace.h>
rtems_unsigned32
_bsp_sbrk_init(rtems_unsigned32 heap_start, rtems_unsigned32 *heap_size_p);
uint32_t
_bsp_sbrk_init(uint32_t heap_start, uint32_t *heap_size_p);
/* provide access to the command line parameters */
char *BSP_commandline_string = 0;
@@ -134,7 +134,7 @@ static unsigned long
heapStart(void)
{
unsigned long rval;
rval = ((rtems_unsigned32) __rtems_end) +INIT_STACK_SIZE + INTR_STACK_SIZE;
rval = ((uint32_t) __rtems_end) +INIT_STACK_SIZE + INTR_STACK_SIZE;
if (rval & (CPU_ALIGNMENT-1))
rval = (rval + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
return rval;
@@ -189,10 +189,10 @@ extern void bsp_libc_init( void *, unsigned32, int );
void bsp_pretasking_hook(void)
{
rtems_unsigned32 heap_start=heapStart();
rtems_unsigned32 heap_size,heap_sbrk_spared;
uint32_t heap_start=heapStart();
uint32_t heap_size,heap_sbrk_spared;
char *buf;
extern rtems_unsigned32 _bsp_sbrk_init(rtems_unsigned32, rtems_unsigned32*);
extern uint32_t _bsp_sbrk_init(uint32_t, uint32_t*);
heap_size = (BSP_mem_size - heap_start) - BSP_Configuration.work_space_size;

8
c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c
View File

@@ -42,7 +42,7 @@ volatile BSP_ExceptionExtension test;
void
BSP_exceptionHandler(BSP_Exception_frame* excPtr)
{
rtems_unsigned32 note;
uint32_t note;
BSP_ExceptionExtension ext=0;
rtems_id id=0;
int recoverable = 0;
@@ -147,8 +147,6 @@ int quiet=0;
printk(" TEA");
}
if (excPtr->EXC_SRR1 & (SRR1_MCP_EXC)) {
unsigned char c1,c2;
unsigned int l;
unsigned long gerr;
if (!quiet) printk(" MCP\n");
@@ -180,8 +178,8 @@ int quiet=0;
if (id) {
/* if there's a highlevel hook, install it */
if (ext && ext->highlevelHook) {
excPtr->EXC_SRR0 = (rtems_unsigned32)ext->highlevelHook;
excPtr->GPR3 = (rtems_unsigned32)ext;
excPtr->EXC_SRR0 = (uint32_t)ext->highlevelHook;
excPtr->GPR3 = (uint32_t)ext;
return;
}
if (excPtr->EXC_SRR1 & MSR_FP) {