From c8bd3cda93526c6662d4ef7715dbb8823826ccae Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 8 Feb 2013 13:39:59 +0100 Subject: libchip/serial: Add const qualifier --- c/src/lib/libbsp/arm/csb337/console/fbcons.c | 2 +- c/src/lib/libbsp/arm/csb337/console/uarts.c | 8 ++++---- c/src/lib/libbsp/arm/edb7312/console/uart.c | 2 +- c/src/lib/libbsp/arm/gp32/console/uart.c | 2 +- c/src/lib/libbsp/arm/gumstix/console/uarts.c | 2 +- c/src/lib/libbsp/arm/lm3s69xx/console/uart.c | 2 +- c/src/lib/libbsp/arm/lm3s69xx/include/uart.h | 2 +- c/src/lib/libbsp/arm/lpc32xx/console/console-config.c | 2 +- c/src/lib/libbsp/arm/lpc32xx/console/hsu.c | 2 +- c/src/lib/libbsp/arm/rtl22xx/console/uart.c | 2 +- c/src/lib/libbsp/arm/stm32f4/console/usart.c | 2 +- c/src/lib/libbsp/arm/stm32f4/include/usart.h | 2 +- c/src/lib/libbsp/i386/pc386/console/vgacons.c | 2 +- c/src/lib/libbsp/i386/pc386/console/vgacons.h | 2 +- c/src/lib/libbsp/powerpc/ep1a/console/config.c | 2 +- c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c | 4 ++-- c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h | 4 ++-- c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-master.c | 2 +- c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-slave.c | 2 +- c/src/lib/libbsp/powerpc/qoriq/include/uart-bridge.h | 4 ++-- c/src/lib/libbsp/powerpc/t32mppc/console/console-config.c | 2 +- c/src/lib/libbsp/powerpc/virtex/console/consolelite.c | 2 +- c/src/lib/libbsp/sh/gensh2/console/config.c | 4 ++-- c/src/lib/libbsp/shared/umon/umoncons.c | 2 +- c/src/lib/libbsp/sparc/erc32/console/erc32_console.c | 4 ++-- c/src/lib/libbsp/sparc64/shared/console/conscfg.c | 4 ++-- 26 files changed, 35 insertions(+), 35 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/arm/csb337/console/fbcons.c b/c/src/lib/libbsp/arm/csb337/console/fbcons.c index 40b91b5889..50261afbf9 100644 --- a/c/src/lib/libbsp/arm/csb337/console/fbcons.c +++ b/c/src/lib/libbsp/arm/csb337/console/fbcons.c @@ -31,7 +31,7 @@ static void fbcons_write_polled(int minor, char c); static int fbcons_set_attributes(int minor, const struct termios *t); /* Pointers to functions for handling the UART. */ -console_fns fbcons_fns = +const console_fns fbcons_fns = { libchip_serial_default_probe, fbcons_first_open, diff --git a/c/src/lib/libbsp/arm/csb337/console/uarts.c b/c/src/lib/libbsp/arm/csb337/console/uarts.c index 22c96d22c1..74cf083b03 100644 --- a/c/src/lib/libbsp/arm/csb337/console/uarts.c +++ b/c/src/lib/libbsp/arm/csb337/console/uarts.c @@ -29,24 +29,24 @@ #include #include -extern console_fns dbgu_fns; +extern const console_fns dbgu_fns; #if ENABLE_LCD - extern console_fns fbcons_fns; + extern const console_fns fbcons_fns; #define LCD_DEV 1 #else #define LCD_DEV 0 #endif #if (ENABLE_UMON && ENABLE_UMON_CONSOLE) - extern console_fns umoncons_fns; + extern const console_fns umoncons_fns; #define UMON_CONS_DEV 1 #else #define UMON_CONS_DEV 0 #endif #if ENABLE_USART0 || ENABLE_USART1 || ENABLE_USART2 || ENABLE_USART3 - extern console_fns usart_polling_fns; + extern const console_fns usart_polling_fns; #endif #if ENABLE_USART0 diff --git a/c/src/lib/libbsp/arm/edb7312/console/uart.c b/c/src/lib/libbsp/arm/edb7312/console/uart.c index 8b11e23658..5b80edcc52 100644 --- a/c/src/lib/libbsp/arm/edb7312/console/uart.c +++ b/c/src/lib/libbsp/arm/edb7312/console/uart.c @@ -30,7 +30,7 @@ static int uart_set_attributes(int minor, const struct termios *t); unsigned long Console_Configuration_Count = NUM_DEVS; -console_fns uart_fns = +const console_fns uart_fns = { libchip_serial_default_probe, uart_first_open, diff --git a/c/src/lib/libbsp/arm/gp32/console/uart.c b/c/src/lib/libbsp/arm/gp32/console/uart.c index 674fe71e9a..593200de7a 100644 --- a/c/src/lib/libbsp/arm/gp32/console/uart.c +++ b/c/src/lib/libbsp/arm/gp32/console/uart.c @@ -45,7 +45,7 @@ static int uart_set_attributes(int minor, const struct termios *t); unsigned long Console_Configuration_Count = NUM_DEVS; /* Pointers to functions for handling the UART. */ -console_fns uart_fns = +const console_fns uart_fns = { libchip_serial_default_probe, uart_first_open, diff --git a/c/src/lib/libbsp/arm/gumstix/console/uarts.c b/c/src/lib/libbsp/arm/gumstix/console/uarts.c index 70809e0edb..10658ad9fb 100644 --- a/c/src/lib/libbsp/arm/gumstix/console/uarts.c +++ b/c/src/lib/libbsp/arm/gumstix/console/uarts.c @@ -27,7 +27,7 @@ /* These are used by code in console.c */ unsigned long Console_Configuration_Count = NUM_DEVS; -extern console_fns ffuart_fns; +extern const console_fns ffuart_fns; /* * There's one item in array for each UART. diff --git a/c/src/lib/libbsp/arm/lm3s69xx/console/uart.c b/c/src/lib/libbsp/arm/lm3s69xx/console/uart.c index db28b0a06b..cc51c83c47 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/console/uart.c +++ b/c/src/lib/libbsp/arm/lm3s69xx/console/uart.c @@ -91,7 +91,7 @@ static int set_attribues(int minor, const struct termios *term) return -1; } -console_fns lm3s69xx_uart_fns = { +const console_fns lm3s69xx_uart_fns = { .deviceProbe = libchip_serial_default_probe, .deviceFirstOpen = first_open, .deviceLastClose = last_close, diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/uart.h b/c/src/lib/libbsp/arm/lm3s69xx/include/uart.h index 222a2dbbbd..bb68090c28 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/include/uart.h +++ b/c/src/lib/libbsp/arm/lm3s69xx/include/uart.h @@ -77,7 +77,7 @@ typedef struct { uint32_t icr; } lm3s69xx_uart; -extern console_fns lm3s69xx_uart_fns; +extern const console_fns lm3s69xx_uart_fns; #ifdef __cplusplus } diff --git a/c/src/lib/libbsp/arm/lpc32xx/console/console-config.c b/c/src/lib/libbsp/arm/lpc32xx/console/console-config.c index 1134bf118b..7caaca5581 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/console/console-config.c +++ b/c/src/lib/libbsp/arm/lpc32xx/console/console-config.c @@ -26,7 +26,7 @@ #include #include -extern console_fns lpc32xx_hsu_fns; +extern const console_fns lpc32xx_hsu_fns; static uint8_t lpc32xx_uart_get_register(uintptr_t addr, uint8_t i) { diff --git a/c/src/lib/libbsp/arm/lpc32xx/console/hsu.c b/c/src/lib/libbsp/arm/lpc32xx/console/hsu.c index 44e72789d8..3065a12fc2 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/console/hsu.c +++ b/c/src/lib/libbsp/arm/lpc32xx/console/hsu.c @@ -189,7 +189,7 @@ static int lpc32xx_hsu_set_attributes(int minor, const struct termios *term) return 0; } -console_fns lpc32xx_hsu_fns = { +const console_fns lpc32xx_hsu_fns = { .deviceProbe = libchip_serial_default_probe, .deviceFirstOpen = lpc32xx_hsu_first_open, .deviceLastClose = NULL, diff --git a/c/src/lib/libbsp/arm/rtl22xx/console/uart.c b/c/src/lib/libbsp/arm/rtl22xx/console/uart.c index fe51a96d04..d8eb5dd095 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/console/uart.c +++ b/c/src/lib/libbsp/arm/rtl22xx/console/uart.c @@ -47,7 +47,7 @@ static int uart_set_attributes(int minor, const struct termios *t); unsigned long Console_Configuration_Count = NUM_DEVS; /* Pointers to functions for handling the UART. */ -console_fns uart_fns = +const console_fns uart_fns = { libchip_serial_default_probe, uart_first_open, diff --git a/c/src/lib/libbsp/arm/stm32f4/console/usart.c b/c/src/lib/libbsp/arm/stm32f4/console/usart.c index 40280ad937..d072b5184b 100644 --- a/c/src/lib/libbsp/arm/stm32f4/console/usart.c +++ b/c/src/lib/libbsp/arm/stm32f4/console/usart.c @@ -199,7 +199,7 @@ static int usart_set_attributes(int minor, const struct termios *term) return -1; } -console_fns stm32f4_usart_fns = { +const console_fns stm32f4_usart_fns = { .deviceProbe = libchip_serial_default_probe, .deviceFirstOpen = usart_first_open, .deviceLastClose = usart_last_close, diff --git a/c/src/lib/libbsp/arm/stm32f4/include/usart.h b/c/src/lib/libbsp/arm/stm32f4/include/usart.h index ee1e8bb39e..e8578a6ba2 100644 --- a/c/src/lib/libbsp/arm/stm32f4/include/usart.h +++ b/c/src/lib/libbsp/arm/stm32f4/include/usart.h @@ -21,7 +21,7 @@ extern "C" { #endif /* __cplusplus */ -extern console_fns stm32f4_usart_fns; +extern const console_fns stm32f4_usart_fns; #ifdef __cplusplus } diff --git a/c/src/lib/libbsp/i386/pc386/console/vgacons.c b/c/src/lib/libbsp/i386/pc386/console/vgacons.c index 9d78b02df8..d1143daac3 100644 --- a/c/src/lib/libbsp/i386/pc386/console/vgacons.c +++ b/c/src/lib/libbsp/i386/pc386/console/vgacons.c @@ -186,7 +186,7 @@ bool vgacons_probe( return true; } -console_fns vgacons_fns = +const console_fns vgacons_fns = { libchip_serial_default_probe, /* deviceProbe */ vgacons_open, /* deviceFirstOpen */ diff --git a/c/src/lib/libbsp/i386/pc386/console/vgacons.h b/c/src/lib/libbsp/i386/pc386/console/vgacons.h index f88d065c59..4de6909e08 100644 --- a/c/src/lib/libbsp/i386/pc386/console/vgacons.h +++ b/c/src/lib/libbsp/i386/pc386/console/vgacons.h @@ -32,7 +32,7 @@ bool vgacons_probe( int minor ); /* * Driver function table */ -extern console_fns vgacons_fns; +extern const console_fns vgacons_fns; #ifdef __cplusplus } diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/config.c b/c/src/lib/libbsp/powerpc/ep1a/console/config.c index ba7013b6e4..9a8ea1c5c6 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/config.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/config.c @@ -39,7 +39,7 @@ static bool config_68360_scc_base_probe_10(int minor); static bool config_68360_scc_base_probe_11(int minor); static bool config_68360_scc_base_probe_12(int minor); -extern console_fns mc68360_scc_fns; +extern const console_fns mc68360_scc_fns; /* * The following table configures the console drivers used in this BSP. diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c b/c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c index a59b956e7e..bdeec6d408 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c @@ -959,7 +959,7 @@ int mc68360_scc_create_chip( PPMCQ1BoardData BoardData, uint8_t int_vector ) return RTEMS_SUCCESSFUL; } -console_fns mc68360_scc_fns = { +const console_fns mc68360_scc_fns = { libchip_serial_default_probe, /* deviceProbe */ mc68360_scc_open, /* deviceFirstOpen */ NULL, /* deviceLastClose */ @@ -971,7 +971,7 @@ console_fns mc68360_scc_fns = { TRUE /* deviceOutputUsesInterrupts */ }; -console_fns mc68360_scc_polled = { +const console_fns mc68360_scc_polled = { libchip_serial_default_probe, /* deviceProbe */ mc68360_scc_open, /* deviceFirstOpen */ mc68360_scc_close, /* deviceLastClose */ diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h b/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h index c67488c3b3..1fbe753754 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h +++ b/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h @@ -31,8 +31,8 @@ void Write_ns16550_register( uint8_t ucData ); -extern console_fns ns16550_fns_8245; -extern console_fns ns16550_fns_polled_8245; +extern const console_fns ns16550_fns_8245; +extern const console_fns ns16550_fns_polled_8245; #ifdef __cplusplus } diff --git a/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-master.c b/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-master.c index 3f78997e55..5efc1d3218 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-master.c +++ b/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-master.c @@ -182,7 +182,7 @@ static int set_attributes(int minor, const struct termios *term) return -1; } -console_fns qoriq_uart_bridge_master = { +const console_fns qoriq_uart_bridge_master = { .deviceProbe = libchip_serial_default_probe, .deviceFirstOpen = first_open, .deviceLastClose = last_close, diff --git a/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-slave.c b/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-slave.c index e4f71542d3..86f5de87a8 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-slave.c +++ b/c/src/lib/libbsp/powerpc/qoriq/console/uart-bridge-slave.c @@ -198,7 +198,7 @@ static int set_attribues(int minor, const struct termios *term) return -1; } -console_fns qoriq_uart_bridge_slave = { +const console_fns qoriq_uart_bridge_slave = { .deviceProbe = libchip_serial_default_probe, .deviceFirstOpen = first_open, .deviceLastClose = last_close, diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/uart-bridge.h b/c/src/lib/libbsp/powerpc/qoriq/include/uart-bridge.h index ada3b2c827..8d7698ad53 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/include/uart-bridge.h +++ b/c/src/lib/libbsp/powerpc/qoriq/include/uart-bridge.h @@ -55,9 +55,9 @@ typedef struct { rtems_chain_control transmit_fifo; } uart_bridge_slave_control; -extern console_fns qoriq_uart_bridge_master; +extern const console_fns qoriq_uart_bridge_master; -extern console_fns qoriq_uart_bridge_slave; +extern const console_fns qoriq_uart_bridge_slave; /** @} */ diff --git a/c/src/lib/libbsp/powerpc/t32mppc/console/console-config.c b/c/src/lib/libbsp/powerpc/t32mppc/console/console-config.c index 4a7349ef85..4a7b059ff8 100644 --- a/c/src/lib/libbsp/powerpc/t32mppc/console/console-config.c +++ b/c/src/lib/libbsp/powerpc/t32mppc/console/console-config.c @@ -112,7 +112,7 @@ static int set_attribues(int minor, const struct termios *term) return -1; } -static console_fns t32mppc_console_fns = { +static const console_fns t32mppc_console_fns = { .deviceProbe = libchip_serial_default_probe, .deviceFirstOpen = first_open, .deviceLastClose = last_close, diff --git a/c/src/lib/libbsp/powerpc/virtex/console/consolelite.c b/c/src/lib/libbsp/powerpc/virtex/console/consolelite.c index 81e7b344d2..10bee5b741 100644 --- a/c/src/lib/libbsp/powerpc/virtex/console/consolelite.c +++ b/c/src/lib/libbsp/powerpc/virtex/console/consolelite.c @@ -228,7 +228,7 @@ int xlite_set_attributes(int minor, const struct termios *t) -console_fns xlite_fns_polled = +const console_fns xlite_fns_polled = { libchip_serial_default_probe, /* deviceProbe */ xlite_open, /* deviceFirstOpen */ diff --git a/c/src/lib/libbsp/sh/gensh2/console/config.c b/c/src/lib/libbsp/sh/gensh2/console/config.c index e45183abd8..e9288d7fd1 100644 --- a/c/src/lib/libbsp/sh/gensh2/console/config.c +++ b/c/src/lib/libbsp/sh/gensh2/console/config.c @@ -25,7 +25,7 @@ /* * Function set for interrupt enabled termios console */ -console_fns sh_sci_fns = +const console_fns sh_sci_fns = { libchip_serial_default_probe, /* deviceProbe */ sh_sci_first_open, /* deviceFirstOpen */ @@ -41,7 +41,7 @@ console_fns sh_sci_fns = /* * Function set for polled termios console */ -console_fns sh_sci_fns_polled = +const console_fns sh_sci_fns_polled = { libchip_serial_default_probe, /* deviceProbe */ sh_sci_first_open, /* deviceFirstOpen */ diff --git a/c/src/lib/libbsp/shared/umon/umoncons.c b/c/src/lib/libbsp/shared/umon/umoncons.c index daf9aebd6b..1f68615ef8 100644 --- a/c/src/lib/libbsp/shared/umon/umoncons.c +++ b/c/src/lib/libbsp/shared/umon/umoncons.c @@ -26,7 +26,7 @@ static void umoncons_write_polled(int minor, char c); static int umoncons_set_attributes(int minor, const struct termios *t); /* Pointers to functions for handling the UART. */ -console_fns umoncons_fns = +const console_fns umoncons_fns = { libchip_serial_default_probe, umoncons_first_open, diff --git a/c/src/lib/libbsp/sparc/erc32/console/erc32_console.c b/c/src/lib/libbsp/sparc/erc32/console/erc32_console.c index 7f54e80834..08606957d4 100644 --- a/c/src/lib/libbsp/sparc/erc32/console/erc32_console.c +++ b/c/src/lib/libbsp/sparc/erc32/console/erc32_console.c @@ -57,7 +57,7 @@ static int erc32_console_first_open(int major, int minor, void *arg); static void erc32_console_initialize(int minor); #if (CONSOLE_USE_INTERRUPTS) - console_fns erc32_fns = { + const console_fns erc32_fns = { libchip_serial_default_probe, /* deviceProbe */ erc32_console_first_open, /* deviceFirstOpen */ NULL, /* deviceLastClose */ @@ -69,7 +69,7 @@ static void erc32_console_initialize(int minor); TERMIOS_IRQ_DRIVEN /* deviceOutputUsesInterrupts */ }; #else - console_fns erc32_fns = { + const console_fns erc32_fns = { libchip_serial_default_probe, /* deviceProbe */ erc32_console_first_open, /* deviceFirstOpen */ NULL, /* deviceLastClose */ diff --git a/c/src/lib/libbsp/sparc64/shared/console/conscfg.c b/c/src/lib/libbsp/sparc64/shared/console/conscfg.c index ec815727f7..7d9bfac317 100644 --- a/c/src/lib/libbsp/sparc64/shared/console/conscfg.c +++ b/c/src/lib/libbsp/sparc64/shared/console/conscfg.c @@ -45,7 +45,7 @@ bool sun4v_console_deviceProbe (int minor){ /* * Polled mode functions */ -console_fns pooled_functions={ +const console_fns pooled_functions={ sun4v_console_deviceProbe, /* deviceProbe */ sun4v_console_device_first_open, /* deviceFirstOpen */ NULL, /* deviceLastClose */ @@ -57,7 +57,7 @@ console_fns pooled_functions={ NULL /* deviceOutputUsesInterrupts */ }; -console_flow sun4v_console_console_flow = { +const console_flow sun4v_console_console_flow = { NULL, /* deviceStopRemoteTx */ NULL /* deviceStartRemoteTx */ }; -- cgit v1.2.3