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

2005-01-26 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* irq/irq.c, startup/bspstart.c: Now compiles with gcc 4.x.
This commit is contained in:
Joel Sherrill
2005-01-26 12:27:14 +00:00
parent 9d7259a7cf
commit 234e509f85
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,7 @@
2005-01-26 Joel Sherrill <joel@OARcorp.com>
* irq/irq.c, startup/bspstart.c: Now compiles with gcc 4.x.
2005-01-22 Ralf Corsepius <ralf.corsepius@rtems.org> 2005-01-22 Ralf Corsepius <ralf.corsepius@rtems.org>
* tod/todcfg.c: size_t RTC_Count. * tod/todcfg.c: size_t RTC_Count.

3
c/src/lib/libbsp/powerpc/mvme5500/irq/irq.c
View File

@@ -445,7 +445,8 @@ void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum)
{ {
register unsigned msr; register unsigned msr;
register unsigned new_msr; register unsigned new_msr;
register unsigned mainCause[2], selectCause; unsigned mainCause[2];
register unsigned selectCause;
register unsigned oldMask[2]={0,0}; register unsigned oldMask[2]={0,0};
unsigned i, regNum, irq, bitNum, startIrqNum=0; unsigned i, regNum, irq, bitNum, startIrqNum=0;

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

@@ -339,7 +339,8 @@ void bsp_start( void )
#ifdef SHOW_LCR3_REGISTER #ifdef SHOW_LCR3_REGISTER
unsigned l3cr; unsigned l3cr;
#endif #endif
register unsigned char* intrStack; register uint32_t intrStack;
register uint32_t *intrStackPtr;
unsigned char *work_space_start; unsigned char *work_space_start;
ppc_cpu_id_t myCpu; ppc_cpu_id_t myCpu;
ppc_cpu_revision_t myCpuRevision; ppc_cpu_revision_t myCpuRevision;
@@ -388,15 +389,18 @@ void bsp_start( void )
* This could be done latter (e.g in IRQ_INIT) but it helps to understand * This could be done latter (e.g in IRQ_INIT) but it helps to understand
* some settings below... * some settings below...
*/ */
intrStack = ((unsigned char*) __rtems_end) + INIT_STACK_SIZE + INTR_STACK_SIZE - CPU_MINIMUM_STACK_FRAME_SIZE; intrStack = ((uint32_t) __rtems_end) +
INIT_STACK_SIZE + INTR_STACK_SIZE - CPU_MINIMUM_STACK_FRAME_SIZE;
/* make sure it's properly aligned */ /* make sure it's properly aligned */
(uint32_t)intrStack &= ~(CPU_STACK_ALIGNMENT-1); intrStack &= ~(CPU_STACK_ALIGNMENT-1);
/* tag the bottom (T. Straumann 6/36/2001 <strauman@slac.stanford.edu>) */ /* tag the bottom (T. Straumann 6/36/2001 <strauman@slac.stanford.edu>) */
*((uint32_t *)intrStack) = 0; intrStackPtr = (uint32_t*) intrStack;
*intrStackPtr = 0;
_write_SPRG1(intrStack);
_write_SPRG1((unsigned int)intrStack);
_write_SPRG0(PPC_BSP_HAS_FIXED_PR288); _write_SPRG0(PPC_BSP_HAS_FIXED_PR288);
/* /*