From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- c/src/lib/libbsp/i386/Makefile.am | 4 +-- c/src/lib/libbsp/i386/i386ex/Makefile.am | 4 +-- c/src/lib/libbsp/i386/i386ex/clock/Makefile.am | 6 ++-- c/src/lib/libbsp/i386/i386ex/console/Makefile.am | 6 ++-- c/src/lib/libbsp/i386/i386ex/console/console.c | 6 ---- c/src/lib/libbsp/i386/i386ex/include/Makefile.am | 4 +-- c/src/lib/libbsp/i386/i386ex/include/bsp.h | 9 +++++ c/src/lib/libbsp/i386/i386ex/network/Makefile.am | 4 +-- c/src/lib/libbsp/i386/i386ex/start/Makefile.am | 4 +-- c/src/lib/libbsp/i386/i386ex/start/start.S | 4 +-- c/src/lib/libbsp/i386/i386ex/startup/Makefile.am | 4 +-- c/src/lib/libbsp/i386/i386ex/startup/bspstart.c | 6 ++-- c/src/lib/libbsp/i386/i386ex/timer/Makefile.am | 6 ++-- c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am | 4 +-- c/src/lib/libbsp/i386/pc386/3c509/Makefile.am | 7 ++-- c/src/lib/libbsp/i386/pc386/HOWTO | 39 ++++++++++------------ c/src/lib/libbsp/i386/pc386/Makefile.am | 4 +-- c/src/lib/libbsp/i386/pc386/clock/Makefile.am | 6 ++-- c/src/lib/libbsp/i386/pc386/console/Makefile.am | 6 ++-- c/src/lib/libbsp/i386/pc386/console/console.c | 10 ------ c/src/lib/libbsp/i386/pc386/include/Makefile.am | 4 +-- c/src/lib/libbsp/i386/pc386/include/bsp.h | 12 +++++++ c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am | 6 ++-- c/src/lib/libbsp/i386/pc386/start/Makefile.am | 4 +-- c/src/lib/libbsp/i386/pc386/start/start16.S | 24 ++++++------- c/src/lib/libbsp/i386/pc386/startup/Makefile.am | 4 +-- c/src/lib/libbsp/i386/pc386/startup/bspstart.c | 4 +-- c/src/lib/libbsp/i386/pc386/startup/ldsegs.S | 34 +++++++++---------- c/src/lib/libbsp/i386/pc386/timer/Makefile.am | 6 ++-- c/src/lib/libbsp/i386/pc386/tools/Makefile.am | 10 +++--- c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am | 4 +-- c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am | 4 +-- c/src/lib/libbsp/i386/shared/Makefile.am | 4 +-- c/src/lib/libbsp/i386/shared/comm/Makefile.am | 4 +-- c/src/lib/libbsp/i386/shared/io/Makefile.am | 4 +-- c/src/lib/libbsp/i386/shared/irq/Makefile.am | 4 +-- c/src/lib/libbsp/i386/shared/pci/Makefile.am | 4 +-- c/src/lib/libbsp/i386/ts_386ex/Makefile.am | 4 +-- c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am | 6 ++-- c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am | 6 ++-- c/src/lib/libbsp/i386/ts_386ex/console/console.c | 6 ---- c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am | 4 +-- c/src/lib/libbsp/i386/ts_386ex/include/bsp.h | 9 +++++ c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am | 4 +-- c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am | 4 +-- c/src/lib/libbsp/i386/ts_386ex/start/start.S | 2 +- c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am | 4 +-- c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c | 15 ++------- c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am | 6 ++-- c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am | 16 +++------ .../i386/ts_386ex/tools/debug_ada/Makefile.am | 10 ++---- .../libbsp/i386/ts_386ex/tools/debug_ada/init.c | 4 +-- .../libbsp/i386/ts_386ex/tools/debug_c/Makefile.am | 10 ++---- .../libbsp/i386/ts_386ex/tools/debug_c/system.h | 2 +- .../libbsp/i386/ts_386ex/tools/dos_sup/Makefile.am | 5 +-- .../i386/ts_386ex/tools/network_ada/Makefile.am | 4 +-- .../tools/network_ada/adasockets/Makefile.am | 20 +++-------- .../tools/network_ada/listener/Makefile.am | 5 +-- .../ts_386ex/tools/network_ada/listener/init.c | 4 +-- .../tools/network_ada/tcprelay/Makefile.am | 6 +--- .../ts_386ex/tools/network_ada/tcprelay/init.c | 4 +-- .../i386/ts_386ex/tools/ts_1325_ada/Makefile.am | 18 +++------- .../libbsp/i386/ts_386ex/tools/ts_1325_ada/init.c | 5 ++- c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am | 4 +-- 64 files changed, 200 insertions(+), 266 deletions(-) (limited to 'c/src/lib/libbsp/i386') diff --git a/c/src/lib/libbsp/i386/Makefile.am b/c/src/lib/libbsp/i386/Makefile.am index aa7543aa89..b0225d2b1d 100644 --- a/c/src/lib/libbsp/i386/Makefile.am +++ b/c/src/lib/libbsp/i386/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/i386ex/Makefile.am b/c/src/lib/libbsp/i386/i386ex/Makefile.am index 0bc7c07a45..153fe29c17 100644 --- a/c/src/lib/libbsp/i386/i386ex/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/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/i386ex/clock/Makefile.am b/c/src/lib/libbsp/i386/i386ex/clock/Makefile.am index 016b81894f..1c5f03eaf5 100644 --- a/c/src/lib/libbsp/i386/i386ex/clock/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/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/i386ex/console/Makefile.am b/c/src/lib/libbsp/i386/i386ex/console/Makefile.am index 13810f58b0..4b0c14dbdc 100644 --- a/c/src/lib/libbsp/i386/i386ex/console/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/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/i386ex/console/console.c b/c/src/lib/libbsp/i386/i386ex/console/console.c index 821c2e4c34..d8082ddd74 100644 --- a/c/src/lib/libbsp/i386/i386ex/console/console.c +++ b/c/src/lib/libbsp/i386/i386ex/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/i386ex/include/Makefile.am b/c/src/lib/libbsp/i386/i386ex/include/Makefile.am index 43cf28d6c2..3f061aa216 100644 --- a/c/src/lib/libbsp/i386/i386ex/include/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/i386ex/include/bsp.h b/c/src/lib/libbsp/i386/i386ex/include/bsp.h index 7a812e9d5b..991badd5c5 100644 --- a/c/src/lib/libbsp/i386/i386ex/include/bsp.h +++ b/c/src/lib/libbsp/i386/i386ex/include/bsp.h @@ -25,6 +25,15 @@ extern "C" { #include #include +/* + * confdefs.h overrides for this BSP: + * - number of 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) + /* * Define the time limits for RTEMS Test Suite test durations. * Long test and short test duration limits are provided. These diff --git a/c/src/lib/libbsp/i386/i386ex/network/Makefile.am b/c/src/lib/libbsp/i386/i386ex/network/Makefile.am index 622d9ccfb3..d0e6c20966 100644 --- a/c/src/lib/libbsp/i386/i386ex/network/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/network/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/i386ex/start/Makefile.am b/c/src/lib/libbsp/i386/i386ex/start/Makefile.am index 00e98eb654..e8514e5c0c 100644 --- a/c/src/lib/libbsp/i386/i386ex/start/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/i386ex/start/start.S b/c/src/lib/libbsp/i386/i386ex/start/start.S index 80f7b8cdf1..c3a8564c9c 100644 --- a/c/src/lib/libbsp/i386/i386ex/start/start.S +++ b/c/src/lib/libbsp/i386/i386ex/start/start.S @@ -83,7 +83,7 @@ END_DATA */ .code16 - .section .reset + .section .reset, "ax" PUBLIC ( SYM(reset) ) SYM(reset): nop @@ -106,7 +106,7 @@ SYM(reset): nop nop - .section .initial + .section .initial, "ax" /* nop */ /* required for linker -- initial jump is to "label - 2" */ /* nop */ /* ie. _initInternalRegisters -2 ( which now == .initial ) */ /* diff --git a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am index b6bff49c66..c351417051 100644 --- a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c index c6dfe741cb..0f9f5dea51 100644 --- a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c @@ -102,14 +102,13 @@ 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; /* changed Sept 14 STACK_MINIMUM_SIZE */ + /* changed Sept 14 STACK_MINIMUM_SIZE */ + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; #if defined(RTEMS_POSIX_API) BSP_Configuration.work_space_size *= 3; #endif - /* BSP_Configuration.work_space_size += 128 * RTEMS_MINIMUM_STACK_SIZE; */ - BSP_Configuration.work_space_start = (void *) RAM_END - BSP_Configuration.work_space_size; #ifdef DEBUG @@ -120,7 +119,6 @@ void bsp_start( void ) * Account for the console's resources */ - /* console_reserve_resources( &BSP_Configuration ); */ /* * Init rtems_interrupt_management */ diff --git a/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am b/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am index 5e87c956a3..df08f6e87d 100644 --- a/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -20,7 +20,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/i386ex/wrapup/Makefile.am b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am index 54941a5a93..0c3d7fa39c 100644 --- a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am index 982f1d6b89..6c741eea90 100644 --- a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -23,8 +23,7 @@ AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ $(PGM): $(X3c509_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 if HAS_NETWORKING diff --git a/c/src/lib/libbsp/i386/pc386/HOWTO b/c/src/lib/libbsp/i386/pc386/HOWTO index 9c7a9af2b4..1bf00a3b0b 100644 --- a/c/src/lib/libbsp/i386/pc386/HOWTO +++ b/c/src/lib/libbsp/i386/pc386/HOWTO @@ -1,6 +1,6 @@ - +-----------------------------------------------------------------------------+ -| RTEMS 4.0.0 PC386 BSP HOWTO - 1998/04/21 | +| RTEMS 4.5.0 PC386 BSP HOWTO - 1998/04/21 | +| | +-----------------------------------------------------------------------------+ | (C) Copyright 1998 - | | - NavIST Group - Real-Time Distributed Systems and Industrial Automation | @@ -14,6 +14,11 @@ | This file is provided "AS IS" without warranty of any kind, either | | expressed or implied. | +-----------------------------------------------------------------------------+ +| History: | +| 12 June 2000 - Updated to 4.5 (Joel) | ++-----------------------------------------------------------------------------+ + +CVS Revision: $Id$ 1. Introduction @@ -37,31 +42,24 @@ substituted by the real thing! ------------------------------------------------ Obtaining, building and installing the tools for building the -PC386 BSP of RTEMS is covered in detail in the 'RTEMS 4.0.0 On-Line -Library' -> 'Getting Started with RTEMS for C/C++ Users' -> 'Building -the GNU C/C++ Cross Compiler Toolset'. +PC386 BSP of RTEMS is covered in detail in the 'RTEMS 4.5.0 On-Line +Library' -> 'Getting Started with RTEMS for C/C++ Users'. You can +either use pre-built toolset executables or build your own from +the instructions given there. - When running the 'bit' script you should specift the argumetn as -either: - - + 'i386-elf' to indicate an 'i386-rtemself' toolset, or - + 'i386' to indicate an 'i386-rtems' toolset. + This BSP is designed to work only with ELF toolset configurations. +This is format used by the i386-rtems target. 4. Building RTEMS ----------------- Obtaining, building and installing the tools for building the -PC386 BSP is covered in detail in the 'RTEMS 4.0.0 On-Line Library' -> +PC386 BSP is covered in detail in the 'RTEMS 4.5.0 On-Line Library' -> 'Getting Started with RTEMS for C/C++ Users' -> 'Building RTEMS'. When running configure, use the following values for the listed -options: - - + with an i386-rtemself toolset - --target=i386-rtemself - --enable-rtemsbsp=pc386 +options with an i386-rtems toolset: - + with an i386-rtems toolset --target=i386-rtems --enable-rtemsbsp=pc386 @@ -116,11 +114,10 @@ and run your PC386 BSP samples, tests and programs. You can get the latest release of GRUB from its homepage: - - http://www.uruk.org/grub/ - -or alternatively by ftp from: + - http://www.gnu.org/grub/ - - ftp://ftp.uruk.org/public/grub/ +NOTE: The former location was http://www.uruk.org/grub and ftp from + ftp://ftp.uruk.org/public/grub. Once you obtain the .tar.gz archive 'grub-0.4.tar.gz', change to a temporary directory (you won't need the grub files after this and can diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index c332929df0..5b350eb638 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/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/pc386/clock/Makefile.am b/c/src/lib/libbsp/i386/pc386/clock/Makefile.am index c8a411e6de..131b243ca6 100644 --- a/c/src/lib/libbsp/i386/pc386/clock/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/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/pc386/console/Makefile.am b/c/src/lib/libbsp/i386/pc386/console/Makefile.am index 1846bc26c1..c845b25351 100644 --- a/c/src/lib/libbsp/i386/pc386/console/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/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/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c index 8da96684d7..fff960eb91 100644 --- a/c/src/lib/libbsp/i386/pc386/console/console.c +++ b/c/src/lib/libbsp/i386/pc386/console/console.c @@ -104,16 +104,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) -{ - if(BSPConsolePort != BSP_CONSOLE_PORT_CONSOLE) - { - 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/pc386/include/Makefile.am b/c/src/lib/libbsp/i386/pc386/include/Makefile.am index 332b5955cd..2f4544274f 100644 --- a/c/src/lib/libbsp/i386/pc386/include/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/c/src/lib/libbsp/i386/pc386/include/bsp.h index e469d2b14d..dc1d2e497e 100644 --- a/c/src/lib/libbsp/i386/pc386/include/bsp.h +++ b/c/src/lib/libbsp/i386/pc386/include/bsp.h @@ -53,6 +53,15 @@ extern "C" { #include #include +/* + * confdefs.h overrides for this BSP: + * - number of termios serial ports + * - Interrupt stack space is not minimum if defined. + */ + +#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 1 +#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) + /* * Network driver configuration */ @@ -134,6 +143,8 @@ extern int rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config); #define Clear_tm27_intr() #define Lower_tm27_intr() +/* does anyone need this? if so, report it so we can rename this macro */ +#if 0 /*-------------------------------------------------------------------------+ | Simple spin delay in microsecond units for device drivers. | This is very dependent on the clock speed of the target. @@ -143,6 +154,7 @@ extern int rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config); rtems_unsigned32 _cnt = _microseconds; \ asm volatile ("0: nop; mov %0,%0; loop 0b" : "=c"(_cnt) : "0"(_cnt)); \ } +#endif /*-------------------------------------------------------------------------+ | Convert microseconds to ticks and ticks to microseconds. diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am index e68eeeb6dc..ef41a484d9 100644 --- a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -21,7 +21,7 @@ AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ $(PGM): $(ne2000_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 if HAS_NETWORKING diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.am b/c/src/lib/libbsp/i386/pc386/start/Makefile.am index f8e467dab2..2d530c6695 100644 --- a/c/src/lib/libbsp/i386/pc386/start/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/pc386/start/start16.S b/c/src/lib/libbsp/i386/pc386/start/start16.S index d9aea202f3..520895de47 100644 --- a/c/src/lib/libbsp/i386/pc386/start/start16.S +++ b/c/src/lib/libbsp/i386/pc386/start/start16.S @@ -109,16 +109,16 @@ _start16: outb %al, $0x60 call empty_8042 - call delay - call delay - call delay + call pc386_delay + call pc386_delay + call pc386_delay movl %cs:HDRSTART + HDROFF, %eax # pushl %eax # jump to start of 32 bit code ret # /*----------------------------------------------------------------------------+ -| delay +| pc386_delay +------------------------------------------------------------------------------ | Delay is needed after doing I/O. | @@ -131,10 +131,10 @@ _start16: | NOTE: Saving the content of the EAX register just in case. - Rosimildo. +----------------------------------------------------------------------------*/ .p2align 4 - .globl _delay - .globl delay -delay: -_delay: + .globl _pc386_delay + .globl pc386_delay +pc386_delay: +_pc386_delay: pushl %eax #if defined(USE_OUTB_FOR_DELAY) outb %al, $0x80 # about 1uS delay on most machines @@ -142,9 +142,9 @@ _delay: #else movl $0x200, %eax -delay1: +pc386_delay1: dec %eax - jnz delay1 + jnz pc386_delay1 #endif popl %eax ret @@ -162,11 +162,11 @@ delay1: .globl empty_8042 empty_8042: _empty_8042: - call delay + call pc386_delay inb $0x64, %al # 8042 status port testb $0x01, %al # output buffer? jz no_output - call delay + call pc386_delay in $0x60, %al # read it jmp empty_8042 no_output: diff --git a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am index ac225d520b..a634ef5724 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c index dc2a24debb..e443b31402 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c @@ -163,7 +163,7 @@ void bsp_start_default( void ) Cpu_table.do_zero_of_workspace = TRUE; Cpu_table.interrupt_table_segment = get_ds(); Cpu_table.interrupt_table_offset = (void *)Interrupt_descriptor_table; - Cpu_table.interrupt_stack_size = 4096; + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; Cpu_table.extra_mpci_receive_server_stack = 0; /* Place RTEMS workspace at beginning of free memory. */ @@ -174,8 +174,6 @@ void bsp_start_default( void ) BSP_Configuration.work_space_start = (void *)rtemsFreeMemStart; rtemsFreeMemStart += BSP_Configuration.work_space_size; - console_reserve_resources(&BSP_Configuration); - /* * Init rtems interrupt management */ diff --git a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S b/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S index 87fc02f0f4..6d7ec06022 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S +++ b/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S @@ -50,7 +50,7 @@ BEGIN_CODE EXTERN (clockOff) /*----------------------------------------------------------------------------+ -| delay +| pc386_delay +------------------------------------------------------------------------------ | Delay is needed after doing I/O. | @@ -64,17 +64,17 @@ BEGIN_CODE #define DELAY_USE_OUTB .p2align 4 - .globl _delay - .globl delay -delay: -_delay: + .globl _pc386_delay + .globl pc386_delay +pc386_delay: +_pc386_delay: #ifdef DELAY_USE_OUTB outb al, $0x80 # about 1uS delay on most machines #else movl $0x200, eax -delay1: +pc386_delay1: dec eax - jnz delay1 + jnz pc386_delay1 #endif ret @@ -123,36 +123,36 @@ next_step: movb $0x11, al /* initialization sequence */ outb al, $0x20 /* send it to 8259A-1 */ - call SYM(delay) + call SYM(pc386_delay) outb al, $0xA0 /* and to 8259A-2 */ - call SYM(delay) + call SYM(pc386_delay) movb $0x20, al /* start of hardware int's (0x20) */ outb al, $0x21 - call SYM(delay) + call SYM(pc386_delay) movb $0x28, al /* start of hardware int's 2 (0x28) */ outb al, $0xA1 - call SYM(delay) + call SYM(pc386_delay) movb $0x04, al /* 8259-1 is master */ outb al, $0x21 - call SYM(delay) + call SYM(pc386_delay) movb $0x02, al /* 8259-2 is slave */ outb al, $0xA1 - call SYM(delay) + call SYM(pc386_delay) movb $0x01, al /* 8086 mode for both */ outb al, $0x21 - call SYM(delay) + call SYM(pc386_delay) outb al, $0xA1 - call SYM(delay) + call SYM(pc386_delay) movb $0xFF, al /* mask off all interrupts for now */ outb al, $0xA1 - call SYM(delay) + call SYM(pc386_delay) movb $0xFB, al /* mask all irq's but irq2 which */ outb al, $0x21 /* is cascaded */ - call SYM(delay) + call SYM(pc386_delay) movw $0xFFFB, SYM(i8259s_cache) /* set up same values in cache */ diff --git a/c/src/lib/libbsp/i386/pc386/timer/Makefile.am b/c/src/lib/libbsp/i386/pc386/timer/Makefile.am index 5e87c956a3..df08f6e87d 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -20,7 +20,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/pc386/tools/Makefile.am b/c/src/lib/libbsp/i386/pc386/tools/Makefile.am index 43049dd3b7..e6ce930223 100644 --- a/c/src/lib/libbsp/i386/pc386/tools/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/tools/Makefile.am @@ -7,8 +7,7 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal EXTRA_DIST = Spec.doc -noinst_PROGRAMS = \ -bin2boot +noinst_PROGRAMS = bin2boot bin2boot_SOURCES = bin2boot.c @@ -18,11 +17,10 @@ bin2boot_SOURCES = bin2boot.c @PROJECT_RELEASE@/build-tools/bin2boot$(EXEEXT): bin2boot$(EXEEXT) $(INSTALL_PROGRAM) $< $@ -PREINSTALL_FILES = \ -@PROJECT_RELEASE@/build-tools \ -@PROJECT_RELEASE@/build-tools/bin2boot$(EXEEXT) +PREINSTALL_FILES += @PROJECT_RELEASE@/build-tools \ + @PROJECT_RELEASE@/build-tools/bin2boot$(EXEEXT) ## HACK: install into build-tree all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../../../../../automake/local.am +include $(top_srcdir)/../../../../../../../automake/host.am diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am index fafd810eb4..24abfa1c65 100644 --- a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am index 25c26d5fa9..9250a7c3cd 100644 --- a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/shared/Makefile.am b/c/src/lib/libbsp/i386/shared/Makefile.am index 0089ff68f1..b4677e767b 100644 --- a/c/src/lib/libbsp/i386/shared/Makefile.am +++ b/c/src/lib/libbsp/i386/shared/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/shared/comm/Makefile.am b/c/src/lib/libbsp/i386/shared/comm/Makefile.am index 7ce8233a6e..5db6da55a3 100644 --- a/c/src/lib/libbsp/i386/shared/comm/Makefile.am +++ b/c/src/lib/libbsp/i386/shared/comm/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/shared/io/Makefile.am b/c/src/lib/libbsp/i386/shared/io/Makefile.am index 4f8c55b1bd..f3d98b6b1a 100644 --- a/c/src/lib/libbsp/i386/shared/io/Makefile.am +++ b/c/src/lib/libbsp/i386/shared/io/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/shared/irq/Makefile.am b/c/src/lib/libbsp/i386/shared/irq/Makefile.am index 2984151f42..26b590d864 100644 --- a/c/src/lib/libbsp/i386/shared/irq/Makefile.am +++ b/c/src/lib/libbsp/i386/shared/irq/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/shared/pci/Makefile.am b/c/src/lib/libbsp/i386/shared/pci/Makefile.am index c14031956d..d33cca7737 100644 --- a/c/src/lib/libbsp/i386/shared/pci/Makefile.am +++ b/c/src/lib/libbsp/i386/shared/pci/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 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 #include #include + +/* + * 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 -- cgit v1.2.3