[PATCH 25] LEON3: various cleanups in leon.h

[Joel Sherrill]

On 03/29/2012 02:45 PM, Gedare Bloom wrote:
> Looks good.
Feel free to commit. I think I will stay away from git
until tomorrow. I have done enough damage for one
day.
> On Thu, Mar 29, 2012 at 7:52 AM, Daniel Hellstrom<daniel at gaisler.com>  wrote:
>> Removed old LEON2 definitions never used in LEON3 leon.h.
>>
>> Signed-off-by: Daniel Hellstrom<daniel at gaisler.com>
>> ---
>>   c/src/lib/libbsp/sparc/leon3/include/leon.h |   64 +--------------------------
>>   1 files changed, 1 insertions(+), 63 deletions(-)
>>
>> diff --git a/c/src/lib/libbsp/sparc/leon3/include/leon.h b/c/src/lib/libbsp/sparc/leon3/include/leon.h
>> index cd50629..fd208b0 100644
>> --- a/c/src/lib/libbsp/sparc/leon3/include/leon.h
>> +++ b/c/src/lib/libbsp/sparc/leon3/include/leon.h
>> @@ -46,67 +46,6 @@ extern "C" {
>>    ( (_trap)>= 0x11&&  \
>>      (_trap)<= 0x1F )
>>
>> -/*
>> - *  Structure for LEON memory mapped registers.
>> - *
>> - *  Source: Section 6.1 - On-chip registers
>> - *
>> - *  NOTE:  There is only one of these structures per CPU, its base address
>> - *         is 0x80000000, and the variable LEON_REG is placed there by the
>> - *         linkcmds file.
>> - */
>> -
>> -/* Leon uses dynamic register mapping using amba configuration records,
>> - * LEON_Register_Map is obsolete
>> - */
>> -/*
>> -  typedef struct {
>> -       volatile unsigned int Memory_Config_1;
>> -       volatile unsigned int Memory_Config_2;
>> -       volatile unsigned int Edac_Control;
>> -       volatile unsigned int Failed_Address;
>> -       volatile unsigned int Memory_Status;
>> -       volatile unsigned int Cache_Control;
>> -       volatile unsigned int Power_Down;
>> -       volatile unsigned int Write_Protection_1;
>> -       volatile unsigned int Write_Protection_2;
>> -       volatile unsigned int Leon_Configuration;
>> -       volatile unsigned int dummy2;
>> -       volatile unsigned int dummy3;
>> -       volatile unsigned int dummy4;
>> -       volatile unsigned int dummy5;
>> -       volatile unsigned int dummy6;
>> -       volatile unsigned int dummy7;
>> -       volatile unsigned int Timer_Counter_1;
>> -       volatile unsigned int Timer_Reload_1;
>> -       volatile unsigned int Timer_Control_1;
>> -       volatile unsigned int Watchdog;
>> -       volatile unsigned int Timer_Counter_2;
>> -       volatile unsigned int Timer_Reload_2;
>> -       volatile unsigned int Timer_Control_2;
>> -       volatile unsigned int dummy8;
>> -       volatile unsigned int Scaler_Counter;
>> -       volatile unsigned int Scaler_Reload;
>> -       volatile unsigned int dummy9;
>> -       volatile unsigned int dummy10;
>> -       volatile unsigned int UART_Channel_1;
>> -       volatile unsigned int UART_Status_1;
>> -       volatile unsigned int UART_Control_1;
>> -       volatile unsigned int UART_Scaler_1;
>> -       volatile unsigned int UART_Channel_2;
>> -       volatile unsigned int UART_Status_2;
>> -       volatile unsigned int UART_Control_2;
>> -       volatile unsigned int UART_Scaler_2;
>> -       volatile unsigned int Interrupt_Mask;
>> -       volatile unsigned int Interrupt_Pending;
>> -       volatile unsigned int Interrupt_Force;
>> -       volatile unsigned int Interrupt_Clear;
>> -       volatile unsigned int PIO_Data;
>> -       volatile unsigned int PIO_Direction;
>> -       volatile unsigned int PIO_Interrupt;
>> -} LEON_Register_Map;
>> -*/
>> -
>>   typedef struct {
>>    volatile unsigned int data;
>>    volatile unsigned int status;
>> @@ -193,7 +132,6 @@ typedef struct {
>>   #define LEON_REG_UART_STATUS_FE   0x00000040 /* RX Framing Error */
>>   #define LEON_REG_UART_STATUS_ERR  0x00000078 /* Error Mask */
>>
>> -
>>   /*
>>   *  The following defines the bits in the LEON UART Status Registers.
>>   */
>> @@ -211,6 +149,7 @@ extern volatile LEON3_IrqCtrl_Regs_Map *LEON3_IrqCtrl_Regs;  /* LEON3 Interrupt
>>   extern volatile LEON3_Timer_Regs_Map *LEON3_Timer_Regs; /* LEON3 GP Timer */
>>   extern volatile LEON3_UART_Regs_Map *LEON3_Console_Uart[LEON3_APBUARTS];
>>
>> +/* LEON3 CPU Index of boot CPU */
>>   extern int LEON3_Cpu_Index;
>>
>>   /* Macros used for manipulating bits in LEON3 GP Timer Control Register */
>> @@ -256,7 +195,6 @@ extern int LEON3_Cpu_Index;
>>       (LEON3_IrqCtrl_Regs->mask[LEON3_Cpu_Index]&  (1<<  (_source))); \
>>     } while (0)
>>
>> -
>>   #define LEON_Mask_interrupt( _source ) \
>>    do { \
>>      uint32_t _level; \
>> --
>> 1.7.0.4
>>
>> _______________________________________________
>> rtems-devel mailing list
>> rtems-devel at rtems.org
>> http://www.rtems.org/mailman/listinfo/rtems-devel
> _______________________________________________
> rtems-devel mailing list
> rtems-devel at rtems.org
> http://www.rtems.org/mailman/listinfo/rtems-devel


-- 
Joel Sherrill, Ph.D.             Director of Research&   Development
joel.sherrill at OARcorp.com        On-Line Applications Research
Ask me about RTEMS: a free RTOS  Huntsville AL 35805
     Support Available             (256) 722-9985