diff options
author | Daniel Cederman <cederman@gaisler.com> | 2014-05-08 17:08:04 +0200 |
---|---|---|
committer | Daniel Hellstrom <daniel@gaisler.com> | 2014-05-27 09:46:30 +0200 |
commit | 9f058fb1c2368aa17692f6beb0f8b04299616bbe (patch) | |
tree | 576ec330a698e34e486ce5afaa24bdb44dac6f6c /c/src/lib/libbsp/sparc/leon3 | |
parent | bsps/sparc: Add copyright and license information (diff) | |
download | rtems-9f058fb1c2368aa17692f6beb0f8b04299616bbe.tar.bz2 |
bsps/sparc: Change tabs to spaces.
Diffstat (limited to 'c/src/lib/libbsp/sparc/leon3')
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/include/bsp.h | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/include/leon.h | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c | 10 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon3/startup/spurious.c | 4 |
5 files changed, 16 insertions, 18 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp.h b/c/src/lib/libbsp/sparc/leon3/include/bsp.h index 6bbd6ed380..1be6cc2088 100644 --- a/c/src/lib/libbsp/sparc/leon3/include/bsp.h +++ b/c/src/lib/libbsp/sparc/leon3/include/bsp.h @@ -79,13 +79,13 @@ extern int rtems_leon_greth_driver_attach( int attach ); -#define RTEMS_BSP_NETWORK_DRIVER_NAME_OPENETH "open_eth1" -#define RTEMS_BSP_NETWORK_DRIVER_ATTACH_OPENETH \ +#define RTEMS_BSP_NETWORK_DRIVER_NAME_OPENETH "open_eth1" +#define RTEMS_BSP_NETWORK_DRIVER_ATTACH_OPENETH \ rtems_leon_open_eth_driver_attach -#define RTEMS_BSP_NETWORK_DRIVER_NAME_SMC91111 "smc_eth1" +#define RTEMS_BSP_NETWORK_DRIVER_NAME_SMC91111 "smc_eth1" #define RTEMS_BSP_NETWORK_DRIVER_ATTACH_SMC91111 \ rtems_smc91111_driver_attach_leon3 -#define RTEMS_BSP_NETWORK_DRIVER_NAME_GRETH "gr_eth1" +#define RTEMS_BSP_NETWORK_DRIVER_NAME_GRETH "gr_eth1" #define RTEMS_BSP_NETWORK_DRIVER_ATTACH_GRETH \ rtems_leon_greth_driver_attach diff --git a/c/src/lib/libbsp/sparc/leon3/include/leon.h b/c/src/lib/libbsp/sparc/leon3/include/leon.h index f1b987be43..7e8188d463 100644 --- a/c/src/lib/libbsp/sparc/leon3/include/leon.h +++ b/c/src/lib/libbsp/sparc/leon3/include/leon.h @@ -287,9 +287,9 @@ extern rtems_interrupt_lock LEON3_IrqCtrl_Lock; /* Load 32-bit word by forcing a cache-miss */ static inline unsigned int leon_r32_no_cache(uintptr_t addr) { - unsigned int tmp; - __asm__ volatile (" lda [%1] 1, %0\n" : "=r"(tmp) : "r"(addr)); - return tmp; + unsigned int tmp; + __asm__ volatile (" lda [%1] 1, %0\n" : "=r"(tmp) : "r"(addr)); + return tmp; } /* Let user override which on-chip APBUART will be debug UART diff --git a/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c b/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c index e8bdd528ed..17218bef9f 100644 --- a/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c +++ b/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c @@ -36,7 +36,7 @@ scmv91111_configuration_t leon_scmv91111_configuration = { */ int rtems_smc91111_driver_attach_leon3 (struct rtems_bsdnet_ifconfig *config, - int attach) + int attach) { unsigned long addr_mctrl = 0; struct grgpio_regs *io; @@ -70,10 +70,8 @@ rtems_smc91111_driver_attach_leon3 (struct rtems_bsdnet_ifconfig *config, addr_mctrl = (unsigned long) apbmctrl.start; io = (struct grgpio_regs *) apbpio.start; - printk( - "Activating Leon3 io port for smsc_lan91cxx (pio:%x mctrl:%x)\n", - (unsigned int)io, - (unsigned int)addr_mctrl); + printk("Activating Leon3 io port for smsc_lan91cxx (pio:%x mctrl:%x)\n", + (unsigned int)io, (unsigned int)addr_mctrl); /* Setup PIO IRQ */ io->imask |= (1 << leon_scmv91111_configuration.pio); @@ -83,7 +81,7 @@ rtems_smc91111_driver_attach_leon3 (struct rtems_bsdnet_ifconfig *config, /* Setup memory controller I/O waitstates */ *((volatile unsigned int *) addr_mctrl) |= - 0x10f80000; /* enable I/O area access */ + 0x10f80000; /* enable I/O area access */ return _rtems_smc91111_driver_attach(config, &leon_scmv91111_configuration); }; diff --git a/c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c b/c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c index 80bf7161e8..5b118f24b6 100644 --- a/c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c +++ b/c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c @@ -44,9 +44,9 @@ extern unsigned int LEON3_Atomic_Swap(uint32_t value, uint32_t *address); __asm__ ( ".text\n" ".align 4\n" -"LEON3_Atomic_Swap:\n" -" retl\n" -" swapa [%o1] 1, %o0\n" + "LEON3_Atomic_Swap:\n" + " retl\n" + " swapa [%o1] 1, %o0\n" ); diff --git a/c/src/lib/libbsp/sparc/leon3/startup/spurious.c b/c/src/lib/libbsp/sparc/leon3/startup/spurious.c index 210dee0a73..9d13010fba 100644 --- a/c/src/lib/libbsp/sparc/leon3/startup/spurious.c +++ b/c/src/lib/libbsp/sparc/leon3/startup/spurious.c @@ -152,8 +152,8 @@ void bsp_spurious_initialize() */ if (( trap == 5 || trap == 6 ) || - (( trap >= 0x11 ) && ( trap <= 0x1f )) || - (( trap >= 0x70 ) && ( trap <= 0x83 ))) + (( trap >= 0x11 ) && ( trap <= 0x1f )) || + (( trap >= 0x70 ) && ( trap <= 0x83 ))) continue; set_vector( |