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/shared/can | |
| 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/shared/can')
| -rw-r--r-- | c/src/lib/libbsp/sparc/shared/can/grcan.c | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/shared/can/occan.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/sparc/shared/can/grcan.c b/c/src/lib/libbsp/sparc/shared/can/grcan.c index 3b0a14afac..d592fbaad3 100644 --- a/c/src/lib/libbsp/sparc/shared/can/grcan.c +++ b/c/src/lib/libbsp/sparc/shared/can/grcan.c @@ -26,6 +26,7 @@ #include <grcan.h> #include <ambapp.h> +#include <grlib.h> #define WRAP_AROUND_TX_MSGS 1 #define WRAP_AROUND_RX_MSGS 2 @@ -1097,11 +1098,11 @@ static rtems_device_driver grcan_initialize( /* LEON3: find timer address via AMBA Plug&Play info */ { struct ambapp_apb_info gptimer; - LEON3_Timer_Regs_Map *tregs; + struct gptimer_regs *tregs; if (ambapp_find_apbslv (&ambapp_plb, VENDOR_GAISLER, GAISLER_GPTIMER, &gptimer) == 1) { - tregs = (LEON3_Timer_Regs_Map *) gptimer.start; + tregs = (struct gptimer_regs *) gptimer.start; sys_freq_hz = (tregs->scaler_reload + 1) * 1000 * 1000; DBG("GRCAN: detected %dHZ system frequency\n\r", sys_freq_hz); } else { diff --git a/c/src/lib/libbsp/sparc/shared/can/occan.c b/c/src/lib/libbsp/sparc/shared/can/occan.c index 4fb932dc61..b1bf54e6d0 100644 --- a/c/src/lib/libbsp/sparc/shared/can/occan.c +++ b/c/src/lib/libbsp/sparc/shared/can/occan.c @@ -19,6 +19,7 @@ #include <leon.h> #include <ambapp.h> +#include <grlib.h> #include <occan.h> /* RTEMS -> ERRNO decoding table @@ -936,11 +937,11 @@ static rtems_device_driver occan_initialize(rtems_device_major_number major, rte /* LEON3: find timer address via AMBA Plug&Play info */ { struct ambapp_apb_info gptimer; - LEON3_Timer_Regs_Map *tregs; + struct gptimer_regs *tregs; if ( ambapp_find_apbslv(&ambapp_plb, VENDOR_GAISLER, GAISLER_GPTIMER, &gptimer) == 1 ){ - tregs = (LEON3_Timer_Regs_Map *)gptimer.start; + tregs = (struct gptimer_regs *)gptimer.start; sys_freq_hz = (tregs->scaler_reload+1)*1000*1000; DBG("OCCAN: detected %dHZ system frequency\n\r",sys_freq_hz); }else{ |