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/console/console.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/console/console.c')
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/console/console.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/console/console.c b/c/src/lib/libbsp/sparc/leon3/console/console.c index 0575468ffc..3870685b50 100644 --- a/c/src/lib/libbsp/sparc/leon3/console/console.c +++ b/c/src/lib/libbsp/sparc/leon3/console/console.c @@ -49,14 +49,14 @@ int syscon_uart_index __attribute__((weak)) = 0; */ extern void apbuart_outbyte_polled( - ambapp_apb_uart *regs, + struct apbuart_regs *regs, unsigned char ch, int do_cr_on_newline, int wait_sent ); -/* body is in debugputs.c */ +/* body is in printk_support.c */ /* * apbuart_inbyte_nonblocking @@ -64,12 +64,12 @@ extern void apbuart_outbyte_polled( * This routine polls for a character. */ -extern int apbuart_inbyte_nonblocking(ambapp_apb_uart *regs); +extern int apbuart_inbyte_nonblocking(struct apbuart_regs *regs); /* body is in debugputs.c */ struct apbuart_priv { - ambapp_apb_uart *regs; + struct apbuart_regs *regs; unsigned int freq_hz; #if CONSOLE_USE_INTERRUPTS int irq; @@ -252,7 +252,7 @@ int find_matching_apbuart(struct ambapp_dev *dev, int index, void *arg) struct ambapp_apb_info *apb = (struct ambapp_apb_info *)dev->devinfo; /* Extract needed information of one APBUART */ - apbuarts[uarts].regs = (ambapp_apb_uart *)apb->start; + apbuarts[uarts].regs = (struct apbuart_regs *)apb->start; #if CONSOLE_USE_INTERRUPTS apbuarts[uarts].irq = apb->irq; #endif |