Changeset 9956f81d in rtems


Ignore:
Timestamp:
Jul 12, 2006, 7:08:32 PM (14 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
8faa4a5
Parents:
97871c97
Message:

2006-07-12 Joel Sherrill <joel@…>

  • Makefile.am, include/leon.h: Try to merge rest of 4.6 BSP changes.
  • include/spacewire.h: New file.
Location:
c/src/lib/libbsp/sparc/leon3
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/sparc/leon3/ChangeLog

    r97871c97 r9956f81d  
     12006-07-12      Joel Sherrill <joel@OARcorp.com>
     2
     3        * Makefile.am, include/leon.h: Try to merge rest of 4.6 BSP changes.
     4        * include/spacewire.h: New file.
     5
    162006-07-12      Joel Sherrill <joel@OARcorp.com>
    27
  • c/src/lib/libbsp/sparc/leon3/Makefile.am

    r97871c97 r9956f81d  
    2424include_HEADERS += include/leon.h
    2525include_HEADERS += include/coverhd.h
     26include_HEADERS += include/spacewire.h
    2627
    2728EXTRA_DIST = ../../sparc/shared/start.S
  • c/src/lib/libbsp/sparc/leon3/include/leon.h

    r97871c97 r9956f81d  
    119119  volatile unsigned int iforce;
    120120  volatile unsigned int iclear;
    121   volatile unsigned int notused00;
     121  volatile unsigned int mpstat;
    122122  volatile unsigned int notused01;
    123123  volatile unsigned int notused02;
     
    131131  volatile unsigned int notused22;
    132132  volatile unsigned int notused23;
    133   volatile unsigned int mask_p0;
    134   volatile unsigned int mask_p1;
    135   volatile unsigned int mask_p2;
    136   volatile unsigned int mask_p3;
    137   volatile unsigned int mask_p4;
    138   volatile unsigned int mask_p5;
    139   volatile unsigned int mask_p6;
    140   volatile unsigned int mask_p7;
    141   volatile unsigned int mask_p8;
    142   volatile unsigned int mask_p9;
    143   volatile unsigned int mask_p10;
    144   volatile unsigned int mask_p11;
    145   volatile unsigned int mask_p12;
    146   volatile unsigned int mask_p13;
    147   volatile unsigned int mask_p14;
    148   volatile unsigned int mask_p15;
     133  volatile unsigned int mask[16];
     134  volatile unsigned int force[16];
    149135} LEON3_IrqCtrl_Regs_Map;
    150136
    151 /*
    152137typedef struct {
    153138  volatile unsigned int value;
     
    156141  volatile unsigned int notused;
    157142} LEON3_Timer_SubType;
    158 */
     143
    159144
    160145typedef struct {
     
    163148  volatile unsigned int status;
    164149  volatile unsigned int notused;
    165   volatile unsigned int value_t0;       /* timer 0 */
    166   volatile unsigned int reload_t0;
    167   volatile unsigned int conf_t0;
    168   volatile unsigned int notused0;
    169   volatile unsigned int value_t1;       /* timer 1 */
    170   volatile unsigned int reload_t1;
    171   volatile unsigned int conf_t1;
    172   volatile unsigned int notused1;
    173   volatile unsigned int value_t2;       /* timer 2 */
    174   volatile unsigned int reload_t2;
    175   volatile unsigned int conf_t2;
    176   volatile unsigned int notused2;
    177   volatile unsigned int value_t3;       /* timer 3 */
    178   volatile unsigned int reload_t3;
    179   volatile unsigned int conf_t3;
    180   volatile unsigned int notused3;
    181   volatile unsigned int value_t4;       /* timer 4 */
    182   volatile unsigned int reload_t4;
    183   volatile unsigned int conf_t4;
    184   volatile unsigned int notused4;
    185   volatile unsigned int value_t5;       /* timer 5 */
    186   volatile unsigned int reload_t5;
    187   volatile unsigned int conf_t5;
    188   volatile unsigned int notused5;
    189   volatile unsigned int value_t6;       /* timer 6 */
    190   volatile unsigned int reload_t6;
    191   volatile unsigned int conf_t6;
     150  LEON3_Timer_SubType timer[8];
    192151} LEON3_Timer_Regs_Map;
    193152
     
    298257extern volatile LEON3_UART_Regs_Map *LEON3_Console_Uart[LEON3_APBUARTS];
    299258
     259extern int LEON3_Cpu_Index;
     260
    300261/* Macros used for manipulating bits in LEON3 GP Timer Control Register */
    301262
     
    304265#define LEON3_GPTIMER_LD 4
    305266#define LEON3_GPTIMER_IRQEN 8
     267
     268#define LEON3_MP_IRQ    14        /* Irq used by shared memory driver */
    306269
    307270#ifndef ASM
     
    405368#define LEON_REG_TIMER_COUNTER_CURRENT_MODE_MASK  0x00000003
    406369
     370/* XXX really needed but I can't get it to install -- JRS */
     371/* #include <spacewire.h> */
     372 
    407373#endif /* !ASM */
    408374
Note: See TracChangeset for help on using the changeset viewer.