The CDL script of the serial loop driver package defines CYGPRI_SER_TEST_SER_DEV which prevents the package being loaded alongside serial hardware driver packages (naming clash). It seems that that the typical CYGPKG_IO_SERIAL_*_TESTING component is not really applicable to the serial loop driver package. This patch removes it. Comments?
John Dallaway
Index: devs/serial/loop/current/ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/devs/serial/loop/current/ChangeLog,v retrieving revision 1.7 diff -U5 -r1.7 ChangeLog --- devs/serial/loop/current/ChangeLog 29 Jan 2009 17:48:40 -0000 1.7 +++ devs/serial/loop/current/ChangeLog 9 Oct 2009 15:51:35 -0000 @@ -1,5 +1,11 @@ +2009-10-09 John Dallaway <[email protected]> + + * cdl/ser_loop.cdl: Remove irrelevant testing parameters which + prevent the loading of this package in the presence of other serial + device drivers. + 2003-02-24 Jonathan Larmour <[email protected]> * cdl/ser_loop.cdl: Remove irrelevant doc link. 2001-09-10 Jonathan Larmour <[email protected]> @@ -24,11 +30,11 @@ //=========================================================================== // ####GPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; either version 2 or (at your option) any // later version. Index: devs/serial/loop/current/cdl/ser_loop.cdl =================================================================== RCS file: /cvs/ecos/ecos/packages/devs/serial/loop/current/cdl/ser_loop.cdl,v retrieving revision 1.7 diff -U5 -r1.7 ser_loop.cdl --- devs/serial/loop/current/cdl/ser_loop.cdl 29 Jan 2009 17:48:40 -0000 1.7 +++ devs/serial/loop/current/cdl/ser_loop.cdl 9 Oct 2009 15:51:35 -0000 @@ -6,11 +6,11 @@ # # ==================================================================== ## ####ECOSGPLCOPYRIGHTBEGIN#### ## ------------------------------------------- ## This file is part of eCos, the Embedded Configurable Operating System. -## Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc. ## ## eCos is free software; you can redistribute it and/or modify it under ## the terms of the GNU General Public License as published by the Free ## Software Foundation; either version 2 or (at your option) any later ## version. @@ -181,26 +181,8 @@ This option modifies the set of compiler flags for building these serial device drivers. These flags are removed from the set of global flags if present." } } - - cdl_component CYGPKG_IO_SERIAL_LOOP_TESTING { - display "Testing parameters" - flavor bool - calculated 1 - active_if CYGPKG_IO_SERIAL_LOOP_SERIAL0 - - cdl_option CYGPRI_SER_TEST_SER_DEV { - display "Serial device used for testing" - flavor data - default_value { CYGDAT_IO_SERIAL_LOOP_SERIAL1_NAME } - } - - define_proc { - puts $::cdl_header "#define CYGPRI_SER_TEST_CRASH_ID \"loop\"" - puts $::cdl_header "#define CYGPRI_SER_TEST_TTY_DEV \"/dev/tty0\"" - } - } } # EOF ser_loop.cdl
