From f05b2ac0bc4626e854afc6e6a5d1b88071adbd7c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Apr 2004 16:01:48 +0000 Subject: Remove duplicate white lines. --- c/src/lib/libbsp/arm/arm_bare_bsp/clock/clockdrv.c | 1 - c/src/lib/libbsp/arm/arm_bare_bsp/include/bsp.h | 1 - .../libbsp/arm/arm_bare_bsp/include/registers.h | 4 --- .../lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_init.c | 1 - c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c | 4 --- c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.h | 2 -- c/src/lib/libbsp/arm/arm_bare_bsp/start/start.S | 4 --- .../lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c | 3 --- c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c | 1 - c/src/lib/libbsp/arm/armulator/clock/clockdrv.c | 1 - .../libbsp/arm/armulator/console/mon-syscalls.S | 2 -- c/src/lib/libbsp/arm/armulator/start/start.S | 1 - c/src/lib/libbsp/arm/armulator/startup/libcfunc.c | 1 - c/src/lib/libbsp/arm/armulator/startup/swi.h | 1 - c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c | 3 --- c/src/lib/libbsp/arm/edb7312/console/uart.c | 3 --- c/src/lib/libbsp/arm/edb7312/include/bsp.h | 5 ---- c/src/lib/libbsp/arm/edb7312/irq/irq.h | 3 --- c/src/lib/libbsp/arm/edb7312/start/start.S | 3 --- c/src/lib/libbsp/arm/edb7312/startup/bspstart.c | 6 ----- c/src/lib/libbsp/arm/shared/comm/console.c | 9 ------- c/src/lib/libbsp/arm/shared/comm/uart.c | 5 ---- c/src/lib/libbsp/arm/shared/irq/irq_asm.S | 4 --- c/src/lib/libbsp/arm/vegaplus/clock/clockdrv.c | 1 - c/src/lib/libbsp/arm/vegaplus/include/bsp.h | 1 - c/src/lib/libbsp/arm/vegaplus/include/registers.h | 31 ---------------------- c/src/lib/libbsp/arm/vegaplus/irq/bsp_irq_init.c | 1 - c/src/lib/libbsp/arm/vegaplus/irq/irq.c | 4 --- c/src/lib/libbsp/arm/vegaplus/irq/irq.h | 2 -- c/src/lib/libbsp/arm/vegaplus/start/start.S | 4 --- c/src/lib/libbsp/arm/vegaplus/startup/bspstart.c | 3 --- c/src/lib/libbsp/arm/vegaplus/startup/exit.c | 1 - 32 files changed, 116 deletions(-) (limited to 'c/src/lib/libbsp/arm') diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/clock/clockdrv.c b/c/src/lib/libbsp/arm/arm_bare_bsp/clock/clockdrv.c index c49150fba6..f61b66e42d 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/clock/clockdrv.c +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/clock/clockdrv.c @@ -14,7 +14,6 @@ #define Clock_driver_support_install_isr( _new, _old ) \ do { _old = 0; } while(0) - #define Clock_driver_support_initialize_hardware() #define Clock_driver_support_shutdown_hardware() diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/include/bsp.h b/c/src/lib/libbsp/arm/arm_bare_bsp/include/bsp.h index 761b5f3604..abefa5502b 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/include/bsp.h +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/include/bsp.h @@ -14,7 +14,6 @@ | $Id$ +--------------------------------------------------------------------------*/ - #ifndef __BSP_H_ #define __BSP_H_ diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/include/registers.h b/c/src/lib/libbsp/arm/arm_bare_bsp/include/registers.h index 3b11c3856f..9c1c8369bb 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/include/registers.h +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/include/registers.h @@ -10,7 +10,6 @@ * */ - #ifndef __REGS_H__ #define __REGS_H__ @@ -22,8 +21,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #endif - - /* * Here must be "defined" each register, to use with Regs as * LM_Regs[REGISTER1] = value @@ -32,7 +29,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define REGISTER1 1 #define REGISTER2 2 - /* * define for UART registers to be able * to compile and link arm_bare_bsp diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_init.c b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_init.c index f307a4171c..c96df8f6e2 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_init.c +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/bsp_irq_init.c @@ -16,7 +16,6 @@ #include #include - void BSP_rtems_irq_mngt_init() { /* diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c index 7a0c222110..3e1f17f488 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c @@ -12,14 +12,12 @@ * $Id$ */ - #include #include #include #include #include - /* * This function check that the value given for the irq line * is valid. @@ -103,8 +101,6 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) return 1; } - - void _ThreadProcessSignalsFromIrq (CPU_Exception_frame* ctx) { /* diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.h b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.h index d773e43161..2d536d871b 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.h +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.h @@ -110,7 +110,6 @@ typedef struct __rtems_irq_connect_data__ { */ void BSP_rtems_irq_mngt_init(); - /* * function to connect a particular irq handler. This hanlder will NOT be called * directly as the result of the corresponding interrupt. Instead, a RTEMS @@ -159,7 +158,6 @@ int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* ptr); */ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data*); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/start/start.S b/c/src/lib/libbsp/arm/arm_bare_bsp/start/start.S index 6e9db56afe..7352d30123 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/start/start.S +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/start/start.S @@ -29,18 +29,15 @@ .equ I_Bit, 0x80 .equ F_Bit, 0x40 - .text .globl _start - _start: /* * Here is the code to initialize the low-level BSP environment * (Chip Select, PLL, ....?) - /* Copy data from FLASH to RAM */ LDR r0, =_initdata /* load address of region */ LDR r1, =0x400000 /* execution address of region */ @@ -61,7 +58,6 @@ zi_init: STRLOT r2, [r0], #4 BLO zi_init - /* Load basic ARM7 interrupt table */ VectorInit: MOV R8, #0 diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c index ecef2a0d96..416552d80c 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c @@ -13,7 +13,6 @@ | +--------------------------------------------------------------------------*/ - #include #include #include @@ -81,7 +80,6 @@ void bsp_pretasking_hook(void) rtemsFreeMemStart += _heap_size; /* HEAP_SIZE in KBytes */ - #ifdef RTEMS_DEBUG rtems_debug_enable(RTEMS_DEBUG_ALL_MASK); @@ -90,7 +88,6 @@ void bsp_pretasking_hook(void) } /* bsp_pretasking_hook */ - /*-------------------------------------------------------------------------+ | Function: bsp_start | Description: Called before main is invoked. diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c index a99faeb9ba..03e240cc33 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c @@ -13,7 +13,6 @@ | +--------------------------------------------------------------------------*/ - #include #include #include diff --git a/c/src/lib/libbsp/arm/armulator/clock/clockdrv.c b/c/src/lib/libbsp/arm/armulator/clock/clockdrv.c index c49150fba6..f61b66e42d 100644 --- a/c/src/lib/libbsp/arm/armulator/clock/clockdrv.c +++ b/c/src/lib/libbsp/arm/armulator/clock/clockdrv.c @@ -14,7 +14,6 @@ #define Clock_driver_support_install_isr( _new, _old ) \ do { _old = 0; } while(0) - #define Clock_driver_support_initialize_hardware() #define Clock_driver_support_shutdown_hardware() diff --git a/c/src/lib/libbsp/arm/armulator/console/mon-syscalls.S b/c/src/lib/libbsp/arm/armulator/console/mon-syscalls.S index e844274fc8..0c6dc97f66 100644 --- a/c/src/lib/libbsp/arm/armulator/console/mon-syscalls.S +++ b/c/src/lib/libbsp/arm/armulator/console/mon-syscalls.S @@ -11,8 +11,6 @@ #define ENTRY(name) \ _ENTRY(_C_LABEL(name)) - - ENTRY(_sys_exit) lda 257,g13 calls g13 diff --git a/c/src/lib/libbsp/arm/armulator/start/start.S b/c/src/lib/libbsp/arm/armulator/start/start.S index bd725115f1..25caf689bb 100644 --- a/c/src/lib/libbsp/arm/armulator/start/start.S +++ b/c/src/lib/libbsp/arm/armulator/start/start.S @@ -64,7 +64,6 @@ _mainCRTStartup: ldr a3, .LC2 sub a3, a3, a1 /* Third arg: length of block */ - #ifdef __thumb__ /* Enter Thumb mode.... */ add a4, pc, #1 /* Get the address of the Thumb block */ diff --git a/c/src/lib/libbsp/arm/armulator/startup/libcfunc.c b/c/src/lib/libbsp/arm/armulator/startup/libcfunc.c index 09714436dd..82b4758257 100644 --- a/c/src/lib/libbsp/arm/armulator/startup/libcfunc.c +++ b/c/src/lib/libbsp/arm/armulator/startup/libcfunc.c @@ -25,7 +25,6 @@ do_AngelSWI (int reason, void * arg) } #endif /* ARM_RDI_MONITOR */ - void abort_program (void) { diff --git a/c/src/lib/libbsp/arm/armulator/startup/swi.h b/c/src/lib/libbsp/arm/armulator/startup/swi.h index 91fad59121..2dae9925bd 100644 --- a/c/src/lib/libbsp/arm/armulator/startup/swi.h +++ b/c/src/lib/libbsp/arm/armulator/startup/swi.h @@ -30,7 +30,6 @@ #define SWI_InstallHandler 0x70 #define SWI_GenerateError 0x71 - /* Now the SWI numbers and reason codes for RDI (Angel) monitors */ #define AngelSWI_ARM (0x123456) #ifdef __thumb__ diff --git a/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c b/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c index 5850436de3..5f2adf0cb5 100644 --- a/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c +++ b/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c @@ -16,7 +16,6 @@ #include #include - rtems_isr clock_isr(rtems_vector_number vector); rtems_isr Clock_isr(rtems_vector_number vector); static void clock_isr_on(const rtems_irq_connect_data *unused); @@ -43,7 +42,6 @@ rtems_irq_connect_data clock_isr_data = {BSP_TC1OI, BSP_install_rtems_irq_handler(&clock_isr_data); \ } while(0) - /* * Set up the clock hardware */ @@ -74,5 +72,4 @@ static int clock_isr_is_on(const rtems_irq_connect_data *irq) return 1; } - #include "../../../shared/clockdrv_shell.c" diff --git a/c/src/lib/libbsp/arm/edb7312/console/uart.c b/c/src/lib/libbsp/arm/edb7312/console/uart.c index c2628756e0..381eae680b 100644 --- a/c/src/lib/libbsp/arm/edb7312/console/uart.c +++ b/c/src/lib/libbsp/arm/edb7312/console/uart.c @@ -100,8 +100,6 @@ int uart_poll_read(int minor) return -1; } - - err = *data_reg; c = err & 0xff; err &= (EP7312_UART_FRMERR | EP7312_UART_PARERR | EP7312_UART_OVERR); @@ -157,5 +155,4 @@ static void uart_init(int minor) EP7312_UART_FIFOEN | 0x17); /* 9600 baud */ - } diff --git a/c/src/lib/libbsp/arm/edb7312/include/bsp.h b/c/src/lib/libbsp/arm/edb7312/include/bsp.h index 1c86164ced..c08ebcf72b 100644 --- a/c/src/lib/libbsp/arm/edb7312/include/bsp.h +++ b/c/src/lib/libbsp/arm/edb7312/include/bsp.h @@ -50,17 +50,12 @@ extern rtems_configuration_table BSP_Configuration; #define Lower_tm27_intr() - - /* * Network driver configuration */ #define RTEMS_BSP_NETWORK_DRIVER_NAME "eth0" #define RTEMS_BSP_NETWORK_DRIVER_ATTACH cs8900_driver_attach - - - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/arm/edb7312/irq/irq.h b/c/src/lib/libbsp/arm/edb7312/irq/irq.h index b87586f459..2a2a26a673 100644 --- a/c/src/lib/libbsp/arm/edb7312/irq/irq.h +++ b/c/src/lib/libbsp/arm/edb7312/irq/irq.h @@ -67,8 +67,6 @@ typedef enum { BSP_MAX_INT, } rtems_irq_symbolic_name; - - /* * Type definition for RTEMS managed interrupts */ @@ -137,7 +135,6 @@ typedef struct __rtems_irq_connect_data__ { */ void BSP_rtems_irq_mngt_init(); - /* * function to connect a particular irq handler. This hanlder will NOT be called * directly as the result of the corresponding interrupt. Instead, a RTEMS diff --git a/c/src/lib/libbsp/arm/edb7312/start/start.S b/c/src/lib/libbsp/arm/edb7312/start/start.S index 95b3bc88fa..2964116fc8 100644 --- a/c/src/lib/libbsp/arm/edb7312/start/start.S +++ b/c/src/lib/libbsp/arm/edb7312/start/start.S @@ -14,7 +14,6 @@ * $Id$ */ - /* Some standard definitions...*/ .equ Mode_USR, 0x10 @@ -29,11 +28,9 @@ .equ I_Bit, 0x80 .equ F_Bit, 0x40 - .text .globl _start - _start: /* store the sp */ mov r12, sp diff --git a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c index 714a134d26..e84b8d08c9 100644 --- a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c @@ -78,7 +78,6 @@ void bsp_pretasking_hook(void) uint32_t heap_start; uint32_t heap_size; - /* * Set up the heap. It uses all free SDRAM except that reserved * for non-cached uses. @@ -98,7 +97,6 @@ void bsp_pretasking_hook(void) } /* bsp_pretasking_hook */ - /**************************************************************************/ /* */ /* NAME: bsp_start_default - BSP initialization function */ @@ -152,7 +150,6 @@ void bsp_start_default( void ) */ rtems_irq_mngt_init(); - /* * The following information is very useful when debugging. */ @@ -175,9 +172,6 @@ void bsp_start_default( void ) #endif } /* bsp_start */ - - - /* * By making this a weak alias for bsp_start_default, a brave soul * can override the actual bsp_start routine used. diff --git a/c/src/lib/libbsp/arm/shared/comm/console.c b/c/src/lib/libbsp/arm/shared/comm/console.c index fc6cec3f31..2af1359051 100644 --- a/c/src/lib/libbsp/arm/shared/comm/console.c +++ b/c/src/lib/libbsp/arm/shared/comm/console.c @@ -47,7 +47,6 @@ int BSPPrintkPort = BSP_UART_COM1; int BSPBaseBaud = 115200; - /*-------------------------------------------------------------------------+ | External Prototypes +--------------------------------------------------------------------------*/ @@ -70,7 +69,6 @@ BSP_output_char_function_type BSP_output_char = BSP_polling_getchar_function_type BSP_poll_char = (BSP_polling_getchar_function_type) BSP_poll_char_via_serial; - static rtems_irq_connect_data console_isr_data = {BSP_UART, BSP_uart_termios_isr_com1, isr_on, @@ -125,7 +123,6 @@ void __assert (const char *file, int line, const char *msg) } - /*-------------------------------------------------------------------------+ | Console device driver INITIALIZE entry point. +--------------------------------------------------------------------------+ @@ -150,7 +147,6 @@ console_initialize(rtems_device_major_number major, /* 38400-8-N-1 */ BSP_uart_init(BSPConsolePort, 38400, 0); - /* Set interrupt handler */ console_isr_data.name = BSP_UART; console_isr_data.hdl = BSP_uart_termios_isr_com1; @@ -179,7 +175,6 @@ console_initialize(rtems_device_major_number major, return RTEMS_SUCCESSFUL; } /* console_initialize */ - static int console_last_close(int major, int minor, void *arg) { BSP_remove_rtems_irq_handler (&console_isr_data); @@ -243,7 +238,6 @@ console_close(rtems_device_major_number major, return res; } /* console_close */ - /*-------------------------------------------------------------------------+ | Console device driver READ entry point. +--------------------------------------------------------------------------+ @@ -259,7 +253,6 @@ console_read(rtems_device_major_number major, } /* console_read */ - /*-------------------------------------------------------------------------+ | Console device driver WRITE entry point. +--------------------------------------------------------------------------+ @@ -275,8 +268,6 @@ console_write(rtems_device_major_number major, } /* console_write */ - - /* * Handle ioctl request. */ diff --git a/c/src/lib/libbsp/arm/shared/comm/uart.c b/c/src/lib/libbsp/arm/shared/comm/uart.c index 21ba31dcdf..6b21395ce8 100644 --- a/c/src/lib/libbsp/arm/shared/comm/uart.c +++ b/c/src/lib/libbsp/arm/shared/comm/uart.c @@ -222,7 +222,6 @@ BSP_uart_intr_ctrl(int uart, int cmd) return; } - /* * Status function, -1 if error * detected, 0 if no received chars available, @@ -269,7 +268,6 @@ BSP_uart_polled_status(int uart) return BSP_UART_STATUS_ERROR; } - /* * Polled mode write function */ @@ -330,7 +328,6 @@ BSP_poll_char_via_serial() return BSP_uart_polled_read(BSPConsolePort); } - /* ================ Termios support =================*/ static volatile int termios_stopped_com1 = 0; @@ -422,7 +419,6 @@ BSP_uart_termios_write_com2(int minor, const char *buf, int len) return 0; } - /* If there TX buffer is busy - something is royally screwed up */ assert((uread(BSP_UART_COM2, LSR) & THRE) != 0); @@ -453,7 +449,6 @@ BSP_uart_termios_write_com2(int minor, const char *buf, int len) return 0; } - void BSP_uart_termios_isr_com1(void) { diff --git a/c/src/lib/libbsp/arm/shared/irq/irq_asm.S b/c/src/lib/libbsp/arm/shared/irq/irq_asm.S index 52a1692819..8bc5680205 100644 --- a/c/src/lib/libbsp/arm/shared/irq/irq_asm.S +++ b/c/src/lib/libbsp/arm/shared/irq/irq_asm.S @@ -26,7 +26,6 @@ _ISR_Handler: stmdb sp!, {r0, r1, r2, r3, r12} /* save regs on INT stack */ stmdb sp!, {lr} /* now safe to call C funcs */ - /* one nest level deeper */ ldr r0, =_ISR_Nest_level ldr r1, [r0] @@ -111,7 +110,6 @@ bframe: ldmia sp!, {r1} /* out with the old */ stmdb sp!, {lr} /* in with the new (lr) */ - orr r0, r0, #0xc0 msr spsr, r0 @@ -120,8 +118,6 @@ exitit: ldmia sp!, {r0, r1, r2, r3, r12} /* restore regs from INT stack */ subs pc, lr, #4 /* return */ - - /* on entry to _ISR_Dispatch, we're in SVC mode */ .globl _ISR_Dispatch _ISR_Dispatch: diff --git a/c/src/lib/libbsp/arm/vegaplus/clock/clockdrv.c b/c/src/lib/libbsp/arm/vegaplus/clock/clockdrv.c index c49150fba6..f61b66e42d 100644 --- a/c/src/lib/libbsp/arm/vegaplus/clock/clockdrv.c +++ b/c/src/lib/libbsp/arm/vegaplus/clock/clockdrv.c @@ -14,7 +14,6 @@ #define Clock_driver_support_install_isr( _new, _old ) \ do { _old = 0; } while(0) - #define Clock_driver_support_initialize_hardware() #define Clock_driver_support_shutdown_hardware() diff --git a/c/src/lib/libbsp/arm/vegaplus/include/bsp.h b/c/src/lib/libbsp/arm/vegaplus/include/bsp.h index 761b5f3604..abefa5502b 100644 --- a/c/src/lib/libbsp/arm/vegaplus/include/bsp.h +++ b/c/src/lib/libbsp/arm/vegaplus/include/bsp.h @@ -14,7 +14,6 @@ | $Id$ +--------------------------------------------------------------------------*/ - #ifndef __BSP_H_ #define __BSP_H_ diff --git a/c/src/lib/libbsp/arm/vegaplus/include/registers.h b/c/src/lib/libbsp/arm/vegaplus/include/registers.h index 2a153fd8d9..c11fc851c3 100644 --- a/c/src/lib/libbsp/arm/vegaplus/include/registers.h +++ b/c/src/lib/libbsp/arm/vegaplus/include/registers.h @@ -10,7 +10,6 @@ * */ - #ifndef __LMREGS_H__ #define __LMREGS_H__ @@ -28,8 +27,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #endif - - /****************************************************************************** * RADIO CONTROLLER BLOCK 0x0C00 - 0x0FFF * ****************************************************************************** @@ -71,7 +68,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define ADCPERIOD ((RC_BASE+0x7C)/4) #define SYNTIOCNTL ((RC_BASE+0x80)/4) /* added 30/08/99 */ - /* modified 30/08/99 by LHT */ #define SHAPE0 ((RC_BASE+0x100)/4) /* previously 0x80 */ #define SHAPE1 ((RC_BASE+0x104)/4) @@ -121,7 +117,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define TSTRXD ((PLP_BASE+0x78)/4) #define PLPID ((PLP_BASE+0x7C)/4) - /** ENCRYPTION ENGINE 0x1800 - 0x1BFF */ #define EE_BASE 0x1800 @@ -250,7 +245,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define RSCNT ((UART_BASE+0x20)/4) /*PRODUCT_VERSION*/ - /** THUMB and INTERFACES BLOCK 0x3400 - 0x4FFF */ #define TIM_BASE 0x3400 @@ -333,8 +327,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define SLEEPTIMER ((TI_BASE+0x204)/4) #define SLEEPCNTL ((TI_BASE+0x208)/4) - - /****************************************************************************** * BIT MASKS for Chip registers ****************************************************************************** @@ -358,8 +350,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define MSK_TADCMD 0x0F /* Mask on TADCMD */ #define CONTINUE 0x10 - - /** RADIO CONTROLER BLOCK (RC3) */ /* SLICECNTL register */ @@ -461,7 +451,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ /* RCCNTL register */ #define RCCNTL_ENABLE 0x80 - /* ADCCNTL1 register */ #define ADCSTART 0x80 #define SCAN 0x40 @@ -474,8 +463,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define ADCDWN1 0x04 #define ADCDWN2 0x08 - - /** PLP BLOCK */ /* DCNTL0 register */ @@ -511,7 +498,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define MSK_PRES 0x0F /* mask on PRES field */ - /* PLPALIN register */ #define SYNM 0x08 #define BITSLIP 0x10 @@ -537,7 +523,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ /* Bit ENABLE already defined */ #define EECNTL_ENABLE 0x80 - /** PAINT+ BLOCK */ /* PAINTCNTL register */ @@ -555,7 +540,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define FORCE13 0x4000 #define PAINTENB 0x8000 - /* PAINTPLLCNTL register */ #define MSK_MC 0x001F /* Mask on MC field */ #define MCSIGN 0x0020 @@ -649,7 +633,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define G726ENB0 0x0001 #define G726ENB1 0x0003 - /** GENERAL REGISTERS BLOCK */ /* RINGCNTL register */ @@ -730,7 +713,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define PWM0_PADENB 0x20 #define MIRROR 0x10 - /* LCDEECNTL1 register */ /* Bit ENABLE already defined */ #define LCDEE_ENABLE 0x80 @@ -788,7 +770,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define CSMODE_16_WHWL 0x0002 #define CSMODE_16_BHBL 0x0003 - /* MUXADCNTL register */ #define MSK_AHOLD 0x0007 #define MSK_ALEWIDTH 0x0070 @@ -815,11 +796,9 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define ADDRESS_1M 0x3000 #define ADDRESS_2M 0x4000 - /* CSGCNTL register */ #define CSSWITCH 0x0040 - /* SLEEPCNTL register */ #define EXPIRED 0x01 #define SLEEP_ENABLE 0x80 @@ -828,12 +807,10 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define WDSTROKE 0x80 #define WDFLAG 0x80 /* same bit */ - /* DCC register */ /* bit ENABLE=0x80 already defined */ #define DCC_ENABLE 0x80 - /* TIMERCNTL[0:1] register */ /* bit ENABLE=0x80 already defined */ #define TIMER_ENABLE 0x80 @@ -844,7 +821,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define TIMER_216kHz 0x0001 #define TIMER_27kHz 0x0000 - /* INTMASKALL register */ #define MASKIRQ 0x80 #define MASKFIQ 0x40 @@ -880,7 +856,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ /* INTHPAI register */ #define AUTOACK 0x0080 - /****************************************************************************** * Memory Mapping definition ****************************************************************************** @@ -899,7 +874,6 @@ extern volatile unsigned long *Regs; /* Chip registers */ #define REGS_BASE_ADR 0x000F0000 /* Base Address of registers */ #define RADRAM_BASE_ADR 0x000F0000 /* Base Address of registers */ - /****************************************************************************** * Slot Control bloc ****************************************************************************** @@ -1067,10 +1041,6 @@ typedef LM_SCB *LM_SCB_P; /* pointer to Slot Control Block */ #define LM_WIN_OPEN 0x3F /* wide open window size */ #define MSK_WINSZ 0x3F - - - - /* * Some macros to mask the VEGA+ interrupt sources ****************************************************************************** @@ -1085,7 +1055,6 @@ typedef LM_SCB *LM_SCB_P; /* pointer to Slot Control Block */ #define LM_MaskSTX() (LM_Regs[RSIER] &= ~TX_INT_ENABLE) #define LM_MaskUARTStatus() (LM_Regs[RSIER] &= ~LINE_STATUS_ENABLE) - #define LM_MaskTMR0() (LM_Regs[INTMASK] |= TMR0) #define LM_MaskTMR1() (LM_Regs[INTMASK] |= TMR1) #define LM_MaskLCDEE() (LM_Regs[INTMASK] |= LCDEE) diff --git a/c/src/lib/libbsp/arm/vegaplus/irq/bsp_irq_init.c b/c/src/lib/libbsp/arm/vegaplus/irq/bsp_irq_init.c index 7807d89181..a8bb04bd8a 100644 --- a/c/src/lib/libbsp/arm/vegaplus/irq/bsp_irq_init.c +++ b/c/src/lib/libbsp/arm/vegaplus/irq/bsp_irq_init.c @@ -16,7 +16,6 @@ #include #include - void BSP_rtems_irq_mngt_init() { /* Initialize the vector table address in internal RAM */ diff --git a/c/src/lib/libbsp/arm/vegaplus/irq/irq.c b/c/src/lib/libbsp/arm/vegaplus/irq/irq.c index 55c1590bdf..9a529346dc 100644 --- a/c/src/lib/libbsp/arm/vegaplus/irq/irq.c +++ b/c/src/lib/libbsp/arm/vegaplus/irq/irq.c @@ -12,14 +12,12 @@ * $Id$ */ - #include #include #include #include #include - /* * This function check that the value given for the irq line * is valid. @@ -121,8 +119,6 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) return 1; } - - void _ThreadProcessSignalsFromIrq (CPU_Exception_frame* ctx) { /* diff --git a/c/src/lib/libbsp/arm/vegaplus/irq/irq.h b/c/src/lib/libbsp/arm/vegaplus/irq/irq.h index 5857792ebe..0483849bd6 100644 --- a/c/src/lib/libbsp/arm/vegaplus/irq/irq.h +++ b/c/src/lib/libbsp/arm/vegaplus/irq/irq.h @@ -135,7 +135,6 @@ typedef struct __rtems_irq_connect_data__ { */ void BSP_rtems_irq_mngt_init(); - /* * function to connect a particular irq handler. This hanlder will NOT be called * directly as the result of the corresponding interrupt. Instead, a RTEMS @@ -184,7 +183,6 @@ int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* ptr); */ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data*); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/arm/vegaplus/start/start.S b/c/src/lib/libbsp/arm/vegaplus/start/start.S index 6c3c2ab141..49c216150c 100644 --- a/c/src/lib/libbsp/arm/vegaplus/start/start.S +++ b/c/src/lib/libbsp/arm/vegaplus/start/start.S @@ -40,12 +40,10 @@ .equ I_Bit, 0x80 .equ F_Bit, 0x40 - .equ Mode_SVC_MIRQ, Mode_SVC | I_Bit | F_Bit .equ Mode_SVC_UIRQ, Mode_SVC .equ Mode_IRQ_MIRQ, Mode_SVC | I_Bit | F_Bit - .equ MARK_STACK, 0 /*Fill every stack with a pattern for debug (0 or 1)*/ /*----------------------------------------------------------------------------- @@ -129,7 +127,6 @@ Real_start: LDR r1, =0xA2 STR r1, [r0,#CSCNTL1_2] - MOV r0,#CNTL_CLK_ADR /* Load clock mode 55 MHz */ LDR r1, =0x0010 @@ -155,7 +152,6 @@ zi_init: STRLOT r2, [r0], #4 BLO zi_init - /* Load basic ARM7 interrupt table */ VectorInit: MOV R8, #0 diff --git a/c/src/lib/libbsp/arm/vegaplus/startup/bspstart.c b/c/src/lib/libbsp/arm/vegaplus/startup/bspstart.c index 3af8289599..5b1749d7cf 100644 --- a/c/src/lib/libbsp/arm/vegaplus/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/vegaplus/startup/bspstart.c @@ -13,7 +13,6 @@ | +--------------------------------------------------------------------------*/ - #include #include #include @@ -77,7 +76,6 @@ void bsp_pretasking_hook(void) rtemsFreeMemStart += _heap_size; /* HEAP_SIZE in KBytes */ - #ifdef RTEMS_DEBUG rtems_debug_enable(RTEMS_DEBUG_ALL_MASK); @@ -86,7 +84,6 @@ void bsp_pretasking_hook(void) } /* bsp_pretasking_hook */ - /*-------------------------------------------------------------------------+ | Function: bsp_start | Description: Called before main is invoked. diff --git a/c/src/lib/libbsp/arm/vegaplus/startup/exit.c b/c/src/lib/libbsp/arm/vegaplus/startup/exit.c index a99faeb9ba..03e240cc33 100644 --- a/c/src/lib/libbsp/arm/vegaplus/startup/exit.c +++ b/c/src/lib/libbsp/arm/vegaplus/startup/exit.c @@ -13,7 +13,6 @@ | +--------------------------------------------------------------------------*/ - #include #include #include -- cgit v1.2.3