diff options
| author | Daniel Hellstrom <daniel@gaisler.com> | 2012-05-16 17:20:35 +0200 |
|---|---|---|
| committer | Gedare Bloom <gedare@rtems.org> | 2012-05-16 13:29:13 -0400 |
| commit | 226d48d8262ff040aeca439c22e7398179eb01cd (patch) | |
| tree | 931d2a37d49440bd95902f9b367f72f02ea5db2c /c/src/lib/libbsp/sparc/leon3/amba/amba.c | |
| parent | nfsclient: Fix symbolic link evaluation (diff) | |
| download | rtems-226d48d8262ff040aeca439c22e7398179eb01cd.tar.bz2 | |
LEON: moved register definitions into grlib header file
Some register layout definitions for LEON3 reside in ambapp.h which
does not really has anything to do with device registers. The
register structures has been incorrectly named LEON3_*, the cores
are not only used on LEON3 but on LEON4 and perhaps on LEON5 when
that day comes. Some structures has been renamed according to the
GRLIB core name instead, which CPU that actually use it is not
relevant. Drivers has been updated with the new names.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Diffstat (limited to 'c/src/lib/libbsp/sparc/leon3/amba/amba.c')
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/amba/amba.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/amba/amba.c b/c/src/lib/libbsp/sparc/leon3/amba/amba.c index 63d35bc9e5..eb7b0f2a40 100644 --- a/c/src/lib/libbsp/sparc/leon3/amba/amba.c +++ b/c/src/lib/libbsp/sparc/leon3/amba/amba.c @@ -25,7 +25,7 @@ struct ambapp_bus ambapp_plb; extern void leon3_ext_irq_init(void); /* Pointers to Interrupt Controller configuration registers */ -volatile LEON3_IrqCtrl_Regs_Map *LEON3_IrqCtrl_Regs; +volatile struct irqmp_regs *LEON3_IrqCtrl_Regs; /* * amba_initialize @@ -61,8 +61,7 @@ void amba_initialize(void) asm volatile( "mov 1, %g1; ta 0x0" ); } - LEON3_IrqCtrl_Regs = (volatile LEON3_IrqCtrl_Regs_Map *) - DEV_TO_APB(adev)->start; + LEON3_IrqCtrl_Regs = (volatile struct irqmp_regs *)DEV_TO_APB(adev)->start; if ((LEON3_IrqCtrl_Regs->ampctrl >> 28) > 0) { /* IRQ Controller has support for multiple IRQ Controllers, each * CPU can be routed to different Controllers, we find out which @@ -85,7 +84,7 @@ void amba_initialize(void) VENDOR_GAISLER, GAISLER_GPTIMER, ambapp_find_by_idx, NULL); if (adev) { - LEON3_Timer_Regs = (volatile LEON3_Timer_Regs_Map *)DEV_TO_APB(adev)->start; + LEON3_Timer_Regs = (volatile struct gptimer_regs *)DEV_TO_APB(adev)->start; /* Register AMBA Bus Frequency */ ambapp_freq_init(&ambapp_plb, adev, |