Changeset 2cee553 in rtems


Ignore:
Timestamp:
Mar 29, 2012, 11:52:16 AM (9 years ago)
Author:
Daniel Hellstrom <daniel@…>
Branches:
4.11, 5, master
Children:
2cc30b0d
Parents:
226771c
git-author:
Daniel Hellstrom <daniel@…> (03/29/12 11:52:16)
git-committer:
Gedare Bloom <gedare@…> (03/29/12 20:01:19)
Message:

LEON3: various cleanups in leon.h

Removed old LEON2 definitions never used in LEON3 leon.h.

Signed-off-by: Daniel Hellstrom <daniel@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/sparc/leon3/include/leon.h

    r226771c r2cee553  
    4646  ( (_trap) >= 0x11 && \
    4747    (_trap) <= 0x1F )
    48 
    49 /*
    50  *  Structure for LEON memory mapped registers.
    51  *
    52  *  Source: Section 6.1 - On-chip registers
    53  *
    54  *  NOTE:  There is only one of these structures per CPU, its base address
    55  *         is 0x80000000, and the variable LEON_REG is placed there by the
    56  *         linkcmds file.
    57  */
    58 
    59 /* Leon uses dynamic register mapping using amba configuration records,
    60  * LEON_Register_Map is obsolete
    61  */
    62 /*
    63   typedef struct {
    64         volatile unsigned int Memory_Config_1;
    65         volatile unsigned int Memory_Config_2;
    66         volatile unsigned int Edac_Control;
    67         volatile unsigned int Failed_Address;
    68         volatile unsigned int Memory_Status;
    69         volatile unsigned int Cache_Control;
    70         volatile unsigned int Power_Down;
    71         volatile unsigned int Write_Protection_1;
    72         volatile unsigned int Write_Protection_2;
    73         volatile unsigned int Leon_Configuration;
    74         volatile unsigned int dummy2;
    75         volatile unsigned int dummy3;
    76         volatile unsigned int dummy4;
    77         volatile unsigned int dummy5;
    78         volatile unsigned int dummy6;
    79         volatile unsigned int dummy7;
    80         volatile unsigned int Timer_Counter_1;
    81         volatile unsigned int Timer_Reload_1;
    82         volatile unsigned int Timer_Control_1;
    83         volatile unsigned int Watchdog;
    84         volatile unsigned int Timer_Counter_2;
    85         volatile unsigned int Timer_Reload_2;
    86         volatile unsigned int Timer_Control_2;
    87         volatile unsigned int dummy8;
    88         volatile unsigned int Scaler_Counter;
    89         volatile unsigned int Scaler_Reload;
    90         volatile unsigned int dummy9;
    91         volatile unsigned int dummy10;
    92         volatile unsigned int UART_Channel_1;
    93         volatile unsigned int UART_Status_1;
    94         volatile unsigned int UART_Control_1;
    95         volatile unsigned int UART_Scaler_1;
    96         volatile unsigned int UART_Channel_2;
    97         volatile unsigned int UART_Status_2;
    98         volatile unsigned int UART_Control_2;
    99         volatile unsigned int UART_Scaler_2;
    100         volatile unsigned int Interrupt_Mask;
    101         volatile unsigned int Interrupt_Pending;
    102         volatile unsigned int Interrupt_Force;
    103         volatile unsigned int Interrupt_Clear;
    104         volatile unsigned int PIO_Data;
    105         volatile unsigned int PIO_Direction;
    106         volatile unsigned int PIO_Interrupt;
    107 } LEON_Register_Map;
    108 */
    10948
    11049typedef struct {
     
    194133#define LEON_REG_UART_STATUS_ERR  0x00000078 /* Error Mask */
    195134
    196 
    197135/*
    198136 *  The following defines the bits in the LEON UART Status Registers.
     
    212150extern volatile LEON3_UART_Regs_Map *LEON3_Console_Uart[LEON3_APBUARTS];
    213151
     152/* LEON3 CPU Index of boot CPU */
    214153extern int LEON3_Cpu_Index;
    215154
     
    256195     (LEON3_IrqCtrl_Regs->mask[LEON3_Cpu_Index] & (1 << (_source))); \
    257196   } while (0)
    258 
    259197
    260198#define LEON_Mask_interrupt( _source ) \
Note: See TracChangeset for help on using the changeset viewer.