Ignore:
Timestamp:
Jul 31, 2007, 4:48:38 PM (13 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
ee69dc6
Parents:
4d03577
Message:

Replace M68K_COLDFIRE_ARCH with mcoldfire.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/score/cpu/m68k/rtems/score/m68k.h

    r4d03577 r97c73ed  
    209209#define M68K_HAS_FPU             0
    210210#define M68K_HAS_FPSP_PACKAGE    0
    211 #define M68K_COLDFIRE_ARCH       1
    212211#define M68K_HAS_ISA_APLUS       1
    213212
     
    223222#define M68K_HAS_FPU             0
    224223#define M68K_HAS_FPSP_PACKAGE    0
    225 #define M68K_COLDFIRE_ARCH       1
    226224#define M68K_HAS_ISA_APLUS       0
    227225
     
    255253
    256254/*
    257  *  If the above did not specify a ColdFire architecture, then set
    258  *  this flag to indicate that it is not a ColdFire CPU.
    259  */
    260 
    261 #if !defined(M68K_COLDFIRE_ARCH)
    262 #define M68K_COLDFIRE_ARCH       0
     255 * OBSOLETE: Backward compatibility only - Don't use.
     256 * Use __mcoldfire__ instead.
     257 */
     258#if defined(__mcoldfire__)
     259#define M68K_COLDFIRE_ARCH      1
     260#else
     261#define M68K_COLDFIRE_ARCH      0
    263262#endif
    264263
     
    267266 */
    268267
    269 #if ( M68K_COLDFIRE_ARCH == 1 )
     268#if ( defined(__mcoldfire__) )
    270269  #define CPU_NAME "Motorola ColdFire"
    271270#else
     
    275274#ifndef ASM
    276275
    277 #if ( M68K_COLDFIRE_ARCH == 1 )
     276#if ( defined(__mcoldfire__) )
    278277#define m68k_disable_interrupts( _level ) \
    279278   do { register uint32_t   _tmpsr = 0x0700; \
     
    295294  asm volatile ( "move.w  %0,%%sr " : : "d" (_level) : "cc");
    296295
    297 #if ( M68K_COLDFIRE_ARCH == 1 )
     296#if ( defined(__mcoldfire__) )
    298297#define m68k_flash_interrupts( _level ) \
    299298   do { register uint32_t   _tmpsr = 0x0700; \
     
    329328  } while (0)
    330329
    331 #if ( M68K_HAS_VBR == 1 && M68K_COLDFIRE_ARCH == 0 )
     330#if ( M68K_HAS_VBR == 1 && !defined(__mcoldfire__) )
    332331#define m68k_get_vbr( vbr ) \
    333332  asm volatile ( "movec   %%vbr,%0 " : "=r" (vbr))
     
    336335  asm volatile ( "movec   %0,%%vbr " : : "r" (vbr))
    337336
    338 #elif ( M68K_COLDFIRE_ARCH == 1 )
     337#elif ( defined(__mcoldfire__) )
    339338extern void*                     _VBR;
    340339#define m68k_get_vbr( _vbr ) _vbr = &_VBR
     
    355354 *  It must be static because it is referenced indirectly.
    356355 */
    357 #if ( M68K_COLDFIRE_ARCH == 1 )
     356#if ( defined(__mcoldfire__) )
    358357
    359358/* There are no rotate commands in Coldfire architecture. We will use
Note: See TracChangeset for help on using the changeset viewer.