diff options
Diffstat (limited to 'c/src/lib/libbsp/i386/ts_386ex')
27 files changed, 63 insertions, 124 deletions
diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am index 399e5d6822..7b03a80d2d 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal diff --git a/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am index c8a411e6de..131b243ca6 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -19,7 +19,7 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(clock_rel_OBJECTS) $(make-rel) -# the .rel file built here will be put into libbsp.a by +# the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM) diff --git a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am index 13810f58b0..4b0c14dbdc 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -23,7 +23,7 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(console_rel_OBJECTS) $(make-rel) -# the .rel file built here will be put into libbsp.a by +# the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile all-local: $(ARCH) $(console_rel_OBJECTS) $(PGM) diff --git a/c/src/lib/libbsp/i386/ts_386ex/console/console.c b/c/src/lib/libbsp/i386/ts_386ex/console/console.c index fc2c1a3062..a798abe932 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/console/console.c +++ b/c/src/lib/libbsp/i386/ts_386ex/console/console.c @@ -95,12 +95,6 @@ isr_is_on(const rtems_irq_connect_data *irq) return BSP_irq_enabled_at_i8259s(irq->name); } -void console_reserve_resources(rtems_configuration_table *conf) -{ - rtems_termios_reserve_resources(conf, 1); - return; -} - void __assert (const char *file, int line, const char *msg) { static char exit_msg[] = "EXECUTIVE SHUTDOWN! Any key to reboot..."; diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am index 78f90cedb4..ef1a5dcf9d 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h b/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h index 90177de1f6..6baf0f12ba 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h +++ b/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h @@ -25,6 +25,15 @@ extern "C" { #include <clockdrv.h> #include <bspIo.h> #include <irq.h> + +/* + * confdefs.h overrides for this BSP: + * - termios serial ports (defaults to 1) + * - Interrupt stack space is not minimum if defined. + */ + +/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ +#define CONFIGURE_INTERRUPT_STACK_MEMORY (8 * 1024) /* * Network driver configuration diff --git a/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am index b8fef43a99..780cd08f1d 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am index 1770aeb84e..80eb714504 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/ts_386ex/start/start.S b/c/src/lib/libbsp/i386/ts_386ex/start/start.S index 63248b961f..3f167fe9e3 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/start/start.S +++ b/c/src/lib/libbsp/i386/ts_386ex/start/start.S @@ -50,7 +50,7 @@ PUBLIC( SYM(_init_i386ex) ) - .section .initial + .section .initial, "ax" /* * Enable access to peripheral register at expanded I/O addresses diff --git a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am index 539d1eb519..c6fc068e4e 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c b/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c index 2db339a2aa..7bc0e70887 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c @@ -101,19 +101,10 @@ void bsp_start( void ) Cpu_table.postdriver_hook = bsp_postdriver_hook; Cpu_table.interrupt_table_segment = get_ds(); Cpu_table.interrupt_table_offset = (void *)Interrupt_descriptor_table; - Cpu_table.interrupt_stack_size = 8192; - /* -#if defined(RTEMS_POSIX_API) - BSP_Configuration.work_space_size *= 3; -#endif - */ - BSP_Configuration.work_space_start = (void *) - RAM_END - BSP_Configuration.work_space_size; + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - /* - * Account for the console's resources - */ - console_reserve_resources( &BSP_Configuration ); + BSP_Configuration.work_space_start = (void *) + RAM_END - BSP_Configuration.work_space_size; /* * Init rtems_interrupt_management diff --git a/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am index b7655da651..66e6f2be37 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -21,7 +21,7 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(timer_rel_OBJECTS) $(make-rel) -# the .rel file built here will be put into libbsp.a by +# the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM) diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am index 20363ef67b..c6210593d0 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am @@ -5,19 +5,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -noinst_SCRIPTS = \ -coff2bin \ -elf2exe +noinst_SCRIPTS = coff2bin elf2exe -SUBDIRS = \ -ts_1325_ada \ -network_ada \ -debug_ada \ -debug_c \ -dos_sup +SUBDIRS = ts_1325_ada network_ada debug_ada debug_c dos_sup -EXTRA_DIST = \ -$(noinst_SCRIPTS) +EXTRA_DIST = $(noinst_SCRIPTS) include $(top_srcdir)/../../../../../../../automake/subdirs.am -include $(top_srcdir)/../../../../../../../automake/local.am +include $(top_srcdir)/../../../../../../../automake/host.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/Makefile.am index fbd84a542a..3249bd19f7 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/Makefile.am @@ -4,13 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -EXTRA_DIST = \ -Makefile.ts_386ex \ -cmds \ -ddd-rtems \ -debug.adb \ -init.c \ -serial_debug.adb \ -serial_debug.ads +EXTRA_DIST = Makefile.ts_386ex cmds ddd-rtems debug.adb init.c \ + serial_debug.adb serial_debug.ads include $(top_srcdir)/../../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/init.c b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/init.c index 0f52a84156..e63437f46d 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/init.c +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/init.c @@ -67,8 +67,8 @@ void *POSIX_Init( void *argument ) /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/Makefile.am index 302758aef7..4030cd1680 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/Makefile.am @@ -4,13 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -EXTRA_DIST = \ -cmds \ -ddd-rtems \ -debug_test.c \ -init.c \ -serial_gdb.c \ -serial_gdb.h \ -system.h +EXTRA_DIST = cmds ddd-rtems debug_test.c init.c serial_gdb.c serial_gdb.h \ + system.h include $(top_srcdir)/../../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/system.h b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/system.h index 5417cf8cbc..1ececa4f0d 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/system.h +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/system.h @@ -23,7 +23,7 @@ rtems_task Init( /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER #define CONFIGURE_RTEMS_INIT_TASKS_TABLE diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.am index 94274f2b4e..0ab426e3f7 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.am @@ -4,9 +4,6 @@ AUTOMAKE_OPTIONS = foreign 1.4 -EXTRA_DIST = \ -loader.com \ -loader_hybrid_com.asm \ -ts1325.inc +EXTRA_DIST = loader.com loader_hybrid_com.asm ts1325.inc include $(top_srcdir)/../../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/Makefile.am index 92493e4a02..1a03e013ba 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/Makefile.am @@ -6,9 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 SUBDIRS = adasockets listener tcprelay -EXTRA_DIST = \ -README \ -networkconfig.h +EXTRA_DIST = README networkconfig.h include $(top_srcdir)/../../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/adasockets/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/adasockets/Makefile.am index e53f89a255..a852d265b0 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/adasockets/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/adasockets/Makefile.am @@ -4,21 +4,9 @@ AUTOMAKE_OPTIONS = foreign 1.4 -EXTRA_DIST = \ -AUTHORS \ -COPYING \ -NEWS \ -README \ -sockets-constants.ads \ -sockets-link.ads \ -sockets-multicast.adb \ -sockets-multicast.ads \ -sockets-naming.adb \ -sockets-naming.ads \ -sockets-thin.ads \ -sockets-utils.adb \ -sockets-utils.ads \ -sockets.adb \ -sockets.ads +EXTRA_DIST = AUTHORS COPYING NEWS README sockets-constants.ads \ + sockets-link.ads sockets-multicast.adb sockets-multicast.ads \ + sockets-naming.adb sockets-naming.ads sockets-thin.ads sockets-utils.adb \ + sockets-utils.ads sockets.adb sockets.ads include $(top_srcdir)/../../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/Makefile.am index 086f023968..e6125a3c26 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/Makefile.am @@ -4,9 +4,6 @@ AUTOMAKE_OPTIONS = foreign 1.4 -EXTRA_DIST = \ -Makefile.ts_386ex \ -init.c \ -listener.adb +EXTRA_DIST = Makefile.ts_386ex init.c listener.adb include $(top_srcdir)/../../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/init.c b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/init.c index 852a2a962d..7828031b9e 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/init.c +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/init.c @@ -71,8 +71,8 @@ void *POSIX_Init( void *argument ) /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER /* #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(1) diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/Makefile.am index fff9bfe048..36f352b936 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/Makefile.am @@ -4,10 +4,6 @@ AUTOMAKE_OPTIONS = foreign 1.4 -EXTRA_DIST = \ -Makefile.ts_386ex \ -init.c \ -print_error.c \ -tcprelay.adb +EXTRA_DIST = Makefile.ts_386ex init.c print_error.c tcprelay.adb include $(top_srcdir)/../../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/init.c b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/init.c index a3d3752568..a9c0da5669 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/init.c +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/init.c @@ -73,8 +73,8 @@ void *POSIX_Init( void *argument ) /* configuration information */ -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER /* #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(1) diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.am index 1feed8d727..02a08b60c3 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.am @@ -1,21 +1,11 @@ -## +## ## $Id$ ## AUTOMAKE_OPTIONS = foreign 1.4 -EXTRA_DIST = \ -Makefile.ts_386ex \ -ts1325-button.adb \ -ts1325-parallel.adb \ -i386_ports.adb \ -ts1325-button.ads \ -ts1325-parallel.ads \ -i386_ports.ads \ -ts1325-led.adb \ -ts1325.ads \ -init.c \ -ts1325-led.ads \ -ts1325_test.adb +EXTRA_DIST = Makefile.ts_386ex ts1325-button.adb ts1325-parallel.adb \ + i386_ports.adb ts1325-button.ads ts1325-parallel.ads i386_ports.ads \ + ts1325-led.adb ts1325.ads init.c ts1325-led.ads ts1325_test.adb include $(top_srcdir)/../../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/init.c b/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/init.c index 89e1652f3f..dbe9dbfa21 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/init.c +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/init.c @@ -65,11 +65,10 @@ void *POSIX_Init( void *argument ) /* configuration information */ -#define CONFIGURE_SPTEST #define CONFIGURE_GNAT_RTEMS -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(1) diff --git a/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am index 54941a5a93..0c3d7fa39c 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 |