diff options
Diffstat (limited to 'c/src/lib/libcpu/arm/s3c2400')
-rw-r--r-- | c/src/lib/libcpu/arm/s3c2400/clock/support.c | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/arm/s3c2400/include/s3c2400.h | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/arm/s3c2400/irq/bsp_irq_asm.S | 14 | ||||
-rw-r--r-- | c/src/lib/libcpu/arm/s3c2400/irq/bsp_irq_init.c | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/arm/s3c2400/irq/irq.c | 8 | ||||
-rw-r--r-- | c/src/lib/libcpu/arm/s3c2400/irq/irq.h | 60 | ||||
-rw-r--r-- | c/src/lib/libcpu/arm/s3c2400/timer/timer.c | 22 |
7 files changed, 56 insertions, 56 deletions
diff --git a/c/src/lib/libcpu/arm/s3c2400/clock/support.c b/c/src/lib/libcpu/arm/s3c2400/clock/support.c index 7d85c1a9f4..99bd21168a 100644 --- a/c/src/lib/libcpu/arm/s3c2400/clock/support.c +++ b/c/src/lib/libcpu/arm/s3c2400/clock/support.c @@ -41,10 +41,10 @@ uint32_t get_UCLK(void) /* return HCLK frequency */ uint32_t get_HCLK(void) { - if (rCLKDIVN & 0x2) + if (rCLKDIVN & 0x2) return get_FCLK()/2; else - return get_FCLK(); + return get_FCLK(); } /* return PCLK frequency */ diff --git a/c/src/lib/libcpu/arm/s3c2400/include/s3c2400.h b/c/src/lib/libcpu/arm/s3c2400/include/s3c2400.h index 98138ab08b..b8243a7790 100644 --- a/c/src/lib/libcpu/arm/s3c2400/include/s3c2400.h +++ b/c/src/lib/libcpu/arm/s3c2400/include/s3c2400.h @@ -472,7 +472,7 @@ typedef union unsigned long all; } LCDCON1; -typedef union { +typedef union { struct { unsigned VSPW:6; /* TFT: Vertical sync pulse width determines the */ /* VSYNC pulse's high level width by counting the */ diff --git a/c/src/lib/libcpu/arm/s3c2400/irq/bsp_irq_asm.S b/c/src/lib/libcpu/arm/s3c2400/irq/bsp_irq_asm.S index 5fab93dc2f..d3df84dd11 100644 --- a/c/src/lib/libcpu/arm/s3c2400/irq/bsp_irq_asm.S +++ b/c/src/lib/libcpu/arm/s3c2400/irq/bsp_irq_asm.S @@ -14,24 +14,24 @@ */ #define __asm__ - -/* - * Function to obtain, execute an IT handler and acknowledge the IT + +/* + * Function to obtain, execute an IT handler and acknowledge the IT */ .globl bsp_interrupt_dispatch - -bsp_interrupt_dispatch : + +bsp_interrupt_dispatch : ldr r0, =0x14400014 /* Read rINTOFFSET */ ldr r1, [r0] ldr r0, =bsp_vector_table ldr r0, [r0, r1, LSL #2] /* Read the address */ - + stmdb sp!,{lr} ldr lr, =IRQ_return /* prepare the return from handler */ - + mov pc, r0 IRQ_return: diff --git a/c/src/lib/libcpu/arm/s3c2400/irq/bsp_irq_init.c b/c/src/lib/libcpu/arm/s3c2400/irq/bsp_irq_init.c index c3122a0b8d..2e1e0c4ae1 100644 --- a/c/src/lib/libcpu/arm/s3c2400/irq/bsp_irq_init.c +++ b/c/src/lib/libcpu/arm/s3c2400/irq/bsp_irq_init.c @@ -18,7 +18,7 @@ extern void default_int_handler(); -void BSP_rtems_irq_mngt_init() +void BSP_rtems_irq_mngt_init() { long *vectorTable; int i; diff --git a/c/src/lib/libcpu/arm/s3c2400/irq/irq.c b/c/src/lib/libcpu/arm/s3c2400/irq/irq.c index 6cef0e9268..20bcbb409f 100644 --- a/c/src/lib/libcpu/arm/s3c2400/irq/irq.c +++ b/c/src/lib/libcpu/arm/s3c2400/irq/irq.c @@ -41,7 +41,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) { rtems_irq_hdl *HdlTable; rtems_interrupt_level level; - + if (!isValidInterrupt(irq->name)) { return 0; } @@ -53,7 +53,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) if (*(HdlTable + irq->name) != default_int_handler) { return 0; } - + rtems_interrupt_disable(level); /* @@ -78,7 +78,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) { rtems_irq_hdl *HdlTable; rtems_interrupt_level level; - + if (!isValidInterrupt(irq->name)) { return 0; } @@ -103,7 +103,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) * restore the default irq value */ *(HdlTable + irq->name) = default_int_handler; - + rtems_interrupt_enable(level); return 1; diff --git a/c/src/lib/libcpu/arm/s3c2400/irq/irq.h b/c/src/lib/libcpu/arm/s3c2400/irq/irq.h index f58dbb9d98..1700285df5 100644 --- a/c/src/lib/libcpu/arm/s3c2400/irq/irq.h +++ b/c/src/lib/libcpu/arm/s3c2400/irq/irq.h @@ -23,7 +23,7 @@ extern "C" { /* * Include some preprocessor value also used by assember code */ - + #include <rtems.h> #include <s3c2400.h> @@ -41,35 +41,35 @@ extern void default_int_handler(); #define BSP_EINT5 5 #define BSP_EINT6 6 #define BSP_EINT7 7 -#define BSP_INT_TICK 8 -#define BSP_INT_WDT 9 -#define BSP_INT_TIMER0 10 -#define BSP_INT_TIMER1 11 -#define BSP_INT_TIMER2 12 -#define BSP_INT_TIMER3 13 -#define BSP_INT_TIMER4 14 -#define BSP_INT_UERR01 15 -#define _res0 16 -#define BSP_INT_DMA0 17 -#define BSP_INT_DMA1 18 -#define BSP_INT_DMA2 19 -#define BSP_INT_DMA3 20 -#define BSP_INT_MMC 21 -#define BSP_INT_SPI 22 -#define BSP_INT_URXD0 23 -#define BSP_INT_URXD1 24 -#define BSP_INT_USBD 25 -#define BSP_INT_USBH 26 -#define BSP_INT_IIC 27 -#define BSP_INT_UTXD0 28 -#define BSP_INT_UTXD1 29 -#define BSP_INT_RTC 30 -#define BSP_INT_ADC 31 -#define BSP_MAX_INT 32 +#define BSP_INT_TICK 8 +#define BSP_INT_WDT 9 +#define BSP_INT_TIMER0 10 +#define BSP_INT_TIMER1 11 +#define BSP_INT_TIMER2 12 +#define BSP_INT_TIMER3 13 +#define BSP_INT_TIMER4 14 +#define BSP_INT_UERR01 15 +#define _res0 16 +#define BSP_INT_DMA0 17 +#define BSP_INT_DMA1 18 +#define BSP_INT_DMA2 19 +#define BSP_INT_DMA3 20 +#define BSP_INT_MMC 21 +#define BSP_INT_SPI 22 +#define BSP_INT_URXD0 23 +#define BSP_INT_URXD1 24 +#define BSP_INT_USBD 25 +#define BSP_INT_USBH 26 +#define BSP_INT_IIC 27 +#define BSP_INT_UTXD0 28 +#define BSP_INT_UTXD1 29 +#define BSP_INT_RTC 30 +#define BSP_INT_ADC 31 +#define BSP_MAX_INT 32 extern void *bsp_vector_table; #define VECTOR_TABLE &bsp_vector_table - + /* * Type definition for RTEMS managed interrupts */ @@ -101,9 +101,9 @@ typedef struct __rtems_irq_connect_data__ { * It is usually called immediately AFTER connecting the interrupt handler. * RTEMS may well need such a function when restoring normal interrupt * processing after a debug session. - * + * */ - rtems_irq_enable on; + rtems_irq_enable on; /* * function for disabling interrupts at device level (ONLY!). @@ -178,7 +178,7 @@ void BSP_rtems_irq_mngt_init(); * 4) perform rescheduling when necessary, * 5) restore the C scratch registers... * 6) restore initial execution flow - * + * */ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data*); diff --git a/c/src/lib/libcpu/arm/s3c2400/timer/timer.c b/c/src/lib/libcpu/arm/s3c2400/timer/timer.c index aa9dd22077..171ce4e5a6 100644 --- a/c/src/lib/libcpu/arm/s3c2400/timer/timer.c +++ b/c/src/lib/libcpu/arm/s3c2400/timer/timer.c @@ -14,7 +14,7 @@ * benchmark_timer_initialize() and benchmark_timer_read(). benchmark_timer_read() usually returns * the number of microseconds since benchmark_timer_initialize() exitted. * - * It is important that the timer start/stop overhead be determined + * It is important that the timer start/stop overhead be determined * when porting or modifying this code. * * $Id$ @@ -29,7 +29,7 @@ uint32_t g_freq; bool benchmark_timer_find_average_overhead; - + /* * Set up Timer 1 */ @@ -37,7 +37,7 @@ void benchmark_timer_initialize( void ) { uint32_t cr; - /* stop TIMER1*/ + /* stop TIMER1*/ cr=rTCON & 0xFFFFF0FF; rTCON=(cr | (0x0 << 8)); @@ -45,15 +45,15 @@ void benchmark_timer_initialize( void ) cr=rTCFG1 & 0xFFFFFF0F; rTCFG1=(cr | (0<<4)); - /* input freq=PLCK/2 Mhz*/ - g_freq = get_PCLK() / 2000; + /* input freq=PLCK/2 Mhz*/ + g_freq = get_PCLK() / 2000; rTCNTB1 = 0xFFFF; - /* start TIMER1 with manual reload */ + /* start TIMER1 with manual reload */ cr=rTCON & 0xFFFFF0FF; rTCON=(cr | (0x1 << 9)); rTCON=(cr | (0x1 << 8)); - + g_start = rTCNTO1; } @@ -83,16 +83,16 @@ int benchmark_timer_read( void ) * interrupts since the timer was initialized and clicks since the last * interrupts. */ - + total = (g_start - t); /* convert to microseconds */ - total = (total*1000) / g_freq; + total = (total*1000) / g_freq; if ( benchmark_timer_find_average_overhead == 1 ) { - return (int) total; + return (int) total; } else if ( total < LEAST_VALID ) { - return 0; + return 0; } /* |