changeset 2872:5ae4b05913c1

* fs/fat/current/cdl/fatfs.cdl, fs/jffs2/current/cdl/jffs2.cdl, fs/ram/current/cdl/ramfs.cdl, fs/rom/current/cdl/romfs.cdl: Use CYGPKG_IO_FILEIO as the parent. * devs/watchdog/arm/at91/current/cdl/watchdog_at91.cdl, devs/watchdog/arm/at91wdtc/current/cdl/watchdog_at91wdtc.cdl, devs/watchdog/arm/lpc2xxx/current/cdl/watchdog_lpc2xxx.cdl: Give CYGIMP_WATCHDOG_HARDWARE a default value rather than a calculated value to accommodate other implementations of CYGINT_WATCHDOG_IMPLEMENTATIONS. * services/compress/zlib/current/cdl/compress_zlib.cdl: Fix display and description strings for LDFLAGS manipulation options. * io/disk/current/cdl/io_disk.cdl: Use CYGPKG_IO as the parent. * io/watchdog/current/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.
author jld
date Tue, 28 Apr 2009 13:06:11 +0000
parents 73f2982fdf46
children da0eeb594067
files packages/devs/watchdog/arm/at91/current/ChangeLog packages/devs/watchdog/arm/at91/current/cdl/watchdog_at91.cdl packages/devs/watchdog/arm/at91wdtc/current/ChangeLog packages/devs/watchdog/arm/at91wdtc/current/cdl/watchdog_at91wdtc.cdl packages/devs/watchdog/arm/lpc2xxx/current/ChangeLog packages/devs/watchdog/arm/lpc2xxx/current/cdl/watchdog_lpc2xxx.cdl packages/fs/fat/current/ChangeLog packages/fs/fat/current/cdl/fatfs.cdl packages/fs/jffs2/current/ChangeLog packages/fs/jffs2/current/cdl/jffs2.cdl packages/fs/ram/current/ChangeLog packages/fs/ram/current/cdl/ramfs.cdl packages/fs/rom/current/ChangeLog packages/fs/rom/current/cdl/romfs.cdl packages/io/disk/current/ChangeLog packages/io/disk/current/cdl/io_disk.cdl packages/io/watchdog/current/ChangeLog packages/io/watchdog/current/cdl/watchdog.cdl packages/services/compress/zlib/current/ChangeLog packages/services/compress/zlib/current/cdl/compress_zlib.cdl
diffstat 20 files changed, 75 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/packages/devs/watchdog/arm/at91/current/ChangeLog
+++ b/packages/devs/watchdog/arm/at91/current/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-28  John Dallaway  <john@dallaway.org.uk>
+
+	* 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  <amichelotti@atmel.com>
 
 	* src/watchdog_at91.cxx: 
@@ -16,7 +22,7 @@ 2002-08-06  Thomas Koeller  <thomas@koel
 // ####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     
--- a/packages/devs/watchdog/arm/at91/current/cdl/watchdog_at91.cdl
+++ b/packages/devs/watchdog/arm/at91/current/cdl/watchdog_at91.cdl
@@ -8,7 +8,7 @@
 ## ####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     
@@ -71,7 +71,7 @@ cdl_package CYGPKG_DEVICES_WATCHDOG_ARM_
     cdl_option CYGIMP_WATCHDOG_HARDWARE {
         parent	      CYGPKG_IO_WATCHDOG_IMPLEMENTATION
         display       "Hardware watchdog"
-        calculated    1
+        default_value 1
         implements    CYGINT_WATCHDOG_IMPLEMENTATIONS
     }
     
--- a/packages/devs/watchdog/arm/at91wdtc/current/ChangeLog
+++ b/packages/devs/watchdog/arm/at91wdtc/current/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-28  John Dallaway  <john@dallaway.org.uk>
+
+	* 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  <bartv@ecoscentric.com>
 
 	* src/watchdog_at91wdtc.cxx: switch init priority to
--- a/packages/devs/watchdog/arm/at91wdtc/current/cdl/watchdog_at91wdtc.cdl
+++ b/packages/devs/watchdog/arm/at91wdtc/current/cdl/watchdog_at91wdtc.cdl
@@ -8,7 +8,7 @@
 ## ####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     
@@ -69,7 +69,7 @@ cdl_package CYGPKG_DEVICES_WATCHDOG_ARM_
     cdl_option CYGIMP_WATCHDOG_HARDWARE {
         parent	      CYGPKG_IO_WATCHDOG_IMPLEMENTATION
         display       "Hardware watchdog"
-        calculated    1
+        default_value 1
         implements    CYGINT_WATCHDOG_IMPLEMENTATIONS
     }
     
--- a/packages/devs/watchdog/arm/lpc2xxx/current/ChangeLog
+++ b/packages/devs/watchdog/arm/lpc2xxx/current/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-28  John Dallaway  <john@dallaway.org.uk>
+
+	* 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  <bartv@ecoscentric.com>
 
 	* src/watchdog_lpc2xxx.cxx: switch init priority to
--- a/packages/devs/watchdog/arm/lpc2xxx/current/cdl/watchdog_lpc2xxx.cdl
+++ b/packages/devs/watchdog/arm/lpc2xxx/current/cdl/watchdog_lpc2xxx.cdl
@@ -8,7 +8,7 @@
 ## ####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     
@@ -67,7 +67,7 @@ cdl_package CYGPKG_DEVICES_WATCHDOG_ARM_
     cdl_option CYGIMP_WATCHDOG_HARDWARE {
         parent	      CYGPKG_IO_WATCHDOG_IMPLEMENTATION
         display       "Hardware watchdog"
-        calculated    1
+        default_value 1
         implements    CYGINT_WATCHDOG_IMPLEMENTATIONS
     }
     
--- a/packages/fs/fat/current/ChangeLog
+++ b/packages/fs/fat/current/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-28  John Dallaway  <john@dallaway.org.uk>
+
+	cdl/fatfs.cdl: Use CYGPKG_IO_FILEIO as the parent.
+
 2008-08-19  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* cdl/fatfs.cdl: Add configury for the disk device names to be
@@ -205,7 +209,7 @@ 2003-07-07 Savin Zlobec <savin@elatec.si
 // ####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     
--- a/packages/fs/fat/current/cdl/fatfs.cdl
+++ b/packages/fs/fat/current/cdl/fatfs.cdl
@@ -8,7 +8,7 @@
 ## ####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     
@@ -51,6 +51,7 @@ cdl_package CYGPKG_FS_FAT {
     display         "FAT filesystem"
     include_dir     cyg/fs
 
+    parent          CYGPKG_IO_FILEIO
     requires        CYGPKG_IO_FILEIO
 
     requires        CYGPKG_ISOINFRA
--- a/packages/fs/jffs2/current/ChangeLog
+++ b/packages/fs/jffs2/current/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-28  John Dallaway  <john@dallaway.org.uk>
+
+	cdl/jffs2.cdl: Use CYGPKG_IO_FILEIO as the parent.
+
 2009-02-22  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* cdl/jffs2.cdl: Add include-fixed to the system include files we
@@ -512,7 +516,7 @@ 2000-08-28  Dominic Ostrowski (dominic.o
 // ####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     
--- a/packages/fs/jffs2/current/cdl/jffs2.cdl
+++ b/packages/fs/jffs2/current/cdl/jffs2.cdl
@@ -10,7 +10,7 @@
 ## ####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     
@@ -55,6 +55,7 @@ cdl_package CYGPKG_FS_JFFS2 {
     doc            ref/fileio.html
     include_dir    ""
 
+    parent         CYGPKG_IO_FILEIO
     requires       CYGPKG_IO_FILEIO
     requires       CYGPKG_IO_FLASH
     requires       CYGINT_ISO_MALLOC
--- a/packages/fs/ram/current/ChangeLog
+++ b/packages/fs/ram/current/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-28  John Dallaway  <john@dallaway.org.uk>
+
+	cdl/ramfs.cdl: Use CYGPKG_IO_FILEIO as the parent.
+
 2008-04-02  Xinghua Yang <yxinghua@sunnorth.com.cn>
             Taiyun  Wang <taiyun@sunnorth.com.cn>
 	
@@ -131,7 +135,7 @@ 2000-08-18  Nick Garnett  <nickg@cygnus.
 // ####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     
--- a/packages/fs/ram/current/cdl/ramfs.cdl
+++ b/packages/fs/ram/current/cdl/ramfs.cdl
@@ -8,7 +8,7 @@
 ## ####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     
@@ -53,6 +53,7 @@ cdl_package CYGPKG_FS_RAM {
     doc            ref/fileio.html
     include_dir    cyg/ramfs
 
+    parent         CYGPKG_IO_FILEIO
     requires       CYGPKG_IO_FILEIO
 
     requires       CYGPKG_ISOINFRA
--- a/packages/fs/rom/current/ChangeLog
+++ b/packages/fs/rom/current/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-28  John Dallaway  <john@dallaway.org.uk>
+
+	cdl/romfs.cdl: Use CYGPKG_IO_FILEIO as the parent.
+
 2009-02-07  John Dallaway  <john@dallaway.org.uk>
 
 	* cdl/romfs.cdl: Pass file2c.tcl to tclsh directly.
--- a/packages/fs/rom/current/cdl/romfs.cdl
+++ b/packages/fs/rom/current/cdl/romfs.cdl
@@ -53,6 +53,7 @@ cdl_package CYGPKG_FS_ROM {
     doc            ref/fileio.html
     include_dir    cyg/romfs
 
+    parent         CYGPKG_IO_FILEIO
     requires       CYGPKG_IO_FILEIO
 
     requires       CYGPKG_ISOINFRA
--- a/packages/io/disk/current/ChangeLog
+++ b/packages/io/disk/current/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-28  John Dallaway  <john@dallaway.org.uk>
+
+	cdl/io_disk.cdl: Use CYGPKG_IO as the parent.
+
 2006-09-21  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* include/disk.h (DISK_CHANNEL): No need for extra _part_dev
@@ -139,7 +143,7 @@ 2003-09-01 Savin Zlobec <savin@elatec.si
 // ####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     
--- a/packages/io/disk/current/cdl/io_disk.cdl
+++ b/packages/io/disk/current/cdl/io_disk.cdl
@@ -8,7 +8,7 @@
 ## ####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     
@@ -50,6 +50,7 @@
 
 cdl_package CYGPKG_IO_DISK {
     display       "Disk device drivers"
+    parent        CYGPKG_IO
     active_if     CYGPKG_IO
     requires      CYGPKG_ERROR
     include_dir   cyg/io
--- a/packages/io/watchdog/current/ChangeLog
+++ b/packages/io/watchdog/current/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-28  John Dallaway  <john@dallaway.org.uk>
+
+	* 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  <bartv@ecoscentric.com>
 
 	* src/watchdog.cxx: switch to CYG_INIT_DEV_WATCHDOG init priority.
--- a/packages/io/watchdog/current/cdl/watchdog.cdl
+++ b/packages/io/watchdog/current/cdl/watchdog.cdl
@@ -8,7 +8,7 @@
 ## ####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     
@@ -52,7 +52,6 @@ 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
@@ -73,6 +72,7 @@ cdl_package CYGPKG_IO_WATCHDOG {
     cdl_interface CYGINT_WATCHDOG_IMPLEMENTATIONS {
         display       "Number of watchdog implementations"
         no_define
+        requires      1 == CYGINT_WATCHDOG_IMPLEMENTATIONS
     }
 
     cdl_component CYGPKG_IO_WATCHDOG_IMPLEMENTATION {
--- a/packages/services/compress/zlib/current/ChangeLog
+++ b/packages/services/compress/zlib/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-28  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/compress_zlib.cdl: Fix display and description strings for
+	LDFLAGS manipulation options.
+
 2009-03-09  John Dallaway  <john@dallaway.org.uk>
 
 	* cdl/compress_zlib.cdl: Reference test executable filenames for
--- a/packages/services/compress/zlib/current/cdl/compress_zlib.cdl
+++ b/packages/services/compress/zlib/current/cdl/compress_zlib.cdl
@@ -135,23 +135,23 @@ cdl_package CYGPKG_COMPRESS_ZLIB {
         }
 
         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."
         }