diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-21 10:43:04 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-21 10:43:04 +0000 |
commit | 6128a4aa5e791ed4e0a655bfd346a52d92da7883 (patch) | |
tree | af53ca3f67ce405b6fbc6c98399c8e0c87e01a9e /c/src/lib/libbsp/sparc/leon | |
parent | 2004-04-20 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
download | rtems-6128a4aa5e791ed4e0a655bfd346a52d92da7883.tar.bz2 |
Remove stray white spaces.
Diffstat (limited to 'c/src/lib/libbsp/sparc/leon')
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/clock/ckinit.c | 34 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/console/console.c | 46 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/console/debugputs.c | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/include/bsp.h | 28 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/include/coverhd.h | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/include/leon.h | 50 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/leon_open_eth/leon_open_eth.c | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/startup/boardinit.S | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/startup/setvec.c | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/startup/spurious.c | 26 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/leon/timer/timer.c | 8 |
11 files changed, 107 insertions, 107 deletions
diff --git a/c/src/lib/libbsp/sparc/leon/clock/ckinit.c b/c/src/lib/libbsp/sparc/leon/clock/ckinit.c index 10b465682c..fc4d3b3608 100644 --- a/c/src/lib/libbsp/sparc/leon/clock/ckinit.c +++ b/c/src/lib/libbsp/sparc/leon/clock/ckinit.c @@ -14,10 +14,10 @@ * http://www.rtems.com/license/LICENSE. * * Ported to LEON implementation of the SPARC by On-Line Applications - * Research Corporation (OAR) under contract to the European Space + * Research Corporation (OAR) under contract to the European Space * Agency (ESA). * - * LEON modifications of respective RTEMS file: COPYRIGHT (c) 1995. + * LEON modifications of respective RTEMS file: COPYRIGHT (c) 1995. * European Space Agency. * * $Id$ @@ -52,11 +52,11 @@ extern uint32_t CPU_SPARC_CLICKS_PER_TICK; rtems_isr_entry Old_ticker; void Clock_exit( void ); - + /* * These are set by clock driver during its init */ - + rtems_device_major_number rtems_clock_major = ~0; rtems_device_minor_number rtems_clock_minor; @@ -87,7 +87,7 @@ rtems_isr Clock_isr( #if SIMSPARC_FAST_IDLE LEON_REG.Real_Time_Clock_Counter = CPU_SPARC_CLICKS_PER_TICK; LEON_REG_Set_Real_Time_Clock_Timer_Control( - LEON_REG_TIMER_COUNTER_ENABLE_COUNTING | + LEON_REG_TIMER_COUNTER_ENABLE_COUNTING | LEON_REG_TIMER_COUNTER_LOAD_COUNTER ); #endif @@ -131,11 +131,11 @@ void Install_clock( LEON_REG.Timer_Reload_1 = CPU_SPARC_CLICKS_PER_TICK - 1; LEON_REG.Timer_Control_1 = ( - LEON_REG_TIMER_COUNTER_ENABLE_COUNTING | + LEON_REG_TIMER_COUNTER_ENABLE_COUNTING | LEON_REG_TIMER_COUNTER_RELOAD_AT_ZERO | - LEON_REG_TIMER_COUNTER_LOAD_COUNTER + LEON_REG_TIMER_COUNTER_LOAD_COUNTER ); - + atexit( Clock_exit ); } @@ -165,7 +165,7 @@ void Clock_exit( void ) /* do not restore old vector */ } } - + /* * Clock_initialize * @@ -189,17 +189,17 @@ rtems_device_driver Clock_initialize( ) { Install_clock( Clock_isr ); - + /* * make major/minor avail to others such as shared memory driver */ - + rtems_clock_major = major; rtems_clock_minor = minor; - + return RTEMS_SUCCESSFUL; } - + /* * Clock_control * @@ -224,15 +224,15 @@ rtems_device_driver Clock_control( { uint32_t isrlevel; rtems_libio_ioctl_args_t *args = pargp; - + if (args == 0) goto done; - + /* * This is hokey, but until we get a defined interface * to do this, it will just be this simple... */ - + if (args->command == rtems_build_name('I', 'S', 'R', ' ')) { Clock_isr(CLOCK_VECTOR); @@ -243,7 +243,7 @@ rtems_device_driver Clock_control( (void) set_vector( args->buffer, CLOCK_VECTOR, 1 ); rtems_interrupt_enable( isrlevel ); } - + done: return RTEMS_SUCCESSFUL; } diff --git a/c/src/lib/libbsp/sparc/leon/console/console.c b/c/src/lib/libbsp/sparc/leon/console/console.c index a43db1544d..9723c7b281 100644 --- a/c/src/lib/libbsp/sparc/leon/console/console.c +++ b/c/src/lib/libbsp/sparc/leon/console/console.c @@ -20,7 +20,7 @@ /* * Should we use a polled or interrupt drived console? - * + * * NOTE: This is defined in the custom/leon.cfg file. * * WARNING: In sis 1.6, it did not appear that the UART interrupts @@ -28,7 +28,7 @@ * a character into the TX buffer, an interrupt was generated. * This did not allow enough time for the program to put more * characters in the buffer. So every character resulted in - * "priming" the transmitter. This effectively results in + * "priming" the transmitter. This effectively results in * in a polled console with a useless interrupt per character * on output. It is reasonable to assume that input does not * share this problem although it was not investigated. @@ -49,7 +49,7 @@ void console_outbyte_polled( /* body is in debugputs.c */ /* - * console_inbyte_nonblocking + * console_inbyte_nonblocking * * This routine polls for a character. */ @@ -69,10 +69,10 @@ int console_inbyte_nonblocking( int port ); */ #include <rtems/ringbuf.h> - + Ring_buffer_t TX_Buffer[ 2 ]; boolean Is_TX_active[ 2 ]; - + void *console_termios_data[ 2 ]; /* @@ -81,7 +81,7 @@ void *console_termios_data[ 2 ]; * This routine is the console interrupt handler for Channel 1. * * Input parameters: - * vector - vector number + * vector - vector number * * Output parameters: NONE * @@ -91,10 +91,10 @@ void *console_termios_data[ 2 ]; rtems_isr console_isr_a( rtems_vector_number vector ) -{ +{ char ch; int UStat; - + if ( (UStat = LEON_REG.UART_Status_1) & LEON_REG_UART_STATUS_DR ) { if (UStat & LEON_REG_UART_STATUS_ERR) { LEON_REG.UART_Status_1 = LEON_REG_UART_STATUS_CLR; @@ -103,7 +103,7 @@ rtems_isr console_isr_a( rtems_termios_enqueue_raw_characters( console_termios_data[ 0 ], &ch, 1 ); } - + if ( LEON_REG.UART_Status_1 & LEON_REG_UART_STATUS_THE ) { if ( !Ring_buffer_Is_empty( &TX_Buffer[ 0 ] ) ) { Ring_buffer_Remove_character( &TX_Buffer[ 0 ], ch ); @@ -111,7 +111,7 @@ rtems_isr console_isr_a( } else Is_TX_active[ 0 ] = FALSE; } - + LEON_Clear_interrupt( LEON_INTERRUPT_UART_1_RX_TX ); } @@ -121,13 +121,13 @@ rtems_isr console_isr_a( * This routine is the console interrupt handler for Channel 2. * * Input parameters: - * vector - vector number + * vector - vector number * * Output parameters: NONE * * Return values: NONE */ - + rtems_isr console_isr_b( rtems_vector_number vector ) @@ -192,11 +192,11 @@ void console_exit() * Now wait for all the data to actually get out ... the send register * should be empty. */ - - while ( (LEON_REG.UART_Status_1 & LEON_REG_UART_STATUS_THE) != + + while ( (LEON_REG.UART_Status_1 & LEON_REG_UART_STATUS_THE) != LEON_REG_UART_STATUS_THE ); - while ( (LEON_REG.UART_Status_2 & LEON_REG_UART_STATUS_THE) != + while ( (LEON_REG.UART_Status_2 & LEON_REG_UART_STATUS_THE) != LEON_REG_UART_STATUS_THE ); LEON_REG.UART_Control_1 = 0; @@ -260,7 +260,7 @@ void console_initialize_interrupts( void ) * * Return values: NONE */ - + void console_outbyte_interrupt( int port, char ch @@ -307,7 +307,7 @@ int console_write_support (int minor, const char *buf, int len) * Console Device Driver Entry Points * */ - + rtems_device_driver console_initialize( rtems_device_major_number major, rtems_device_minor_number minor, @@ -333,7 +333,7 @@ rtems_device_driver console_initialize( /* * Initialize Hardware */ - + LEON_REG.UART_Control_1 |= LEON_REG_UART_CTRL_RE | LEON_REG_UART_CTRL_TE; LEON_REG.UART_Control_2 |= LEON_REG_UART_CTRL_RE | LEON_REG_UART_CTRL_TE | LEON_REG_UART_CTRL_RI; /* rx irq default enable for remote debugger */ @@ -381,7 +381,7 @@ rtems_device_driver console_open( assert( minor <= 1 ); if ( minor > 2 ) return RTEMS_INVALID_NUMBER; - + #if (CONSOLE_USE_INTERRUPTS) sc = rtems_termios_open (major, minor, arg, &intrCallbacks); @@ -392,7 +392,7 @@ rtems_device_driver console_open( return RTEMS_SUCCESSFUL; } - + rtems_device_driver console_close( rtems_device_major_number major, rtems_device_minor_number minor, @@ -401,7 +401,7 @@ rtems_device_driver console_close( { return rtems_termios_close (arg); } - + rtems_device_driver console_read( rtems_device_major_number major, rtems_device_minor_number minor, @@ -410,7 +410,7 @@ rtems_device_driver console_read( { return rtems_termios_read (arg); } - + rtems_device_driver console_write( rtems_device_major_number major, rtems_device_minor_number minor, @@ -419,7 +419,7 @@ rtems_device_driver console_write( { return rtems_termios_write (arg); } - + rtems_device_driver console_control( rtems_device_major_number major, rtems_device_minor_number minor, diff --git a/c/src/lib/libbsp/sparc/leon/console/debugputs.c b/c/src/lib/libbsp/sparc/leon/console/debugputs.c index f5e634d1b3..0ff828cbfa 100644 --- a/c/src/lib/libbsp/sparc/leon/console/debugputs.c +++ b/c/src/lib/libbsp/sparc/leon/console/debugputs.c @@ -40,7 +40,7 @@ void console_outbyte_polled( } /* - * console_inbyte_nonblocking + * console_inbyte_nonblocking * * This routine polls for a character. */ @@ -100,7 +100,7 @@ void DEBUG_puts( LEON_Disable_interrupt( LEON_INTERRUPT_UART_1_RX_TX, old_level ); LEON_REG.UART_Control_1 = LEON_REG_UART_CTRL_TE; - for ( s = string ; *s ; s++ ) + for ( s = string ; *s ; s++ ) console_outbyte_polled( 0, *s ); console_outbyte_polled( 0, '\r' ); diff --git a/c/src/lib/libbsp/sparc/leon/include/bsp.h b/c/src/lib/libbsp/sparc/leon/include/bsp.h index 6714a539fa..758768e059 100644 --- a/c/src/lib/libbsp/sparc/leon/include/bsp.h +++ b/c/src/lib/libbsp/sparc/leon/include/bsp.h @@ -10,10 +10,10 @@ * http://www.rtems.com/license/LICENSE. * * Ported to ERC32 implementation of the SPARC by On-Line Applications - * Research Corporation (OAR) under contract to the European Space + * Research Corporation (OAR) under contract to the European Space * Agency (ESA). * - * ERC32 modifications of respective RTEMS file: COPYRIGHT (c) 1995. + * ERC32 modifications of respective RTEMS file: COPYRIGHT (c) 1995. * European Space Agency. * * $Id$ @@ -91,9 +91,9 @@ extern int rtems_leon_open_eth_driver_attach (struct rtems_bsdnet_ifconfig *conf #define Cause_tm27_intr() \ asm volatile( "ta 0x10; nop " ); -#define Clear_tm27_intr() +#define Clear_tm27_intr() -#define Lower_tm27_intr() +#define Lower_tm27_intr() /* * The asynchronous trap is an arbitrarily chosen ERC32 interrupt source. @@ -106,11 +106,11 @@ extern int rtems_leon_open_eth_driver_attach (struct rtems_bsdnet_ifconfig *conf #define TEST_INTERRUPT_SOURCE2 LEON_INTERRUPT_EXTERNAL_1+1 #define TEST_VECTOR2 LEON_TRAP_TYPE( TEST_INTERRUPT_SOURCE2 ) #define MUST_WAIT_FOR_INTERRUPT 1 - + #define Install_tm27_vector( handler ) \ set_vector( (handler), TEST_VECTOR, 1 ); \ set_vector( (handler), TEST_VECTOR2, 1 ); - + #define Cause_tm27_intr() \ do { \ LEON_Force_interrupt( TEST_INTERRUPT_SOURCE+(Interrupt_nest>>1)); \ @@ -118,10 +118,10 @@ extern int rtems_leon_open_eth_driver_attach (struct rtems_bsdnet_ifconfig *conf nop(); \ nop(); \ } while (0) - + #define Clear_tm27_intr() \ LEON_Clear_interrupt( TEST_INTERRUPT_SOURCE ) - + #define Lower_tm27_intr() #endif @@ -144,28 +144,28 @@ extern void Clock_delay(uint32_t microseconds); extern int RAM_START; extern int RAM_END; extern int RAM_SIZE; - + extern int PROM_START; extern int PROM_END; extern int PROM_SIZE; extern int CLOCK_SPEED; - + extern int end; /* last address in the program */ /* * Device Driver Table Entries */ - + /* * NOTE: Use the standard Console driver entry */ - + /* * NOTE: Use the standard Clock driver entry */ - - + + /* miscellaneous stuff assumed to exist */ void bsp_cleanup( void ); diff --git a/c/src/lib/libbsp/sparc/leon/include/coverhd.h b/c/src/lib/libbsp/sparc/leon/include/coverhd.h index eea7cc91ca..1d50a4ff7a 100644 --- a/c/src/lib/libbsp/sparc/leon/include/coverhd.h +++ b/c/src/lib/libbsp/sparc/leon/include/coverhd.h @@ -11,10 +11,10 @@ * http://www.rtems.com/license/LICENSE. * * Ported to ERC32 implementation of the SPARC by On-Line Applications - * Research Corporation (OAR) under contract to the European Space + * Research Corporation (OAR) under contract to the European Space * Agency (ESA). * - * ERC32 modifications of respective RTEMS file: COPYRIGHT (c) 1995. + * ERC32 modifications of respective RTEMS file: COPYRIGHT (c) 1995. * European Space Agency. * * $Id$ diff --git a/c/src/lib/libbsp/sparc/leon/include/leon.h b/c/src/lib/libbsp/sparc/leon/include/leon.h index 130ef177c5..ac9822e3fa 100644 --- a/c/src/lib/libbsp/sparc/leon/include/leon.h +++ b/c/src/lib/libbsp/sparc/leon/include/leon.h @@ -5,9 +5,9 @@ * This CPU has a number of on-board peripherals and * was developed by the European Space Agency to target space applications. * - * NOTE: Other than where absolutely required, this version currently - * supports only the peripherals and bits used by the basic board - * support package. This includes at least significant pieces of + * NOTE: Other than where absolutely required, this version currently + * supports only the peripherals and bits used by the basic board + * support package. This includes at least significant pieces of * the following items: * * + UART Channels A and B @@ -23,20 +23,20 @@ * http://www.rtems.com/license/LICENSE. * * Ported to LEON implementation of the SPARC by On-Line Applications - * Research Corporation (OAR) under contract to the European Space + * Research Corporation (OAR) under contract to the European Space * Agency (ESA). * - * LEON modifications of respective RTEMS file: COPYRIGHT (c) 1995. + * LEON modifications of respective RTEMS file: COPYRIGHT (c) 1995. * European Space Agency. * * $Id$ */ - + #ifndef _INCLUDE_LEON_h #define _INCLUDE_LEON_h #include <rtems/score/sparc.h> - + #ifdef __cplusplus extern "C" { #endif @@ -44,7 +44,7 @@ extern "C" { /* * Interrupt Sources * - * The interrupt source numbers directly map to the trap type and to + * The interrupt source numbers directly map to the trap type and to * the bits used in the Interrupt Clear, Interrupt Force, Interrupt Mask, * and the Interrupt Pending Registers. */ @@ -72,7 +72,7 @@ extern "C" { * * Source: Table 8 - Interrupt Trap Type and Default Priority Assignments * - * NOTE: The priority level for each source corresponds to the least + * NOTE: The priority level for each source corresponds to the least * significant nibble of the trap type. */ @@ -85,12 +85,12 @@ extern "C" { (_trap) <= LEON_TRAP_TYPE( LEON_INTERRUPT_EMPTY6 ) ) /* - * Structure for LEON memory mapped registers. + * Structure for LEON memory mapped registers. * * Source: Section 6.1 - On-chip registers * - * NOTE: There is only one of these structures per CPU, its base address - * is 0x80000000, and the variable LEON_REG is placed there by the + * NOTE: There is only one of these structures per CPU, its base address + * is 0x80000000, and the variable LEON_REG is placed there by the * linkcmds file. */ @@ -107,7 +107,7 @@ typedef struct { volatile unsigned int Leon_Configuration; volatile unsigned int dummy2; volatile unsigned int dummy3; - volatile unsigned int dummy4; + volatile unsigned int dummy4; volatile unsigned int dummy5; volatile unsigned int dummy6; volatile unsigned int dummy7; @@ -213,7 +213,7 @@ typedef struct { #define LEON_MEMORY_CONFIGURATION_RAM_SIZE_MASK 0x00001E00 - + /* * The following defines the bits in the Timer Control Register. */ @@ -230,8 +230,8 @@ typedef struct { * */ -#define LEON_REG_UART_CONTROL_RTD 0x000000FF /* RX/TX data */ - +#define LEON_REG_UART_CONTROL_RTD 0x000000FF /* RX/TX data */ + /* * The following defines the bits in the LEON UART Status Registers. */ @@ -245,7 +245,7 @@ typedef struct { #define LEON_REG_UART_STATUS_FE 0x00000040 /* RX Framing Error */ #define LEON_REG_UART_STATUS_ERR 0x00000078 /* Error Mask */ - + /* * The following defines the bits in the LEON UART Status Registers. */ @@ -269,7 +269,7 @@ typedef struct { */ extern LEON_Register_Map LEON_REG; - + /* * Macros to manipulate the Interrupt Clear, Interrupt Force, Interrupt Mask, * and the Interrupt Pending Registers. @@ -289,13 +289,13 @@ extern LEON_Register_Map LEON_REG; do { \ LEON_REG.Interrupt_Force = (1 << (_source)); \ } while (0) - + #define LEON_Is_interrupt_pending( _source ) \ (LEON_REG.Interrupt_Pending & (1 << (_source))) - + #define LEON_Is_interrupt_masked( _source ) \ (LEON_REG.Interrupt_Masked & (1 << (_source))) - + #define LEON_Mask_interrupt( _source ) \ do { \ uint32_t _level; \ @@ -304,7 +304,7 @@ extern LEON_Register_Map LEON_REG; LEON_REG.Interrupt_Mask &= ~(1 << (_source)); \ sparc_enable_interrupts( _level ); \ } while (0) - + #define LEON_Unmask_interrupt( _source ) \ do { \ uint32_t _level; \ @@ -325,7 +325,7 @@ extern LEON_Register_Map LEON_REG; sparc_enable_interrupts( _level ); \ (_previous) &= _mask; \ } while (0) - + #define LEON_Restore_interrupt( _source, _previous ) \ do { \ uint32_t _level; \ @@ -349,7 +349,7 @@ extern LEON_Register_Map LEON_REG; * 0 = stop counter at zero * * D2 - Counter Load - * 1 = load counter with preset value + * 1 = load counter with preset value * 0 = no function * */ @@ -373,6 +373,6 @@ extern LEON_Register_Map LEON_REG; #ifdef __cplusplus } #endif - + #endif /* !_INCLUDE_LEON_h */ /* end of include file */ diff --git a/c/src/lib/libbsp/sparc/leon/leon_open_eth/leon_open_eth.c b/c/src/lib/libbsp/sparc/leon/leon_open_eth/leon_open_eth.c index 8ec61779f5..966abbfd05 100644 --- a/c/src/lib/libbsp/sparc/leon/leon_open_eth/leon_open_eth.c +++ b/c/src/lib/libbsp/sparc/leon/leon_open_eth/leon_open_eth.c @@ -27,8 +27,8 @@ #define OPEN_ETH_VECTOR 0x1C open_eth_configuration_t leon_open_eth_configuration = { - OPEN_ETH_BASE_ADDRESS, /* base address */ - OPEN_ETH_VECTOR, /* vector number */ + OPEN_ETH_BASE_ADDRESS, /* base address */ + OPEN_ETH_VECTOR, /* vector number */ TDA_COUNT, /* number of transmit descriptors */ RDA_COUNT /* number of receive descriptors */ }; diff --git a/c/src/lib/libbsp/sparc/leon/startup/boardinit.S b/c/src/lib/libbsp/sparc/leon/startup/boardinit.S index dc918ef970..652346b9f6 100644 --- a/c/src/lib/libbsp/sparc/leon/startup/boardinit.S +++ b/c/src/lib/libbsp/sparc/leon/startup/boardinit.S @@ -20,7 +20,7 @@ __bsp_board_init: set SYM(LEON_REG), %l0 ! %l0 = base address of peripherals ld [%l0+LEON_REG_CACHECTRL_OFFSET], %l1 ! Check if LEON has been initialised - andcc %l1, 3, %g0 + andcc %l1, 3, %g0 bne 2f nop diff --git a/c/src/lib/libbsp/sparc/leon/startup/setvec.c b/c/src/lib/libbsp/sparc/leon/startup/setvec.c index fc81f43ae3..d9699ce1ca 100644 --- a/c/src/lib/libbsp/sparc/leon/startup/setvec.c +++ b/c/src/lib/libbsp/sparc/leon/startup/setvec.c @@ -21,10 +21,10 @@ * http://www.rtems.com/license/LICENSE. * * Ported to LEON implementation of the SPARC by On-Line Applications - * Research Corporation (OAR) under contract to the European Space + * Research Corporation (OAR) under contract to the European Space * Agency (ESA). * - * LEON modifications of respective RTEMS file: COPYRIGHT (c) 1995. + * LEON modifications of respective RTEMS file: COPYRIGHT (c) 1995. * European Space Agency. * * $Id$ @@ -44,13 +44,13 @@ rtems_isr_entry set_vector( /* returns old vector */ if ( type ) rtems_interrupt_catch( handler, vector, &previous_isr ); - else + else _CPU_ISR_install_raw_handler( vector, handler, (void *)&previous_isr ); real_trap = SPARC_REAL_TRAP_NUMBER( vector ); if ( LEON_INT_TRAP( real_trap ) ) { - + source = LEON_TRAP_SOURCE( real_trap ); LEON_Clear_interrupt( source ); diff --git a/c/src/lib/libbsp/sparc/leon/startup/spurious.c b/c/src/lib/libbsp/sparc/leon/startup/spurious.c index 47eb8cd3c0..081d9ba3a1 100644 --- a/c/src/lib/libbsp/sparc/leon/startup/spurious.c +++ b/c/src/lib/libbsp/sparc/leon/startup/spurious.c @@ -1,11 +1,11 @@ /* * LEON Spurious Trap Handler * - * This is just enough of a trap handler to let us know what + * This is just enough of a trap handler to let us know what * the likely source of the trap was. * - * Developed as part of the port of RTEMS to the LEON implementation - * of the SPARC by On-Line Applications Research Corporation (OAR) + * Developed as part of the port of RTEMS to the LEON implementation + * of the SPARC by On-Line Applications Research Corporation (OAR) * under contract to the European Space Agency (ESA). * * COPYRIGHT (c) 1995. European Space Agency. @@ -60,33 +60,33 @@ rtems_isr bsp_spurious_handler( * First the ones defined by the basic architecture */ - case 0x00: + case 0x00: DEBUG_puts( "reset" ); break; - case 0x01: + case 0x01: DEBUG_puts( "instruction access exception" ); break; - case 0x02: + case 0x02: DEBUG_puts( "illegal instruction" ); break; - case 0x03: + case 0x03: DEBUG_puts( "privileged instruction" ); break; - case 0x04: + case 0x04: DEBUG_puts( "fp disabled" ); break; - case 0x07: + case 0x07: DEBUG_puts( "memory address not aligned" ); break; - case 0x08: + case 0x08: DEBUG_puts( "fp exception" ); break; - case 0x09: + case 0x09: strcpy(line, "data access exception at 0x " ); itos(LEON_REG.Failed_Address, &line[27]); DEBUG_puts( line ); break; - case 0x0A: + case 0x0A: DEBUG_puts( "tag overflow" ); break; @@ -160,7 +160,7 @@ void bsp_spurious_initialize() */ if (( trap == 5 || trap == 6 ) || - (( trap >= 0x11 ) && ( trap <= 0x1f )) || + (( trap >= 0x11 ) && ( trap <= 0x1f )) || (( trap >= 0x70 ) && ( trap <= 0x83 ))) continue; diff --git a/c/src/lib/libbsp/sparc/leon/timer/timer.c b/c/src/lib/libbsp/sparc/leon/timer/timer.c index 9cf535477a..22cbe0446a 100644 --- a/c/src/lib/libbsp/sparc/leon/timer/timer.c +++ b/c/src/lib/libbsp/sparc/leon/timer/timer.c @@ -10,10 +10,10 @@ * http://www.rtems.com/license/LICENSE. * * Ported to LEON implementation of the SPARC by On-Line Applications - * Research Corporation (OAR) under contract to the European Space + * Research Corporation (OAR) under contract to the European Space * Agency (ESA). * - * LEON modifications of respective RTEMS file: COPYRIGHT (c) 1995. + * LEON modifications of respective RTEMS file: COPYRIGHT (c) 1995. * European Space Agency. * * $Id$ @@ -42,8 +42,8 @@ void Timer_initialize() Timer_driver_Is_initialized = TRUE; } - LEON_REG.Timer_Control_2 = ( - LEON_REG_TIMER_COUNTER_ENABLE_COUNTING | + LEON_REG.Timer_Control_2 = ( + LEON_REG_TIMER_COUNTER_ENABLE_COUNTING | LEON_REG_TIMER_COUNTER_LOAD_COUNTER ); |