RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

bsps/sparc: Move flags to grlib header

Browse Source 
This enables re-use for other BSPs
This commit is contained in:
Christian Mauderer
2014-05-09 14:25:40 +02:00
committed by Sebastian Huber
parent 89f079469c
commit 3a3869c449
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
View File

@@ -113,8 +113,8 @@ static void leon3_clock_profiling_interrupt_delay(void)
rtems_configuration_get_microseconds_per_tick() - 1; \
\
LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].ctrl = \
LEON3_GPTIMER_EN | LEON3_GPTIMER_RL | \
LEON3_GPTIMER_LD | LEON3_GPTIMER_IRQEN; \
GPTIMER_TIMER_CTRL_EN | GPTIMER_TIMER_CTRL_RS | \
GPTIMER_TIMER_CTRL_LD | GPTIMER_TIMER_CTRL_IE; \
} while (0)
#define Clock_driver_support_shutdown_hardware() \

5
c/src/lib/libbsp/sparc/leon3/include/leon.h
View File

@@ -144,11 +144,6 @@ static __inline__ int bsp_irq_fixup(int irq)
/* Macros used for manipulating bits in LEON3 GP Timer Control Register */
#define LEON3_GPTIMER_EN 1
#define LEON3_GPTIMER_RL 2
#define LEON3_GPTIMER_LD 4
#define LEON3_GPTIMER_IRQEN 8
#define LEON3_MP_IRQ 14 /* Irq used by shared memory driver */
#define LEON3_IRQMPSTATUS_CPUNR 28

4
c/src/lib/libbsp/sparc/leon3/startup/cpucounter.c
View File

@@ -113,8 +113,8 @@ void leon3_cpu_counter_initialize(void)
gpt->scaler_reload = min_prescaler - 1;
gpt->timer[0].reload = 0xffffffff;
gpt->timer[0].ctrl = LEON3_GPTIMER_EN | LEON3_GPTIMER_RL
| LEON3_GPTIMER_LD;
gpt->timer[0].ctrl = GPTIMER_TIMER_CTRL_EN | GPTIMER_TIMER_CTRL_RS
| GPTIMER_TIMER_CTRL_LD;
gpt_counter_initialize(gpt, 0, frequency, free_counter_difference);
} else if (LEON3_Timer_Regs != NULL) {

3
c/src/lib/libbsp/sparc/leon3/timer/timer.c
View File

@@ -48,7 +48,8 @@ void benchmark_timer_initialize(void)
} else {
benchmark_timer_is_initialized = true;
}
LEON3_Timer_Regs->timer[LEON3_TIMER_INDEX].ctrl = LEON3_GPTIMER_EN | LEON3_GPTIMER_LD;
LEON3_Timer_Regs->timer[LEON3_TIMER_INDEX].ctrl =
GPTIMER_TIMER_CTRL_EN | GPTIMER_TIMER_CTRL_LD;
}
}

8
c/src/lib/libbsp/sparc/shared/include/grlib.h
View File

@@ -78,6 +78,14 @@ struct gptimer_timer_regs {
volatile unsigned int notused;
};
#define GPTIMER_TIMER_CTRL_EN 0x00000001U
#define GPTIMER_TIMER_CTRL_RS 0x00000002U
#define GPTIMER_TIMER_CTRL_LD 0x00000004U
#define GPTIMER_TIMER_CTRL_IE 0x00000008U
#define GPTIMER_TIMER_CTRL_IP 0x00000010U
#define GPTIMER_TIMER_CTRL_CH 0x00000020U
#define GPTIMER_TIMER_CTRL_DH 0x00000040U
/* GPTIMER common registers */
struct gptimer_regs {
volatile unsigned int scaler_value; /* common timer registers */