diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-10-12 10:06:47 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-10-13 10:33:27 -0500 |
| commit | 59888da70af9d61ffa9eda0bb1deae89d79995e4 (patch) | |
| tree | d9ccbd0080acec7d33ef7555a9fe805c9c269c5f | |
| parent | sim68000/clock/clockdrv.c: Fix warnings (diff) | |
| download | rtems-59888da70af9d61ffa9eda0bb1deae89d79995e4.tar.bz2 | |
powerpc/haleakala: Fix warnings
| -rw-r--r-- | c/src/lib/libbsp/powerpc/haleakala/irq/irq_init.c | 11 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c | 16 |
2 files changed, 16 insertions, 11 deletions
diff --git a/c/src/lib/libbsp/powerpc/haleakala/irq/irq_init.c b/c/src/lib/libbsp/powerpc/haleakala/irq/irq_init.c index 06942ff1ac..4165df1b14 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/irq/irq_init.c +++ b/c/src/lib/libbsp/powerpc/haleakala/irq/irq_init.c @@ -36,8 +36,15 @@ static int not_connected(void) static rtems_irq_connect_data rtemsIrq[BSP_IRQ_NUMBER]; static rtems_irq_global_settings initial_config; static rtems_irq_connect_data defaultIrq = { - /* name, hdl , handle , on , off , isOn */ - 0, nop_func , NULL , nop_func , nop_func , not_connected + .name = 0, + .hdl = NULL, + .handle = NULL, + .on = (rtems_irq_enable) nop_func, + .off = (rtems_irq_disable) nop_func, + .isOn = (rtems_irq_is_enabled) not_connected, +#ifdef BSP_SHARED_HANDLER_SUPPORT + .next_handler = NULL +#endif }; static rtems_irq_prio irqPrioTable[BSP_IRQ_NUMBER]={ diff --git a/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c b/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c index 443e45476c..4159d48768 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c @@ -105,7 +105,7 @@ InitUARTClock(void) mtsdr(SDR0_UART0,reg); } -void GPIO_AlternateSelect(int bitnum, int source) +static void GPIO_AlternateSelect(int bitnum, int source) /* PPC405EX: select a GPIO function for the specified pin */ { int shift; @@ -124,7 +124,7 @@ void GPIO_AlternateSelect(int bitnum, int source) } } -void Init_FPGA(void) +static void Init_FPGA(void) { /* Have to write to the FPGA to enable the UART drivers */ /* Have to enable CS2 as an output in GPIO to get the FPGA working */ @@ -161,9 +161,6 @@ BSP_polling_getchar_function_type BSP_poll_char = NULL; void bsp_start( void ) { - ppc_cpu_id_t myCpu; - ppc_cpu_revision_t myCpuRevision; - /* Get the UART clock initialized first in case we call printk */ InitUARTClock(); @@ -175,8 +172,8 @@ void bsp_start( void ) * function store the result in global variables * so that it can be used later... */ - myCpu = get_ppc_cpu_type(); - myCpuRevision = get_ppc_cpu_revision(); + get_ppc_cpu_type(); + get_ppc_cpu_revision(); /* * initialize the device driver parameters @@ -205,7 +202,7 @@ void bsp_start( void ) BSP_rtems_irq_mng_init(0); } -void BSP_ask_for_reset(void) +static void BSP_ask_for_reset(void) { printk("system stopped, press RESET"); while(1) {}; @@ -219,6 +216,7 @@ void BSP_panic(char *s) void _BSP_Fatal_error(unsigned int v) { - printk("%s PANIC ERROR %x\n",_RTEMS_version, v); + printk("%s FATAL ERROR %x\n",_RTEMS_version, v); BSP_ask_for_reset(); } + |