summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@oarcorp.com>2014-10-13 19:08:36 -0500
committerJoel Sherrill <joel.sherrill@oarcorp.com>2014-10-16 08:58:47 -0500
commit3785ed6c266224fb5204998c9495202de7925356 (patch)
tree4cdaaff2bb5b8661ecb18620d0b8c2c5c8edd2b3
parent1ecb21d8f4f74f9bd9d90baed1fa309255e227f0 (diff)
downloadrtems-3785ed6c266224fb5204998c9495202de7925356.tar.bz2
i386/pc386: Fix warnings
-rw-r--r--c/src/lib/libbsp/i386/pc386/include/bsp.h31
-rw-r--r--c/src/lib/libbsp/i386/pc386/startup/bspstart.c5
2 files changed, 32 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/c/src/lib/libbsp/i386/pc386/include/bsp.h
index 62cf0f09b8..cefb726a93 100644
--- a/c/src/lib/libbsp/i386/pc386/include/bsp.h
+++ b/c/src/lib/libbsp/i386/pc386/include/bsp.h
@@ -47,6 +47,8 @@
#ifndef _BSP_H
#define _BSP_H
+#ifndef ASM
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -195,6 +197,18 @@ void Clock_driver_support_initialize_hardware(void); /* from 'ckinit.c' */
void kbd_reset_setup(char *str, int *ints); /* from 'pc_keyb.c' */
size_t read_aux(char * buffer, size_t count); /* from 'ps2_mouse.c' */
+bool bsp_get_serial_mouse_device( /* from 'serial_mouse.c' */
+ const char **name,
+ const char **type
+);
+
+void register_leds( /* from 'keyboard.c' */
+ int console,
+ unsigned int led,
+ unsigned int *addr,
+ unsigned int mask
+);
+
/* Definitions for BSPConsolePort */
#define BSP_CONSOLE_PORT_CONSOLE (-1)
#define BSP_CONSOLE_PORT_COM1 (BSP_UART_COM1)
@@ -217,15 +231,30 @@ void bsp_ide_cmdline_init(void);
#define RTEMS_BSP_HAS_IDE_DRIVER
/* GDB stub stuff */
+void init_remote_gdb( void );
void i386_stub_glue_init(int uart);
void i386_stub_glue_init_breakin(void);
-void set_debug_traps(void);
void breakpoint(void);
#define BSP_MAXIMUM_DEVICES 6
+/*
+ * Debug helper methods
+ */
+typedef __FILE FILE;
+uint32_t BSP_irq_count_dump(FILE *f);
+
+/*
+ * Prototypes just called from .S files. This lets the .S file include
+ * bsp.h just to establish the dependency.
+ */
+void raw_idt_notify(void);
+void C_dispatch_isr(int vector);
+
#ifdef __cplusplus
}
#endif
+#endif /* !ASM */
+
#endif /* _BSP_H */
diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c
index ebe6b7c390..4c81473b26 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c
+++ b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c
@@ -45,7 +45,7 @@ void Clock_driver_install_handler(void);
| Arguments: None.
| Returns: Nothing.
+--------------------------------------------------------------------------*/
-void bsp_start_default( void )
+static void bsp_start_default( void )
{
int pci_init_retval;
@@ -81,11 +81,10 @@ void bsp_start_default( void )
bsp_ide_cmdline_init();
-} /* bsp_start */
+} /* bsp_start_default */
/*
* By making this a weak alias for bsp_start_default, a brave soul
* can override the actual bsp_start routine used.
*/
-
void bsp_start (void) __attribute__ ((weak, alias("bsp_start_default")));