diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-30 05:09:41 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-30 05:09:41 +0000 |
commit | 359e5374164ccb2a66833354b412a859c144ea2f (patch) | |
tree | 6f065d7d6247bc255f43ddb0152fc26c50bd4f87 /c/src/lib/libcpu/bfin | |
parent | Whitespace removal. (diff) | |
download | rtems-359e5374164ccb2a66833354b412a859c144ea2f.tar.bz2 |
Whitespace removal.
Diffstat (limited to 'c/src/lib/libcpu/bfin')
-rw-r--r-- | c/src/lib/libcpu/bfin/cache/cache.c | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/clock/clock.c | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/clock/rtc.c | 32 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/clock/tod.h | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/include/sicRegs.h | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/interrupt/interrupt.c | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/interrupt/interrupt.h | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/mmu/mmu.c | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/serial/spi.c | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/serial/spi.h | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/serial/twi.c | 10 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/serial/uart.c | 16 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/serial/uart.h | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/bfin/timer/timer.c | 12 |
14 files changed, 51 insertions, 51 deletions
diff --git a/c/src/lib/libcpu/bfin/cache/cache.c b/c/src/lib/libcpu/bfin/cache/cache.c index 992e12ffc9..c263890568 100644 --- a/c/src/lib/libcpu/bfin/cache/cache.c +++ b/c/src/lib/libcpu/bfin/cache/cache.c @@ -1,5 +1,5 @@ /* Blackfin Cache Support - * + * * Copyright (c) 2008 Kallisti Labs, Los Gatos, CA, USA * written by Allan Hessenflow <allanh@kallisti.com> * @@ -9,7 +9,7 @@ * * $Id$ */ - + #include <rtems.h> #include <bsp.h> diff --git a/c/src/lib/libcpu/bfin/clock/clock.c b/c/src/lib/libcpu/bfin/clock/clock.c index 6ccab33e81..17df3246b1 100644 --- a/c/src/lib/libcpu/bfin/clock/clock.c +++ b/c/src/lib/libcpu/bfin/clock/clock.c @@ -1,5 +1,5 @@ /* RTEMS Clock Tick Driver for Blackfin. Uses Blackfin Core Timer. - * + * * Copyright (c) 2008 Kallisti Labs, Los Gatos, CA, USA * written by Allan Hessenflow <allanh@kallisti.com> * @@ -9,7 +9,7 @@ * * $Id$ */ - + #include <rtems.h> #include <stdlib.h> diff --git a/c/src/lib/libcpu/bfin/clock/rtc.c b/c/src/lib/libcpu/bfin/clock/rtc.c index 5120a5efae..07ec729532 100644 --- a/c/src/lib/libcpu/bfin/clock/rtc.c +++ b/c/src/lib/libcpu/bfin/clock/rtc.c @@ -10,7 +10,7 @@ * * $Id$ */ - + #include <rtems.h> #include "tod.h" @@ -21,7 +21,7 @@ /* The following are inside RTEMS -- we are violating visibility!!! * Perhaps an API could be defined to get days since 1 Jan. - */ + */ extern const uint16_t _TOD_Days_to_date[2][13]; /* @@ -42,8 +42,8 @@ void setRealTimeFromRTEMS (void) { rtems_time_of_day time_buffer; rtems_status_code status; - - status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time_buffer ); + + status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time_buffer ); if (status == RTEMS_SUCCESSFUL){ setRealTime(&time_buffer); } @@ -56,9 +56,9 @@ void setRealTimeFromRTEMS (void) void setRealTimeToRTEMS (void) { rtems_time_of_day time_buffer; - - getRealTime(&time_buffer); - rtems_clock_set( &time_buffer ); + + getRealTime(&time_buffer); + rtems_clock_set( &time_buffer ); } /* @@ -70,16 +70,16 @@ int setRealTime( { uint32_t days; rtems_time_of_day tod_temp; - + tod_temp = *tod; - + days = (tod_temp.year - TOD_BASE_YEAR) * 365 + \ _TOD_Days_to_date[0][tod_temp.month] + tod_temp.day - 1; if (tod_temp.month < 3) days += Leap_years_until_now (tod_temp.year - 1); else days += Leap_years_until_now (tod_temp.year); - + *((uint32_t volatile *)RTC_STAT) = (days << RTC_STAT_DAYS_SHIFT)| (tod_temp.hour << RTC_STAT_HOURS_SHIFT)| (tod_temp.minute << RTC_STAT_MINUTES_SHIFT)| @@ -99,21 +99,21 @@ void getRealTime( uint32_t days, rtc_reg; rtems_time_of_day tod_temp = { 0, 0, 0 }; int n, Leap_year; - - rtc_reg = *((uint32_t volatile *)RTC_STAT); - + + rtc_reg = *((uint32_t volatile *)RTC_STAT); + days = (rtc_reg >> RTC_STAT_DAYS_SHIFT) + 1; - + /* finding year */ tod_temp.year = days/365 + TOD_BASE_YEAR; if (days%365 > Leap_years_until_now (tod_temp.year - 1)) { days = (days%365) - Leap_years_until_now (tod_temp.year - 1); - } else { + } else { tod_temp.year--; days = (days%365) + 365 - Leap_years_until_now (tod_temp.year - 1); } - /* finding month and day */ + /* finding month and day */ Leap_year = (((!(tod_temp.year%4)) && (tod_temp.year%100)) || (!(tod_temp.year%400)))?1:0; for (n=1; n<=12; n++) { diff --git a/c/src/lib/libcpu/bfin/clock/tod.h b/c/src/lib/libcpu/bfin/clock/tod.h index 84e0d15383..6c4f8b39ce 100644 --- a/c/src/lib/libcpu/bfin/clock/tod.h +++ b/c/src/lib/libcpu/bfin/clock/tod.h @@ -1,5 +1,5 @@ /* tod.h - * + * * Real Time Clock definitions for eZKit533. * * Copyright (c) 2006 by Atos Automacao Industrial Ltda. @@ -11,7 +11,7 @@ * http://www.rtems.com/license/LICENSE. * * $Id$ - */ + */ #ifndef TOD_H diff --git a/c/src/lib/libcpu/bfin/include/sicRegs.h b/c/src/lib/libcpu/bfin/include/sicRegs.h index 56c19acd96..185bd5f09a 100644 --- a/c/src/lib/libcpu/bfin/include/sicRegs.h +++ b/c/src/lib/libcpu/bfin/include/sicRegs.h @@ -17,7 +17,7 @@ #define SIC_IMASK (SIC_BASE_ADDRESS + 0x000c) #define SIC_IAR_BASE_ADDRESS (SIC_BASE_ADDRESS + 0x0010) -#define SIC_IAR_PITCH 0x04 +#define SIC_IAR_PITCH 0x04 #define SIC_IAR0 (SIC_BASE_ADDRESS + 0x0010) #if SIC_IAR_COUNT > 1 #define SIC_IAR1 (SIC_BASE_ADDRESS + 0x0014) diff --git a/c/src/lib/libcpu/bfin/interrupt/interrupt.c b/c/src/lib/libcpu/bfin/interrupt/interrupt.c index 43cf33aea4..b8e353b048 100644 --- a/c/src/lib/libcpu/bfin/interrupt/interrupt.c +++ b/c/src/lib/libcpu/bfin/interrupt/interrupt.c @@ -1,5 +1,5 @@ /* Support for Blackfin interrupt controller - * + * * Copyright (c) 2008 Kallisti Labs, Los Gatos, CA, USA * written by Allan Hessenflow <allanh@kallisti.com> * @@ -9,7 +9,7 @@ * * $Id$ */ - + #include <rtems.h> #include <rtems/libio.h> diff --git a/c/src/lib/libcpu/bfin/interrupt/interrupt.h b/c/src/lib/libcpu/bfin/interrupt/interrupt.h index 85de1f7dba..bf12258268 100644 --- a/c/src/lib/libcpu/bfin/interrupt/interrupt.h +++ b/c/src/lib/libcpu/bfin/interrupt/interrupt.h @@ -73,7 +73,7 @@ void bfin_interrupt_enable_all(int source, bool enable); /* disable a source independently of the individual ISR enables (starts out all enabled) */ void bfin_interrupt_enable_global(int source, bool enable); - + #ifdef __cplusplus } #endif diff --git a/c/src/lib/libcpu/bfin/mmu/mmu.c b/c/src/lib/libcpu/bfin/mmu/mmu.c index b1a3c038f2..7cfd13958d 100644 --- a/c/src/lib/libcpu/bfin/mmu/mmu.c +++ b/c/src/lib/libcpu/bfin/mmu/mmu.c @@ -1,5 +1,5 @@ /* Blackfin MMU Support - * + * * Copyright (c) 2008 Kallisti Labs, Los Gatos, CA, USA * written by Allan Hessenflow <allanh@kallisti.com> * @@ -9,7 +9,7 @@ * * $Id$ */ - + #include <rtems.h> diff --git a/c/src/lib/libcpu/bfin/serial/spi.c b/c/src/lib/libcpu/bfin/serial/spi.c index 42c2a5250f..471a607f2f 100644 --- a/c/src/lib/libcpu/bfin/serial/spi.c +++ b/c/src/lib/libcpu/bfin/serial/spi.c @@ -1,7 +1,7 @@ /* placeholder (just a shell) */ /* SPI driver for Blackfin - * + * * Copyright (c) 2008 Kallisti Labs, Los Gatos, CA, USA * written by Allan Hessenflow <allanh@kallisti.com> * @@ -11,7 +11,7 @@ * * $Id$ */ - + #include <stdlib.h> #include <rtems.h> diff --git a/c/src/lib/libcpu/bfin/serial/spi.h b/c/src/lib/libcpu/bfin/serial/spi.h index 080d9b3571..a656f44c29 100644 --- a/c/src/lib/libcpu/bfin/serial/spi.h +++ b/c/src/lib/libcpu/bfin/serial/spi.h @@ -40,7 +40,7 @@ typedef struct { extern rtems_libi2c_bus_ops_t bfin_spi_libi2c_bus_ops; - + void bfin_spi_isr(int source); diff --git a/c/src/lib/libcpu/bfin/serial/twi.c b/c/src/lib/libcpu/bfin/serial/twi.c index 80abc52bf1..63b4a0999e 100644 --- a/c/src/lib/libcpu/bfin/serial/twi.c +++ b/c/src/lib/libcpu/bfin/serial/twi.c @@ -1,7 +1,7 @@ /* this is not much more than a shell; it does not do anything useful yet */ /* TWI (I2C) driver for Blackfin - * + * * Copyright (c) 2008 Kallisti Labs, Los Gatos, CA, USA * written by Allan Hessenflow <allanh@kallisti.com> * @@ -11,7 +11,7 @@ * * $Id$ */ - + #include <stdlib.h> #include <rtems.h> @@ -49,9 +49,9 @@ rtems_status_code bfin_twi_init(int channel, bfin_twi_config_t *config) { if (channel < 0 || channel >= N_BFIN_TWI) return RTEMS_INVALID_NUMBER; - + base = config->base; - twi[channel].base = base; + twi[channel].base = base; result = rtems_semaphore_create(rtems_build_name('t','w','i','s'), 0, @@ -77,7 +77,7 @@ rtems_status_code bfin_twi_init(int channel, bfin_twi_config_t *config) { TWI_CONTROL_TWI_ENA; BFIN_REG16(base, TWI_CLKDIV_OFFSET) = config->fast ? ((8 << TWI_CLKDIV_CLKHI_SHIFT) | - (17 << TWI_CLKDIV_CLKLOW_SHIFT)) : + (17 << TWI_CLKDIV_CLKLOW_SHIFT)) : ((33 << TWI_CLKDIV_CLKHI_SHIFT) | (67 << TWI_CLKDIV_CLKLOW_SHIFT)); BFIN_REG16(base, TWI_SLAVE_CTL_OFFSET) = 0; diff --git a/c/src/lib/libcpu/bfin/serial/uart.c b/c/src/lib/libcpu/bfin/serial/uart.c index 8637830e61..cb2c229322 100644 --- a/c/src/lib/libcpu/bfin/serial/uart.c +++ b/c/src/lib/libcpu/bfin/serial/uart.c @@ -1,5 +1,5 @@ /* UART driver for Blackfin - * + * * Copyright (c) 2008 Kallisti Labs, Los Gatos, CA, USA * written by Allan Hessenflow <allanh@kallisti.com> * @@ -9,7 +9,7 @@ * * $Id$ */ - + #include <rtems.h> #include <rtems/libio.h> @@ -34,7 +34,7 @@ static void initializeHardware(int minor) { uint16_t r; base = uartsConfig->channels[minor].base_address; - + *(uint16_t volatile *) (base + UART_IER_OFFSET) = 0; if (uartsConfig->channels[minor].force_baud) @@ -60,12 +60,12 @@ static void initializeHardware(int minor) { static int pollRead(int minor) { int c; char *base; - + base = uartsConfig->channels[minor].base_address; - + /* check to see if driver is using interrupts so this call will be harmless (though non-functional) in case some debug code tries to - use it */ + use it */ if (!uartsConfig->channels[minor].use_interrupts && *((uint16_t volatile *) (base + UART_LSR_OFFSET)) & UART_LSR_DR) c = *((uint16_t volatile *) (base + UART_RBR_OFFSET)); @@ -87,7 +87,7 @@ char bfin_uart_poll_read(int minor) { void bfin_uart_poll_write(int minor, char c) { char *base; - + base = uartsConfig->channels[minor].base_address; while (!(*((uint16_t volatile *) (base + UART_LSR_OFFSET)) & UART_LSR_THRE)) @@ -158,7 +158,7 @@ static int pollWrite(int minor, const char *buf, int len) { static void enableInterrupts(int minor) { char *base; - + base = uartsConfig->channels[minor].base_address; *(uint16_t volatile *) (base + UART_IER_OFFSET) = UART_IER_ETBEI | diff --git a/c/src/lib/libcpu/bfin/serial/uart.h b/c/src/lib/libcpu/bfin/serial/uart.h index bac7cdcfa1..87e493bf6d 100644 --- a/c/src/lib/libcpu/bfin/serial/uart.h +++ b/c/src/lib/libcpu/bfin/serial/uart.h @@ -50,7 +50,7 @@ rtems_device_driver bfin_uart_open(rtems_device_major_number major, void bfin_uart_isr(int source); - + #ifdef __cplusplus } #endif diff --git a/c/src/lib/libcpu/bfin/timer/timer.c b/c/src/lib/libcpu/bfin/timer/timer.c index f60ff57981..bb2c88514e 100644 --- a/c/src/lib/libcpu/bfin/timer/timer.c +++ b/c/src/lib/libcpu/bfin/timer/timer.c @@ -4,7 +4,7 @@ * Suite. Each measured time period is demarcated by calls to * benchmark_timer_initialize() and benchmark_timer_read(). benchmark_timer_read() usually returns * the number of microseconds since benchmark_timer_initialize() exitted. - * + * * Copyright (c) 2006 by Atos Automacao Industrial Ltda. * written by Alain Schaefer <alain.schaefer@easc.ch> * and Antonio Giovanini <antonio@atos.com.br> @@ -15,7 +15,7 @@ * * $Id$ */ - + #include <rtems.h> #include <bsp.h> @@ -26,7 +26,7 @@ bool benchmark_timer_find_average_overhead; /* * benchmark_timer_initialize - * + * * Blackfin processor has a counter for clock cycles. */ void benchmark_timer_initialize( void ) @@ -40,7 +40,7 @@ void benchmark_timer_initialize( void ) asm ("R2 = SYSCFG;"); asm ("BITSET(R2,1);"); asm ("SYSCFG = R2"); - + } /* @@ -64,7 +64,7 @@ int benchmark_timer_read( void ) uint32_t total; register uint32_t cycles asm ("R2"); - /* stop counter */ + /* stop counter */ asm("R2 = SYSCFG;"); asm("BITCLR(R2,1);"); asm("SYSCFG = R2;"); @@ -74,7 +74,7 @@ int benchmark_timer_read( void ) clicks = cycles; /* Clock cycles */ /* converting to microseconds */ - total = clicks / (CCLK/1000000); + total = clicks / (CCLK/1000000); if ( benchmark_timer_find_average_overhead == 1 ) return total; /* in XXX microsecond units */ |