diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-05-03 22:30:59 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-05-03 22:30:59 +0000 |
| commit | ac644161578e24712f840ae1b7f39a1cc90bd91e (patch) | |
| tree | aab6539ad23dbf079329b5a0642271a4a2443110 /cpukit/score | |
| parent | 2005-05-03 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-ac644161578e24712f840ae1b7f39a1cc90bd91e.tar.bz2 | |
2005-05-03 Joel Sherrill <joel@OARcorp.com>
* rtems/score/cpu.h: Change definition of _VBR to a simple pointer.
* rtems/score/m68k.h: Remove use of _Coldfire_VBR.
Diffstat (limited to 'cpukit/score')
| -rw-r--r-- | cpukit/score/cpu/m68k/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/score/cpu/m68k/rtems/score/cpu.h | 2 | ||||
| -rw-r--r-- | cpukit/score/cpu/m68k/rtems/score/m68k.h | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog index e681ad0f2d..4df045f91c 100644 --- a/cpukit/score/cpu/m68k/ChangeLog +++ b/cpukit/score/cpu/m68k/ChangeLog @@ -1,5 +1,10 @@ 2005-05-03 Joel Sherrill <joel@OARcorp.com> + * rtems/score/cpu.h: Change definition of _VBR to a simple pointer. + * rtems/score/m68k.h: Remove use of _Coldfire_VBR. + +2005-05-03 Joel Sherrill <joel@OARcorp.com> + * cpu.c: Remove warning. 2005-02-08 Ralf Corsepius <ralf.corsepius@rtems.org> diff --git a/cpukit/score/cpu/m68k/rtems/score/cpu.h b/cpukit/score/cpu/m68k/rtems/score/cpu.h index 94dfdbfb02..f7f38c34bc 100644 --- a/cpukit/score/cpu/m68k/rtems/score/cpu.h +++ b/cpukit/score/cpu/m68k/rtems/score/cpu.h @@ -224,7 +224,7 @@ typedef struct { SCORE_EXTERN void *_CPU_Interrupt_stack_low; SCORE_EXTERN void *_CPU_Interrupt_stack_high; -extern char _VBR[]; +extern void *_VBR; #if ( M68K_HAS_VBR == 0 ) diff --git a/cpukit/score/cpu/m68k/rtems/score/m68k.h b/cpukit/score/cpu/m68k/rtems/score/m68k.h index 6bddb29fc8..03c4c39e49 100644 --- a/cpukit/score/cpu/m68k/rtems/score/m68k.h +++ b/cpukit/score/cpu/m68k/rtems/score/m68k.h @@ -332,8 +332,8 @@ extern "C" { asm volatile ( "movec %0,%%vbr " : : "r" (vbr)) #elif ( M68K_COLDFIRE_ARCH == 1 ) -extern void *_ColdFire_VBR; -#define m68k_get_vbr( _vbr ) _vbr = _ColdFire_VBR +extern void *_VBR; +#define m68k_get_vbr( _vbr ) _vbr = _VBR #define m68k_set_vbr( vbr ) \ do { \ |