This patch cleans up various minor issues with presentation of CDL items within the eCos Configuration Tool. Checked-in.
John Dallaway
Index: fs/fat/current/ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/fs/fat/current/ChangeLog,v retrieving revision 1.20 diff -u -5 -r1.20 ChangeLog --- fs/fat/current/ChangeLog 29 Jan 2009 17:48:51 -0000 1.20 +++ fs/fat/current/ChangeLog 28 Apr 2009 12:51:37 -0000 @@ -1,5 +1,9 @@ +2009-04-28 John Dallaway <[email protected]> + + cdl/fatfs.cdl: Use CYGPKG_IO_FILEIO as the parent. + 2008-08-19 Andrew Lunn <[email protected]> * cdl/fatfs.cdl: Add configury for the disk device names to be used for the tests. Default to the synthetic tests, since what seems to be the most used test platform. @@ -203,11 +207,11 @@ //=========================================================================== // ####GPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 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: fs/fat/current/cdl/fatfs.cdl =================================================================== RCS file: /cvs/ecos/ecos/packages/fs/fat/current/cdl/fatfs.cdl,v retrieving revision 1.7 diff -u -5 -r1.7 fatfs.cdl --- fs/fat/current/cdl/fatfs.cdl 29 Jan 2009 17:48:53 -0000 1.7 +++ fs/fat/current/cdl/fatfs.cdl 28 Apr 2009 12:51:38 -0000 @@ -6,11 +6,11 @@ # # ==================================================================== ## ####ECOSGPLCOPYRIGHTBEGIN#### ## ------------------------------------------- ## This file is part of eCos, the Embedded Configurable Operating System. -## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 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. @@ -49,10 +49,11 @@ cdl_package CYGPKG_FS_FAT { display "FAT filesystem" include_dir cyg/fs + parent CYGPKG_IO_FILEIO requires CYGPKG_IO_FILEIO requires CYGPKG_ISOINFRA requires CYGINT_ISO_ERRNO requires CYGINT_ISO_ERRNO_CODES Index: fs/jffs2/current/ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/fs/jffs2/current/ChangeLog,v retrieving revision 1.55 diff -u -5 -r1.55 ChangeLog --- fs/jffs2/current/ChangeLog 20 Mar 2009 20:32:18 -0000 1.55 +++ fs/jffs2/current/ChangeLog 28 Apr 2009 12:51:38 -0000 @@ -1,5 +1,9 @@ +2009-04-28 John Dallaway <[email protected]> + + cdl/jffs2.cdl: Use CYGPKG_IO_FILEIO as the parent. + 2009-02-22 Andrew Lunn <[email protected]> * cdl/jffs2.cdl: Add include-fixed to the system include files we should search. Without this gcc 4.3 breaks. @@ -510,11 +514,11 @@ //=========================================================================== // ####GPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 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: fs/jffs2/current/cdl/jffs2.cdl =================================================================== RCS file: /cvs/ecos/ecos/packages/fs/jffs2/current/cdl/jffs2.cdl,v retrieving revision 1.27 diff -u -5 -r1.27 jffs2.cdl --- fs/jffs2/current/cdl/jffs2.cdl 20 Mar 2009 20:32:19 -0000 1.27 +++ fs/jffs2/current/cdl/jffs2.cdl 28 Apr 2009 12:51:38 -0000 @@ -8,11 +8,11 @@ # # ==================================================================== ## ####ECOSGPLCOPYRIGHTBEGIN#### ## ------------------------------------------- ## This file is part of eCos, the Embedded Configurable Operating System. -## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 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. @@ -53,10 +53,11 @@ cdl_package CYGPKG_FS_JFFS2 { display "JFFS2 filesystem" doc ref/fileio.html include_dir "" + parent CYGPKG_IO_FILEIO requires CYGPKG_IO_FILEIO requires CYGPKG_IO_FLASH requires CYGINT_ISO_MALLOC requires CYGPKG_ISOINFRA Index: fs/ram/current/ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/fs/ram/current/ChangeLog,v retrieving revision 1.21 diff -u -5 -r1.21 ChangeLog --- fs/ram/current/ChangeLog 29 Jan 2009 17:48:54 -0000 1.21 +++ fs/ram/current/ChangeLog 28 Apr 2009 12:51:38 -0000 @@ -1,5 +1,9 @@ +2009-04-28 John Dallaway <[email protected]> + + cdl/ramfs.cdl: Use CYGPKG_IO_FILEIO as the parent. + 2008-04-02 Xinghua Yang <[email protected]> Taiyun Wang <[email protected]> * cdl/ramfs.cdl: Use CYGPKG_FS_RAM_RET_DIRENT_DTYPE to control whether ram sets file type in ramfs_fo_dirread. @@ -129,11 +133,11 @@ //=========================================================================== // ####GPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 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: fs/ram/current/cdl/ramfs.cdl =================================================================== RCS file: /cvs/ecos/ecos/packages/fs/ram/current/cdl/ramfs.cdl,v retrieving revision 1.12 diff -u -5 -r1.12 ramfs.cdl --- fs/ram/current/cdl/ramfs.cdl 29 Jan 2009 17:48:54 -0000 1.12 +++ fs/ram/current/cdl/ramfs.cdl 28 Apr 2009 12:51:39 -0000 @@ -6,11 +6,11 @@ # # ==================================================================== ## ####ECOSGPLCOPYRIGHTBEGIN#### ## ------------------------------------------- ## This file is part of eCos, the Embedded Configurable Operating System. -## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 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. @@ -51,10 +51,11 @@ cdl_package CYGPKG_FS_RAM { display "RAM filesystem" doc ref/fileio.html include_dir cyg/ramfs + parent CYGPKG_IO_FILEIO requires CYGPKG_IO_FILEIO requires CYGPKG_ISOINFRA requires CYGPKG_ERROR requires CYGINT_ISO_ERRNO Index: fs/rom/current/ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/fs/rom/current/ChangeLog,v retrieving revision 1.26 diff -u -5 -r1.26 ChangeLog --- fs/rom/current/ChangeLog 7 Feb 2009 15:43:10 -0000 1.26 +++ fs/rom/current/ChangeLog 28 Apr 2009 12:51:39 -0000 @@ -1,5 +1,9 @@ +2009-04-28 John Dallaway <[email protected]> + + cdl/romfs.cdl: Use CYGPKG_IO_FILEIO as the parent. + 2009-02-07 John Dallaway <[email protected]> * cdl/romfs.cdl: Pass file2c.tcl to tclsh directly. 2009-01-08 John Dallaway <[email protected]> Index: fs/rom/current/cdl/romfs.cdl =================================================================== RCS file: /cvs/ecos/ecos/packages/fs/rom/current/cdl/romfs.cdl,v retrieving revision 1.14 diff -u -5 -r1.14 romfs.cdl --- fs/rom/current/cdl/romfs.cdl 7 Feb 2009 15:43:10 -0000 1.14 +++ fs/rom/current/cdl/romfs.cdl 28 Apr 2009 12:51:39 -0000 @@ -51,10 +51,11 @@ cdl_package CYGPKG_FS_ROM { display "ROM filesystem" doc ref/fileio.html include_dir cyg/romfs + parent CYGPKG_IO_FILEIO requires CYGPKG_IO_FILEIO requires CYGPKG_ISOINFRA requires CYGINT_ISO_ERRNO requires CYGINT_ISO_ERRNO_CODES Index: devs/watchdog/arm/at91/current/ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/devs/watchdog/arm/at91/current/ChangeLog,v retrieving revision 1.4 diff -u -5 -r1.4 ChangeLog --- devs/watchdog/arm/at91/current/ChangeLog 29 Jan 2009 17:48:49 -0000 1.4 +++ devs/watchdog/arm/at91/current/ChangeLog 28 Apr 2009 12:51:42 -0000 @@ -1,5 +1,11 @@ +2009-04-28 John Dallaway <[email protected]> + + * cdl/watchdog_at91.cdl: Give CYGIMP_WATCHDOG_HARDWARE a default + value rather than a calculated value to accommodate other + implementations of CYGINT_WATCHDOG_IMPLEMENTATIONS. + 2004-10-4 Andrea Michelotti <[email protected]> * src/watchdog_at91.cxx: * cdl/watchdog_at91.cdl: added JTST support @@ -14,11 +20,11 @@ * Added watchdog driver for ARM AT91 board. // ####GPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 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/watchdog/arm/at91/current/cdl/watchdog_at91.cdl =================================================================== RCS file: /cvs/ecos/ecos/packages/devs/watchdog/arm/at91/current/cdl/watchdog_at91.cdl,v retrieving revision 1.4 diff -u -5 -r1.4 watchdog_at91.cdl --- devs/watchdog/arm/at91/current/cdl/watchdog_at91.cdl 29 Jan 2009 17:48:49 -0000 1.4 +++ devs/watchdog/arm/at91/current/cdl/watchdog_at91.cdl 28 Apr 2009 12:51:42 -0000 @@ -6,11 +6,11 @@ # # ==================================================================== ## ####ECOSGPLCOPYRIGHTBEGIN#### ## ------------------------------------------- ## This file is part of eCos, the Embedded Configurable Operating System. -## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 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. @@ -69,11 +69,11 @@ since it uses a totally different watchdog device." cdl_option CYGIMP_WATCHDOG_HARDWARE { parent CYGPKG_IO_WATCHDOG_IMPLEMENTATION display "Hardware watchdog" - calculated 1 + default_value 1 implements CYGINT_WATCHDOG_IMPLEMENTATIONS } cdl_option CYGNUM_DEVS_WATCHDOG_ARM_AT91_DESIRED_TIMEOUT_MS { display "Desired timeout value" Index: devs/watchdog/arm/at91wdtc/current/ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/devs/watchdog/arm/at91wdtc/current/ChangeLog,v retrieving revision 1.3 diff -u -5 -r1.3 ChangeLog --- devs/watchdog/arm/at91wdtc/current/ChangeLog 4 Feb 2009 18:19:29 -0000 1.3 +++ devs/watchdog/arm/at91wdtc/current/ChangeLog 28 Apr 2009 12:51:42 -0000 @@ -1,5 +1,11 @@ +2009-04-28 John Dallaway <[email protected]> + + * cdl/watchdog_at91wdtc.cdl: Give CYGIMP_WATCHDOG_HARDWARE a default + value rather than a calculated value to accommodate other + implementations of CYGINT_WATCHDOG_IMPLEMENTATIONS. + 2009-02-04 Bart Veer <[email protected]> * src/watchdog_at91wdtc.cxx: switch init priority to CYG_INIT_INTERRUPTS. Index: devs/watchdog/arm/at91wdtc/current/cdl/watchdog_at91wdtc.cdl =================================================================== RCS file: /cvs/ecos/ecos/packages/devs/watchdog/arm/at91wdtc/current/cdl/watchdog_at91wdtc.cdl,v retrieving revision 1.2 diff -u -5 -r1.2 watchdog_at91wdtc.cdl --- devs/watchdog/arm/at91wdtc/current/cdl/watchdog_at91wdtc.cdl 29 Jan 2009 17:48:49 -0000 1.2 +++ devs/watchdog/arm/at91wdtc/current/cdl/watchdog_at91wdtc.cdl 28 Apr 2009 12:51:42 -0000 @@ -6,11 +6,11 @@ # # ==================================================================== ## ####ECOSGPLCOPYRIGHTBEGIN#### ## ------------------------------------------- ## This file is part of eCos, the Embedded Configurable Operating System. -## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 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. @@ -67,11 +67,11 @@ use the Watchdog Timer Controller." cdl_option CYGIMP_WATCHDOG_HARDWARE { parent CYGPKG_IO_WATCHDOG_IMPLEMENTATION display "Hardware watchdog" - calculated 1 + default_value 1 implements CYGINT_WATCHDOG_IMPLEMENTATIONS } cdl_option CYGNUM_DEVS_WATCHDOG_ARM_AT91WDTC_DESIRED_TIMEOUT_MS { display "Desired timeout value" Index: devs/watchdog/arm/lpc2xxx/current/ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/devs/watchdog/arm/lpc2xxx/current/ChangeLog,v retrieving revision 1.6 diff -u -5 -r1.6 ChangeLog --- devs/watchdog/arm/lpc2xxx/current/ChangeLog 9 Feb 2009 21:07:11 -0000 1.6 +++ devs/watchdog/arm/lpc2xxx/current/ChangeLog 28 Apr 2009 12:51:42 -0000 @@ -1,5 +1,11 @@ +2009-04-28 John Dallaway <[email protected]> + + * cdl/watchdog_lpc2xxx.cdl: Give CYGIMP_WATCHDOG_HARDWARE a default + value rather than a calculated value to accommodate other + implementations of CYGINT_WATCHDOG_IMPLEMENTATIONS. + 2009-02-09 Bart Veer <[email protected]> * src/watchdog_lpc2xxx.cxx: switch init priority to CYG_INIT_INTERRUPTS. Index: devs/watchdog/arm/lpc2xxx/current/cdl/watchdog_lpc2xxx.cdl =================================================================== RCS file: /cvs/ecos/ecos/packages/devs/watchdog/arm/lpc2xxx/current/cdl/watchdog_lpc2xxx.cdl,v retrieving revision 1.2 diff -u -5 -r1.2 watchdog_lpc2xxx.cdl --- devs/watchdog/arm/lpc2xxx/current/cdl/watchdog_lpc2xxx.cdl 29 Jan 2009 17:48:49 -0000 1.2 +++ devs/watchdog/arm/lpc2xxx/current/cdl/watchdog_lpc2xxx.cdl 28 Apr 2009 12:51:42 -0000 @@ -6,11 +6,11 @@ # # ==================================================================== ## ####ECOSGPLCOPYRIGHTBEGIN#### ## ------------------------------------------- ## This file is part of eCos, the Embedded Configurable Operating System. -## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 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. @@ -65,11 +65,11 @@ longer than a given timeout interval." cdl_option CYGIMP_WATCHDOG_HARDWARE { parent CYGPKG_IO_WATCHDOG_IMPLEMENTATION display "Hardware watchdog" - calculated 1 + default_value 1 implements CYGINT_WATCHDOG_IMPLEMENTATIONS } cdl_option CYGNUM_DEVS_WATCHDOG_ARM_LPC2XXX_DESIRED_TIMEOUT_MS { display "Desired timeout value" Index: services/compress/zlib/current/ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/services/compress/zlib/current/ChangeLog,v retrieving revision 1.18 diff -u -5 -r1.18 ChangeLog --- services/compress/zlib/current/ChangeLog 9 Mar 2009 14:18:59 -0000 1.18 +++ services/compress/zlib/current/ChangeLog 28 Apr 2009 12:51:43 -0000 @@ -1,5 +1,10 @@ +2009-04-28 John Dallaway <[email protected]> + + * cdl/compress_zlib.cdl: Fix display and description strings for + LDFLAGS manipulation options. + 2009-03-09 John Dallaway <[email protected]> * cdl/compress_zlib.cdl: Reference test executable filenames for compatibility with the eCos Configuration Tool. Index: services/compress/zlib/current/cdl/compress_zlib.cdl =================================================================== RCS file: /cvs/ecos/ecos/packages/services/compress/zlib/current/cdl/compress_zlib.cdl,v retrieving revision 1.10 diff -u -5 -r1.10 compress_zlib.cdl --- services/compress/zlib/current/cdl/compress_zlib.cdl 9 Mar 2009 14:18:59 -0000 1.10 +++ services/compress/zlib/current/cdl/compress_zlib.cdl 28 Apr 2009 12:51:43 -0000 @@ -133,27 +133,27 @@ building this package. These flags are removed from the set of global flags if present." } cdl_option CYGPKG_COMPRESS_ZLIB_LDFLAGS_ADD { - display "Additional compiler flags" + display "Additional linker flags" flavor data no_define default_value { "" } description " - This option modifies the set of compiler flags for + This option modifies the set of linker flags for building this package. These flags are used in addition to the set of global flags." } cdl_option CYGPKG_COMPRESS_ZLIB_LDFLAGS_REMOVE { - display "Suppressed compiler flags" + display "Suppressed linker flags" flavor data no_define default_value { "" } description " - This option modifies the set of compiler flags for + This option modifies the set of linker flags for building this package. These flags are removed from the set of global flags if present." } } Index: io/disk/current/ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/io/disk/current/ChangeLog,v retrieving revision 1.7 diff -u -5 -r1.7 ChangeLog --- io/disk/current/ChangeLog 29 Jan 2009 17:49:45 -0000 1.7 +++ io/disk/current/ChangeLog 28 Apr 2009 12:51:43 -0000 @@ -1,5 +1,9 @@ +2009-04-28 John Dallaway <[email protected]> + + cdl/io_disk.cdl: Use CYGPKG_IO as the parent. + 2006-09-21 Jonathan Larmour <[email protected]> * include/disk.h (DISK_CHANNEL): No need for extra _part_dev slot intended for entire disk's own devtab. @@ -137,11 +141,11 @@ //=========================================================================== // ####GPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006, 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: io/disk/current/cdl/io_disk.cdl =================================================================== RCS file: /cvs/ecos/ecos/packages/io/disk/current/cdl/io_disk.cdl,v retrieving revision 1.4 diff -u -5 -r1.4 io_disk.cdl --- io/disk/current/cdl/io_disk.cdl 29 Jan 2009 17:49:45 -0000 1.4 +++ io/disk/current/cdl/io_disk.cdl 28 Apr 2009 12:51:43 -0000 @@ -6,11 +6,11 @@ # # ==================================================================== ## ####ECOSGPLCOPYRIGHTBEGIN#### ## ------------------------------------------- ## This file is part of eCos, the Embedded Configurable Operating System. -## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 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. @@ -48,10 +48,11 @@ # # ==================================================================== cdl_package CYGPKG_IO_DISK { display "Disk device drivers" + parent CYGPKG_IO active_if CYGPKG_IO requires CYGPKG_ERROR include_dir cyg/io description " This option enables drivers for basic I/O services on Index: io/watchdog/current/ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/io/watchdog/current/ChangeLog,v retrieving revision 1.8 diff -u -5 -r1.8 ChangeLog --- io/watchdog/current/ChangeLog 4 Feb 2009 17:50:24 -0000 1.8 +++ io/watchdog/current/ChangeLog 28 Apr 2009 12:51:45 -0000 @@ -1,5 +1,11 @@ +2009-04-28 John Dallaway <[email protected]> + + * cdl/watchdog.cdl: Move the CYGINT_WATCHDOG_IMPLEMENTATIONS + constraint to the interface declaration itself to ensure that the + eCos Configuration Tool presents implementators as radio buttons. + 2009-02-04 Bart Veer <[email protected]> * src/watchdog.cxx: switch to CYG_INIT_DEV_WATCHDOG init priority. 2003-11-05 Bob Koninckx <[email protected]> Index: io/watchdog/current/cdl/watchdog.cdl =================================================================== RCS file: /cvs/ecos/ecos/packages/io/watchdog/current/cdl/watchdog.cdl,v retrieving revision 1.6 diff -u -5 -r1.6 watchdog.cdl --- io/watchdog/current/cdl/watchdog.cdl 29 Jan 2009 17:49:49 -0000 1.6 +++ io/watchdog/current/cdl/watchdog.cdl 28 Apr 2009 12:51:45 -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. @@ -50,11 +50,10 @@ cdl_package CYGPKG_IO_WATCHDOG { display "Watchdog IO device" define_header watchdog.h include_dir cyg/io - requires 1 == CYGINT_WATCHDOG_IMPLEMENTATIONS description " The watchdog IO device allows applications to make use of a timer facility. Depending on the underlying hardware device driver, a watchdog timeout will either cause a board reset or an action routine to be called. The application must call @@ -71,10 +70,11 @@ } cdl_interface CYGINT_WATCHDOG_IMPLEMENTATIONS { display "Number of watchdog implementations" no_define + requires 1 == CYGINT_WATCHDOG_IMPLEMENTATIONS } cdl_component CYGPKG_IO_WATCHDOG_IMPLEMENTATION { display "Watchdog implementation" flavor none
