This is the mail archive of the ecos-patches@sourceware.org mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[flashv2 merge] devs/flash


Lots of bits in lots of drivers under devs/flash not already posted.
Attached...

Jifl
-- 
eCosCentric Limited      http://www.eCosCentric.com/     The eCos experts
Barnwell House, Barnwell Drive, Cambridge, UK.       Tel: +44 1223 245571
Registered in England and Wales: Reg No 4422071.
------["Si fractum non sit, noli id reficere"]------       Opinions==mine
Index: packages/devs/flash/amd/am29xxxxx/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/amd/am29xxxxx/current/ChangeLog,v
retrieving revision 1.41
diff -u -5 -p -r1.41 ChangeLog
--- packages/devs/flash/amd/am29xxxxx/current/ChangeLog	28 Nov 2006 13:23:59 -0000	1.41
+++ packages/devs/flash/amd/am29xxxxx/current/ChangeLog	18 Nov 2008 01:16:06 -0000
@@ -1,5 +1,10 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* cdl/flash_amd_am29xxxxx.cdl: Indicate that this driver uses
+	the legacy flash device API.
+
 2006-11-28 Oyvind Harboe  <oyvind.harboe@zylin.com>
 
 	* Fixed boot sectors for ST M29W320D
 	
 2006-08-29  Yoshinori Sato <ysato@users.sourceforge.jp>
Index: packages/devs/flash/amd/am29xxxxx/current/cdl/flash_amd_am29xxxxx.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/amd/am29xxxxx/current/cdl/flash_amd_am29xxxxx.cdl,v
retrieving revision 1.24
diff -u -5 -p -r1.24 flash_amd_am29xxxxx.cdl
--- packages/devs/flash/amd/am29xxxxx/current/cdl/flash_amd_am29xxxxx.cdl	29 Aug 2006 19:19:06 -0000	1.24
+++ packages/devs/flash/amd/am29xxxxx/current/cdl/flash_amd_am29xxxxx.cdl	18 Nov 2008 01:16:06 -0000
@@ -56,10 +56,11 @@ cdl_package CYGPKG_DEVS_FLASH_AMD_AM29XX
     active_if	  CYGPKG_IO_FLASH
 
     active_if     CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED
 
     implements    CYGHWR_IO_FLASH_DEVICE
+    implements    CYGHWR_IO_FLASH_DEVICE_LEGACY
 
     include_dir   cyg/io
 
     requires      { CYGINT_DEVS_FLASH_AMD_VARIANTS != 0 }
 
Index: packages/devs/flash/arm/aaed2000/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/aaed2000/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/flash/arm/aaed2000/current/ChangeLog	23 May 2002 23:00:49 -0000	1.2
+++ packages/devs/flash/arm/aaed2000/current/ChangeLog	18 Nov 2008 01:16:06 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_arm_aaed2000.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2001-11-08  Jesper Skov  <jskov@redhat.com>
 
 	* cdl/flash_arm_aaed2000.cdl: Removed ARM Boot Monitor protection
 	requirement.
 
Index: packages/devs/flash/arm/aaed2000/current/cdl/flash_arm_aaed2000.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/aaed2000/current/cdl/flash_arm_aaed2000.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 flash_arm_aaed2000.cdl
--- packages/devs/flash/arm/aaed2000/current/cdl/flash_arm_aaed2000.cdl	23 May 2002 23:00:49 -0000	1.2
+++ packages/devs/flash/arm/aaed2000/current/cdl/flash_arm_aaed2000.cdl	18 Nov 2008 01:16:06 -0000
@@ -54,12 +54,10 @@ cdl_package CYGPKG_DEVS_FLASH_ARM_AAED20
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_ARM_ARM9_AAED2000
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       aaed2000_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/arm/aim711/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/aim711/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/flash/arm/aim711/current/ChangeLog	14 May 2004 14:49:29 -0000	1.1
+++ packages/devs/flash/arm/aim711/current/ChangeLog	18 Nov 2008 01:16:06 -0000
@@ -1,5 +1,15 @@
+2004-11-22  Bart Veer  <bartv@ecoscentric.com>
+
+	* src/arm_aim711_flash.c: use updated CYG_FLASH_DRIVER() macro for
+	completely static initialization.
+
+2004-07-16  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* src/arm_aim711_flash.c: Make us of the new sst driver which uses
+	the new flash device driver API.
+
 2003-10-02  Roland Cassebohm  <r.cassebohm@visionsystems.de>
 
 	* src/arm_aim711_flash.c: 
 	* cdl/flash_arm_aim711.cdl: New package.  FLASH memory support for
 	ARM Industrial Module AIM 711.
Index: packages/devs/flash/arm/aim711/current/cdl/flash_arm_aim711.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/aim711/current/cdl/flash_arm_aim711.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_arm_aim711.cdl
--- packages/devs/flash/arm/aim711/current/cdl/flash_arm_aim711.cdl	14 May 2004 14:49:29 -0000	1.1
+++ packages/devs/flash/arm/aim711/current/cdl/flash_arm_aim711.cdl	18 Nov 2008 01:16:06 -0000
@@ -55,11 +55,11 @@ cdl_package CYGPKG_DEVS_FLASH_ARM_AIM711
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_ARM_AIM711
 
-    compile       arm_aim711_flash.c
+    compile       -library=libextras.a arm_aim711_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_SST_39VFXXX_REQUIRED {
         display   "Generic SST 39VFxxx driver required"
Index: packages/devs/flash/arm/aim711/current/src/arm_aim711_flash.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/aim711/current/src/arm_aim711_flash.c,v
retrieving revision 1.1
diff -u -5 -p -r1.1 arm_aim711_flash.c
--- packages/devs/flash/arm/aim711/current/src/arm_aim711_flash.c	14 May 2004 14:49:29 -0000	1.1
+++ packages/devs/flash/arm/aim711/current/src/arm_aim711_flash.c	18 Nov 2008 01:16:06 -0000
@@ -7,10 +7,11 @@
 //==========================================================================
 //####ECOSGPLCOPYRIGHTBEGIN####
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+// Copyright (C) 2004 Andrew Lunn
 //
 // 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.
 //
@@ -39,11 +40,11 @@
 //####ECOSGPLCOPYRIGHTEND####
 //==========================================================================
 //#####DESCRIPTIONBEGIN####
 //
 // Author(s):    jskov, rcassebohm
-// Contributors: jskov, rcassebohm
+// Contributors: jskov, rcassebohm, andrew lunn
 // Date:         2001-02-21
 // Purpose:      
 // Description:  
 //              
 //####DESCRIPTIONEND####
@@ -57,20 +58,31 @@
 #define CYGPKG_DEVS_FLASH_SST_39VF080
 #define CYGNUM_FLASH_INTERLEAVE	(1)
 #define CYGNUM_FLASH_SERIES	(1)
 #define CYGNUM_FLASH_BASE 	(0x2000000u)
 
-#include "cyg/io/flash_sst_39vfxxx.inl"
-
 #elif (CYGNUM_DEVS_FLASH_ARM_AIM711_SIZE == 2)
 
 #define CYGPKG_DEVS_FLASH_SST_39VF016
 #define CYGNUM_FLASH_INTERLEAVE	(1)
 #define CYGNUM_FLASH_SERIES	(1)
 #define CYGNUM_FLASH_BASE 	(0x2000000u)
 
+#endif
+
 #include "cyg/io/flash_sst_39vfxxx.inl"
 
-#endif
+static const cyg_flash_block_info_t cyg_flash_sst_block_info[1] = {
+    { FLASH_BLOCK_SIZE, FLASH_NUM_REGIONS * CYGNUM_FLASH_SERIES }
+};
+CYG_FLASH_DRIVER(cyg_flash_sst_flashdev,
+                 &cyg_sst_funs,
+                 0,                     // Flags
+                 CYGNUM_FLASH_BASE,     // Start
+                 CYGNUM_FLASH_BASE + (FLASH_BLOCK_SIZE * FLASH_NUM_REGIONS * CYGNUM_FLASH_SERIES) - 1,    // End
+                 1,                     // Number of block infos
+                 cyg_flash_sst_block_info,
+                 NULL                   // priv
+    );
 
 // ------------------------------------------------------------------------
 // EOF arm_aim711_flash.c
Index: packages/devs/flash/arm/at91/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/at91/current/ChangeLog,v
retrieving revision 1.9
diff -u -5 -p -r1.9 ChangeLog
--- packages/devs/flash/arm/at91/current/ChangeLog	3 Nov 2008 08:41:59 -0000	1.9
+++ packages/devs/flash/arm/at91/current/ChangeLog	18 Nov 2008 01:16:06 -0000
@@ -1,5 +1,13 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* src/at91_flash.c: Explicitly include <cyg/io/flash_dev.h> rather
+	than just defining _FLASH_PRIVATE_
+
+	* cdl/flash_at91.cdl: Indicate that this driver uses
+	the legacy flash device API.
+
 2008-11-03  Gabor Toeroek <tgabor84@gmail.com>
 
 	* src/at91_flash.c (flash_hwr_init): Add partial support for
 	AT91SAM7SE. This can have a second embedded flash controller and
 	maybe ROM as well as FLASH. Only writing to the first controller
Index: packages/devs/flash/arm/at91/current/cdl/flash_at91.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/at91/current/cdl/flash_at91.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 flash_at91.cdl
--- packages/devs/flash/arm/at91/current/cdl/flash_at91.cdl	19 Feb 2006 19:43:01 -0000	1.5
+++ packages/devs/flash/arm/at91/current/cdl/flash_at91.cdl	18 Nov 2008 01:16:06 -0000
@@ -47,19 +47,20 @@
 #####DESCRIPTIONEND####
 #
 # ====================================================================
 
 cdl_package CYGPKG_DEVS_FLASH_AT91 {
-    display       "at91 FLASH memory support"
+    display       "AT91 FLASH memory support"
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
 
     implements    CYGHWR_IO_FLASH_DEVICE
+    implements    CYGHWR_IO_FLASH_DEVICE_LEGACY
 
     include_dir   .
-    description   "FLASH memory device support for at91 EFC"
+    description   "FLASH memory device support for AT91 EFC"
     compile       at91_flash.c
     
     cdl_option    CYGBLD_DEV_FLASH_AT91_LOCKING {
         display       "Support block locking"
         default_value 1
Index: packages/devs/flash/arm/at91/current/src/at91_flash.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/at91/current/src/at91_flash.c,v
retrieving revision 1.9
diff -u -5 -p -r1.9 at91_flash.c
--- packages/devs/flash/arm/at91/current/src/at91_flash.c	3 Nov 2008 08:41:59 -0000	1.9
+++ packages/devs/flash/arm/at91/current/src/at91_flash.c	18 Nov 2008 01:16:06 -0000
@@ -55,12 +55,12 @@
 
 #include <cyg/hal/hal_io.h>             
 #include <cyg/hal/hal_intr.h>
 #include <cyg/infra/cyg_ass.h>
 
-#define  _FLASH_PRIVATE_
 #include <cyg/io/flash.h>
+#include <cyg/io/flash_dev.h>
 
 #include <string.h>
 
 #define FLASH_TIMEOUT       100000
 
Index: packages/devs/flash/arm/e7t/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/e7t/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/flash/arm/e7t/current/ChangeLog	4 Nov 2003 09:37:12 -0000	1.2
+++ packages/devs/flash/arm/e7t/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,16 @@
+2004-11-22  Bart Veer  <bartv@ecoscentric.com>
+
+	* src/arm_e7t_flash.c: use updated CYG_FLASH_DRIVER() macro for
+	completely static initialization.
+
+2004-08-03  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* cdl/flash_e7t.cdl:
+	* src/arm_e7t_flash.c: Make use of the new sst driver which uses 
+	the new flash driver API.
+
 2003-11-04  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* cdl/flash_e7t.cdl: 
 	* src/arm_e7t_flash.c: Updates to use the new 39VFXXX generic driver.
 
Index: packages/devs/flash/arm/e7t/current/cdl/flash_e7t.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/e7t/current/cdl/flash_e7t.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 flash_e7t.cdl
--- packages/devs/flash/arm/e7t/current/cdl/flash_e7t.cdl	4 Nov 2003 09:37:12 -0000	1.2
+++ packages/devs/flash/arm/e7t/current/cdl/flash_e7t.cdl	18 Nov 2008 01:16:07 -0000
@@ -54,11 +54,11 @@ cdl_package CYGPKG_DEVS_FLASH_ARM_E7T {
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires      CYGPKG_HAL_ARM_E7T
     requires      CYGHWR_IO_FLASH_DEVICE
     
-    compile       arm_e7t_flash.c
+    compile       -library=libextras.a arm_e7t_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_option CYGINT_DEVS_FLASH_SST_39VFXXX_REQUIRED {
         display   "E7T has SST39VF400 FLASH part fitted"
Index: packages/devs/flash/arm/e7t/current/src/arm_e7t_flash.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/e7t/current/src/arm_e7t_flash.c,v
retrieving revision 1.2
diff -u -5 -p -r1.2 arm_e7t_flash.c
--- packages/devs/flash/arm/e7t/current/src/arm_e7t_flash.c	4 Nov 2003 09:37:12 -0000	1.2
+++ packages/devs/flash/arm/e7t/current/src/arm_e7t_flash.c	18 Nov 2008 01:16:07 -0000
@@ -7,11 +7,11 @@
 //==========================================================================
 //####ECOSGPLCOPYRIGHTBEGIN####
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-// Copyright (C) 2003 Andrew Lunn
+// Copyright (C) 2003, 2004 Andrew Lunn
 //
 // 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.
 //
@@ -40,11 +40,11 @@
 //####ECOSGPLCOPYRIGHTEND####
 //==========================================================================
 //#####DESCRIPTIONBEGIN####
 //
 // Author(s):    Chris Garry <cgarry@sweeneydesign.co.uk>
-// Contributors:
+// Contributors: andrew.lunn@ascom.ch
 // Date:         2003-04-21
 // Purpose:
 // Description:
 //
 //####DESCRIPTIONEND####
@@ -68,10 +68,23 @@
 
 //--------------------------------------------------------------------------
 // Now include the driver code.
 #ifdef CYGINT_DEVS_FLASH_SST_39VFXXX_REQUIRED
 #include "cyg/io/flash_sst_39vfxxx.inl"
+
+static const cyg_flash_block_info_t cyg_flash_sst_block_info[1] = {
+    { FLASH_BLOCK_SIZE, FLASH_NUM_REGIONS * CYGNUM_FLASH_SERIES }
+};
+CYG_FLASH_DRIVER(cyg_flash_sst_flashdev,
+                 &cyg_sst_funs,
+                 0,                     // Flags
+                 CYGNUM_FLASH_BASE,     // Start
+                 CYGNUM_FLASH_BASE + (FLASH_BLOCK_SIZE * FLASH_NUM_REGIONS * CYGNUM_FLASH_SERIES) - 1,    // End
+                 1,                     // Number of block infos
+                 cyg_flash_sst_block_info,
+                 NULL                   // priv
+    );
 #endif
 
 #ifdef CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED
 #include "cyg/io/flash_am29xxxxx.inl"
 #endif
Index: packages/devs/flash/arm/ebsa285/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/ebsa285/current/ChangeLog,v
retrieving revision 1.13
diff -u -5 -p -r1.13 ChangeLog
--- packages/devs/flash/arm/ebsa285/current/ChangeLog	14 Sep 2003 13:12:31 -0000	1.13
+++ packages/devs/flash/arm/ebsa285/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,14 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* src/ebsa285_flash.c:
+	Explicitly include <cyg/io/flash_dev.h> rather than just
+	defining _FLASH_PRIVATE_. (From bartv in flash_v2 branch)
+
+	* cdl/flash_ebsa285.cdl: Indicate that this driver uses
+	the legacy flash device API.
+
 2003-09-14  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* src/flash_query.c (flash_query): Casts to stop warnings.
 	* src/flash_program_buf.c (flash_program_buf): Fixed compiler warning.
 	* src/ebsa285_flash.c: include diag.h header file to stop warning.
Index: packages/devs/flash/arm/ebsa285/current/cdl/flash_ebsa285.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/ebsa285/current/cdl/flash_ebsa285.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 flash_ebsa285.cdl
--- packages/devs/flash/arm/ebsa285/current/cdl/flash_ebsa285.cdl	14 Sep 2003 13:12:31 -0000	1.5
+++ packages/devs/flash/arm/ebsa285/current/cdl/flash_ebsa285.cdl	18 Nov 2008 01:16:07 -0000
@@ -55,10 +55,11 @@ cdl_package CYGPKG_DEVS_FLASH_EBSA285 {
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_ARM_EBSA285
 
     implements    CYGHWR_IO_FLASH_DEVICE
+    implements    CYGHWR_IO_FLASH_DEVICE_LEGACY
 
     include_dir   .
     include_files ; # none _exported_ whatsoever
     description   "FLASH memory device support for StrongARM EBSA-285"
     compile       ebsa285_flash.c flash_query.c flash_erase_block.c flash_program_buf.c
Index: packages/devs/flash/arm/ebsa285/current/src/ebsa285_flash.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/ebsa285/current/src/ebsa285_flash.c,v
retrieving revision 1.10
diff -u -5 -p -r1.10 ebsa285_flash.c
--- packages/devs/flash/arm/ebsa285/current/src/ebsa285_flash.c	14 Sep 2003 13:12:31 -0000	1.10
+++ packages/devs/flash/arm/ebsa285/current/src/ebsa285_flash.c	18 Nov 2008 01:16:07 -0000
@@ -52,12 +52,12 @@
 
 #include <pkgconf/hal.h>
 #include <cyg/hal/hal_arch.h>
 #include <cyg/infra/diag.h>
 
-#define  _FLASH_PRIVATE_
 #include <cyg/io/flash.h>
+#include <cyg/io/flash_dev.h>
 
 #include "flash.h"
 
 int
 flash_hwr_init(void)
Index: packages/devs/flash/arm/edb7xxx/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/edb7xxx/current/ChangeLog,v
retrieving revision 1.10
diff -u -5 -p -r1.10 ChangeLog
--- packages/devs/flash/arm/edb7xxx/current/ChangeLog	20 Nov 2003 12:33:37 -0000	1.10
+++ packages/devs/flash/arm/edb7xxx/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,15 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* src/edb7xxx_flash.c:
+	Explicitly include <cyg/io/flash_dev.h> rather than just
+	defining _FLASH_PRIVATE_. (From bartv in flash_v2 branch)
+
+	* cdl/flash_edb7xxx.cdl (CYGPKG_DEVS_FLASH_EP72XX): Indicate that
+	this part of the driver (i.e. not EDB7312) uses the legacy flash
+	device API.
+
 2003-11-20  Jani Monoses <jani@iv.ro>
 	
 	* cdl/flash_edb7xxx.cdl:
 	* src/edb7xxx_flash.c.c:
 	* src/flash_query.c:
Index: packages/devs/flash/arm/edb7xxx/current/cdl/flash_edb7xxx.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/edb7xxx/current/cdl/flash_edb7xxx.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 flash_edb7xxx.cdl
--- packages/devs/flash/arm/edb7xxx/current/cdl/flash_edb7xxx.cdl	20 Nov 2003 12:33:37 -0000	1.6
+++ packages/devs/flash/arm/edb7xxx/current/cdl/flash_edb7xxx.cdl	18 Nov 2008 01:16:07 -0000
@@ -65,10 +65,11 @@ cdl_package CYGPKG_DEVS_FLASH_EDB7XXX {
                         specifically"
         active_if     { CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT != "EDB7312" }
         calculated    1
         no_define
         implements    CYGHWR_IO_FLASH_DEVICE
+        implements    CYGHWR_IO_FLASH_DEVICE_LEGACY
     
         compile       edb7xxx_flash.c flash_query.c flash_program_buf.c flash_erase_block.c
     
     }
     cdl_component CYGPKG_DEVS_FLASH_STRATA_EDB7XXX {
Index: packages/devs/flash/arm/edb7xxx/current/src/edb7xxx_flash.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/edb7xxx/current/src/edb7xxx_flash.c,v
retrieving revision 1.7
diff -u -5 -p -r1.7 edb7xxx_flash.c
--- packages/devs/flash/arm/edb7xxx/current/src/edb7xxx_flash.c	20 Nov 2003 12:33:37 -0000	1.7
+++ packages/devs/flash/arm/edb7xxx/current/src/edb7xxx_flash.c	18 Nov 2008 01:16:07 -0000
@@ -51,12 +51,12 @@
 //==========================================================================
 
 #include <pkgconf/hal.h>
 #include <cyg/hal/hal_arch.h>
 
-#define  _FLASH_PRIVATE_
 #include <cyg/io/flash.h>
+#include <cyg/io/flash_dev.h>
 
 #include "flash.h"
 
 #define _si(p) ((p[0]<<8)|p[1])
 
Index: packages/devs/flash/arm/excalibur/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/excalibur/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/flash/arm/excalibur/current/ChangeLog	23 May 2002 23:00:52 -0000	1.2
+++ packages/devs/flash/arm/excalibur/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_excalibur.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2001-08-17  Jesper Skov  <jskov@redhat.com>
 	[from branch]
 	* src/arm_excalibur_flash.c: Use all 4 flash parts.
 
 	* cdl/flash_excalibur.cdl: Fix typo.
Index: packages/devs/flash/arm/excalibur/current/cdl/flash_excalibur.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/excalibur/current/cdl/flash_excalibur.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 flash_excalibur.cdl
--- packages/devs/flash/arm/excalibur/current/cdl/flash_excalibur.cdl	23 May 2002 23:00:52 -0000	1.2
+++ packages/devs/flash/arm/excalibur/current/cdl/flash_excalibur.cdl	18 Nov 2008 01:16:07 -0000
@@ -53,12 +53,10 @@ cdl_package CYGPKG_DEVS_FLASH_ARM_EXCALI
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_ARM_ARM9_EXCALIBUR
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       arm_excalibur_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_INTEL_28FXXX_REQUIRED {
Index: packages/devs/flash/arm/innovator/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/innovator/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/flash/arm/innovator/current/ChangeLog	13 Feb 2003 00:59:57 -0000	1.1
+++ packages/devs/flash/arm/innovator/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_innovator.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2003-02-05  Patrick Doyle <wpd@delcomsys.com>
 	* cdl/flash_innovator.cdl
 	* src/arm_innovator_flash.c: New package - support for Texas
 	Instruments Innovator board.
 
Index: packages/devs/flash/arm/innovator/current/cdl/flash_innovator.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/innovator/current/cdl/flash_innovator.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_innovator.cdl
--- packages/devs/flash/arm/innovator/current/cdl/flash_innovator.cdl	5 Feb 2003 19:59:55 -0000	1.1
+++ packages/devs/flash/arm/innovator/current/cdl/flash_innovator.cdl	18 Nov 2008 01:16:07 -0000
@@ -53,12 +53,10 @@ cdl_package CYGPKG_DEVS_FLASH_ARM_INNOVA
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_ARM_ARM9_INNOVATOR
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       arm_innovator_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/arm/integrator/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/integrator/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ChangeLog
--- packages/devs/flash/arm/integrator/current/ChangeLog	23 May 2002 23:00:52 -0000	1.3
+++ packages/devs/flash/arm/integrator/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_integrator.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2002-03-06  Nick Garnett  <nickg@redhat.com>
 
 	* cdl/flash_integrator.cdl: Converted to use generic 28Fxxx flash
 	driver.
 
Index: packages/devs/flash/arm/integrator/current/cdl/flash_integrator.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/integrator/current/cdl/flash_integrator.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 flash_integrator.cdl
--- packages/devs/flash/arm/integrator/current/cdl/flash_integrator.cdl	23 May 2002 23:00:53 -0000	1.3
+++ packages/devs/flash/arm/integrator/current/cdl/flash_integrator.cdl	18 Nov 2008 01:16:07 -0000
@@ -53,12 +53,10 @@ cdl_package CYGPKG_DEVS_FLASH_ARM_INTEGR
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_ARM_INTEGRATOR
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       arm_integrator_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_INTEL_28FXXX_REQUIRED {
Index: packages/devs/flash/arm/iq80310/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/iq80310/current/ChangeLog,v
retrieving revision 1.11
diff -u -5 -p -r1.11 ChangeLog
--- packages/devs/flash/arm/iq80310/current/ChangeLog	4 Oct 2003 18:30:20 -0000	1.11
+++ packages/devs/flash/arm/iq80310/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,14 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* src/iq80310_flash.c: 	Explicitly include <cyg/io/flash_dev.h>
+	rather than just defining _FLASH_PRIVATE_.
+	(From bartv in flash_v2 branch)
+
+	* cdl/flash_iq80310.cdl: Indicate that this driver uses
+	the legacy flash device API.
+
 2003-09-16  Jani Monoses <jani@iv.ro>
 
 	* src/flash_lock_block.c (flash_lock_block): 
 	* src/flash_unlock_block.c (flash_unlock_block): 
 	* src/flash_erase_block.c (flash_erase_block): 
Index: packages/devs/flash/arm/iq80310/current/cdl/flash_iq80310.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/iq80310/current/cdl/flash_iq80310.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 flash_iq80310.cdl
--- packages/devs/flash/arm/iq80310/current/cdl/flash_iq80310.cdl	4 Oct 2003 18:30:20 -0000	1.6
+++ packages/devs/flash/arm/iq80310/current/cdl/flash_iq80310.cdl	18 Nov 2008 01:16:07 -0000
@@ -56,10 +56,11 @@ cdl_package CYGPKG_DEVS_FLASH_ARM_XSCALE
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_ARM_XSCALE_IOP310
 
     implements    CYGHWR_IO_FLASH_DEVICE
+    implements    CYGHWR_IO_FLASH_DEVICE_LEGACY
     implements    CYGHWR_IO_FLASH_BLOCK_LOCKING
 
     include_dir   .
     include_files ; # none _exported_ whatsoever
     description   "FLASH memory device support for Cyclone IQ80310"
Index: packages/devs/flash/arm/iq80310/current/src/iq80310_flash.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/iq80310/current/src/iq80310_flash.c,v
retrieving revision 1.6
diff -u -5 -p -r1.6 iq80310_flash.c
--- packages/devs/flash/arm/iq80310/current/src/iq80310_flash.c	4 Oct 2003 18:30:21 -0000	1.6
+++ packages/devs/flash/arm/iq80310/current/src/iq80310_flash.c	18 Nov 2008 01:16:07 -0000
@@ -52,12 +52,12 @@
 
 #include <pkgconf/hal.h>
 #include <cyg/hal/hal_arch.h>
 #include <cyg/infra/diag.h>
 
-#define  _FLASH_PRIVATE_
 #include <cyg/io/flash.h>
+#include <cyg/io/flash_dev.h>
 
 #include "flash.h"
 
 #define _si(p) ((p[1]<<8)|p[0])
 
Index: packages/devs/flash/arm/lpc2xxx/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/lpc2xxx/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/flash/arm/lpc2xxx/current/ChangeLog	12 Jul 2008 15:55:01 -0000	1.1
+++ packages/devs/flash/arm/lpc2xxx/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,14 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* src/flash_arm_lpc2xxx.c:
+	Explicitly include <cyg/io/flash_dev.h> rather than just
+	defining _FLASH_PRIVATE_. (From bartv in flash_v2 branch)
+
+	* cdl/flash_arm_lpc2xxx.cdl: Indicate that this driver uses
+	the legacy flash device API.
+
 2007-07-12  Hans Rosenfeld  <rosenfeld@grumpf.hope-2000.org>
 
 	* lpc2xxx: driver for on-chip flash memory
 
 //===========================================================================
Index: packages/devs/flash/arm/lpc2xxx/current/cdl/flash_arm_lpc2xxx.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/lpc2xxx/current/cdl/flash_arm_lpc2xxx.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_arm_lpc2xxx.cdl
--- packages/devs/flash/arm/lpc2xxx/current/cdl/flash_arm_lpc2xxx.cdl	12 Jul 2008 15:55:01 -0000	1.1
+++ packages/devs/flash/arm/lpc2xxx/current/cdl/flash_arm_lpc2xxx.cdl	18 Nov 2008 01:16:07 -0000
@@ -51,10 +51,11 @@ cdl_package CYGPKG_DEVS_FLASH_ARM_LPC2XX
     
     parent      CYGPKG_IO_FLASH
     active_if   CYGPKG_IO_FLASH
     requires    CYGPKG_HAL_ARM_LPC2XXX
     implements  CYGHWR_IO_FLASH_DEVICE
+    implements  CYGHWR_IO_FLASH_DEVICE_LEGACY
 
     # These chips use two erase block sizes, the access to flash is
     # limited to the last few of the 8k blocks. I don't have a chip
     # using only 8k block sizes, so I can't test and therefore won't
     # implement support for these devices.
Index: packages/devs/flash/arm/lpc2xxx/current/src/flash_arm_lpc2xxx.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/lpc2xxx/current/src/flash_arm_lpc2xxx.c,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_arm_lpc2xxx.c
--- packages/devs/flash/arm/lpc2xxx/current/src/flash_arm_lpc2xxx.c	12 Jul 2008 15:55:02 -0000	1.1
+++ packages/devs/flash/arm/lpc2xxx/current/src/flash_arm_lpc2xxx.c	18 Nov 2008 01:16:07 -0000
@@ -51,12 +51,12 @@
 #include <pkgconf/devs_flash_arm_lpc2xxx.h>
 #include <pkgconf/hal.h>
 #include <pkgconf/hal_arm.h>
 #include <cyg/hal/hal_intr.h>
 
-#define _FLASH_PRIVATE_
 #include <cyg/io/flash.h>
+#include <cyg/io/flash_dev.h>
 
 #include "flash_arm_lpc2xxx.h"
 
 /* gcc builtins */
 extern void* memcpy(void *, const void *, size_t);
Index: packages/devs/flash/arm/sa1100mm/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/sa1100mm/current/ChangeLog,v
retrieving revision 1.9
diff -u -5 -p -r1.9 ChangeLog
--- packages/devs/flash/arm/sa1100mm/current/ChangeLog	14 Sep 2003 13:15:23 -0000	1.9
+++ packages/devs/flash/arm/sa1100mm/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,14 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* src/sa1100mm_flash.c:
+	Explicitly include <cyg/io/flash_dev.h> rather than just
+	defining _FLASH_PRIVATE_. (From bartv in flash_v2 branch)
+
+	* cdl/flash_sa1100mm.cdl: Indicate that this driver uses
+	the legacy flash device API.
+
 2003-09-12  Jani Monoses <jani@iv.ro>
 
 	* src/flash_erase_block.c (flash_erase_block): 
 	* src/flash_query.c (flash_query): 
 	* src/flash_program_buf.c (flash_program_buf): Put flash functions
Index: packages/devs/flash/arm/sa1100mm/current/cdl/flash_sa1100mm.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/sa1100mm/current/cdl/flash_sa1100mm.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 flash_sa1100mm.cdl
--- packages/devs/flash/arm/sa1100mm/current/cdl/flash_sa1100mm.cdl	14 Sep 2003 13:15:23 -0000	1.5
+++ packages/devs/flash/arm/sa1100mm/current/cdl/flash_sa1100mm.cdl	18 Nov 2008 01:16:07 -0000
@@ -55,10 +55,11 @@ cdl_package CYGPKG_DEVS_FLASH_SA1100MM {
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_ARM_SA11X0
 
     implements    CYGHWR_IO_FLASH_DEVICE
+    implements    CYGHWR_IO_FLASH_DEVICE_LEGACY
 
     include_dir   .
     include_files ; # none _exported_ whatsoever
     description   "FLASH memory device support for StrongARM SA1100 Multimedia"
     compile       sa1100mm_flash.c flash_query.c flash_erase_block.c flash_program_buf.c
Index: packages/devs/flash/arm/sa1100mm/current/src/sa1100mm_flash.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/sa1100mm/current/src/sa1100mm_flash.c,v
retrieving revision 1.7
diff -u -5 -p -r1.7 sa1100mm_flash.c
--- packages/devs/flash/arm/sa1100mm/current/src/sa1100mm_flash.c	14 Sep 2003 13:15:24 -0000	1.7
+++ packages/devs/flash/arm/sa1100mm/current/src/sa1100mm_flash.c	18 Nov 2008 01:16:07 -0000
@@ -51,12 +51,12 @@
 //==========================================================================
 
 #include <pkgconf/hal.h>
 #include <cyg/hal/hal_arch.h>
 
-#define  _FLASH_PRIVATE_
 #include <cyg/io/flash.h>
+#include <cyg/io/flash_dev.h>
 
 #include "flash.h"
 
 int
 flash_hwr_init(void)
Index: packages/devs/flash/arm/smdk2410/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/smdk2410/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/flash/arm/smdk2410/current/ChangeLog	6 Aug 2003 17:23:28 -0000	1.1
+++ packages/devs/flash/arm/smdk2410/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_smdk2410.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2003-08-06  Michael Anburaj <embeddedeng@hotmail.com>
 
 	* cdl/flash_smdk2410.cdl:
 	* src/smdk2410_flash.c:
 	New package to support the flash device on a Samsung ARM9/SMDK2410
Index: packages/devs/flash/arm/smdk2410/current/cdl/flash_smdk2410.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/smdk2410/current/cdl/flash_smdk2410.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_smdk2410.cdl
--- packages/devs/flash/arm/smdk2410/current/cdl/flash_smdk2410.cdl	6 Aug 2003 17:23:28 -0000	1.1
+++ packages/devs/flash/arm/smdk2410/current/cdl/flash_smdk2410.cdl	18 Nov 2008 01:16:07 -0000
@@ -55,12 +55,10 @@ cdl_package CYGPKG_DEVS_FLASH_ARM_SMDK24
 
     parent        CYGPKG_IO_FLASH
     active_if     CYGPKG_IO_FLASH
     requires      CYGPKG_HAL_ARM_ARM9_SMDK2410
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       smdk2410_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/arm/xsengine/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/xsengine/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/flash/arm/xsengine/current/ChangeLog	3 Mar 2005 19:26:43 -0000	1.1
+++ packages/devs/flash/arm/xsengine/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_xsengine.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2005-02-23  Kurt Stremerch  <kurt.stremerch@exys.be>
 
         * src/xsengine_flash.c: 
         * cdl/flash_xsengine.cdl: 
         New package - support for Exys XSEngine (Xscale PXA255)
Index: packages/devs/flash/arm/xsengine/current/cdl/flash_xsengine.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/arm/xsengine/current/cdl/flash_xsengine.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_xsengine.cdl
--- packages/devs/flash/arm/xsengine/current/cdl/flash_xsengine.cdl	3 Mar 2005 19:26:43 -0000	1.1
+++ packages/devs/flash/arm/xsengine/current/cdl/flash_xsengine.cdl	18 Nov 2008 01:16:07 -0000
@@ -53,12 +53,10 @@ display       "Exys XSEngine FLASH memor
 
     parent        CYGPKG_IO_FLASH
     active_if     CYGPKG_IO_FLASH
     requires      CYGPKG_HAL_ARM_XSCALE_XSENGINE
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       xsengine_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/atmel/at29cxxxx/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/atmel/at29cxxxx/current/ChangeLog,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ChangeLog
--- packages/devs/flash/atmel/at29cxxxx/current/ChangeLog	30 Oct 2003 19:25:44 -0000	1.6
+++ packages/devs/flash/atmel/at29cxxxx/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,10 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* cdl/flash_atmel_at29cxxxx.cdl: Indicate that this driver uses
+	the legacy flash device API.
+
 2003-10-02  Roland Cassebohm  <r.cassebohm@visionsystems.de>
 
 	* include/flash_at29cxxxx.inl: Improves driver, to work with 16 bit
 	wide access. The driver have to write 256 times after each command 
 	sequence, but with two 8 bit divices parallel, the driver writes
Index: packages/devs/flash/atmel/at29cxxxx/current/cdl/flash_atmel_at29cxxxx.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/atmel/at29cxxxx/current/cdl/flash_atmel_at29cxxxx.cdl,v
retrieving revision 1.4
diff -u -5 -p -r1.4 flash_atmel_at29cxxxx.cdl
--- packages/devs/flash/atmel/at29cxxxx/current/cdl/flash_atmel_at29cxxxx.cdl	23 May 2002 23:01:00 -0000	1.4
+++ packages/devs/flash/atmel/at29cxxxx/current/cdl/flash_atmel_at29cxxxx.cdl	18 Nov 2008 01:16:07 -0000
@@ -55,8 +55,9 @@ cdl_package CYGPKG_DEVS_FLASH_ATMEL_AT29
     active_if	  CYGPKG_IO_FLASH
 
     active_if     CYGINT_DEVS_FLASH_ATMEL_AT29CXXXX_REQUIRED
 
     implements    CYGHWR_IO_FLASH_DEVICE
+    implements    CYGHWR_IO_FLASH_DEVICE_LEGACY
 
     include_dir   cyg/io
 }
Index: packages/devs/flash/atmel/at49xxxx/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/atmel/at49xxxx/current/ChangeLog,v
retrieving revision 1.9
diff -u -5 -p -r1.9 ChangeLog
--- packages/devs/flash/atmel/at49xxxx/current/ChangeLog	17 Feb 2005 19:58:54 -0000	1.9
+++ packages/devs/flash/atmel/at49xxxx/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,10 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* cdl/flash_atmel_at49xxxx.cdl: Indicate that this driver uses
+	the legacy flash device API.
+
 2005-02-15  Jacques Tinembart <Jacques.Tinembart@eig.unige.ch>
  
  	* include/flash_at49xxxx.inl, include/flash_at49xxxx_parts.inl:
  	add support for AT49LV161 and AT49BV322A
  
Index: packages/devs/flash/atmel/at49xxxx/current/cdl/flash_atmel_at49xxxx.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/atmel/at49xxxx/current/cdl/flash_atmel_at49xxxx.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 flash_atmel_at49xxxx.cdl
--- packages/devs/flash/atmel/at49xxxx/current/cdl/flash_atmel_at49xxxx.cdl	27 May 2004 06:43:31 -0000	1.3
+++ packages/devs/flash/atmel/at49xxxx/current/cdl/flash_atmel_at49xxxx.cdl	18 Nov 2008 01:16:07 -0000
@@ -55,10 +55,11 @@ cdl_package CYGPKG_DEVS_FLASH_ATMEL_AT49
     active_if	  CYGPKG_IO_FLASH
 
     active_if     CYGINT_DEVS_FLASH_ATMEL_AT49XXXX_REQUIRED
 
     implements    CYGHWR_IO_FLASH_DEVICE
+    implements    CYGHWR_IO_FLASH_DEVICE_LEGACY
 
     include_dir   cyg/io
     
     cdl_option    CYGHWR_DEVS_FLASH_ATMEL_AT49XXXX_ERASE_BUG_WORKAROUND {
         display       "AT91FR40162 erase bug workaround"
Index: packages/devs/flash/fr30/skmb91302/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/fr30/skmb91302/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/flash/fr30/skmb91302/current/ChangeLog	11 Jul 2008 17:57:34 -0000	1.2
+++ packages/devs/flash/fr30/skmb91302/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_skmb91302.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2008-07-01  Lars Poeschel  <larsi@wh2.tu-dresden.de>
 
 	* src/skmb91302_flash.c: Changed CYGNUM_FLASH_BASE to 0x1000000
           for real flash support
 
Index: packages/devs/flash/fr30/skmb91302/current/cdl/flash_skmb91302.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/fr30/skmb91302/current/cdl/flash_skmb91302.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_skmb91302.cdl
--- packages/devs/flash/fr30/skmb91302/current/cdl/flash_skmb91302.cdl	6 Jan 2008 14:06:41 -0000	1.1
+++ packages/devs/flash/fr30/skmb91302/current/cdl/flash_skmb91302.cdl	18 Nov 2008 01:16:07 -0000
@@ -55,12 +55,10 @@ cdl_package CYGPKG_DEVS_FLASH_FR30_SKMB9
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_FR30_MB91301_SKMB91302
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       skmb91302_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/frv/frv400/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/frv/frv400/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ChangeLog
--- packages/devs/flash/frv/frv400/current/ChangeLog	5 Sep 2004 20:56:09 -0000	1.3
+++ packages/devs/flash/frv/frv400/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_frv_frv400.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2004-09-05  Mark Salter  <msalter@redhat.com>	
             David Woodhouse  <dwmw2@redhat.com>
 
 	* cdl/flash_frv_frv400.cdl: Build on frvgen too.
 
Index: packages/devs/flash/frv/frv400/current/cdl/flash_frv_frv400.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/frv/frv400/current/cdl/flash_frv_frv400.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 flash_frv_frv400.cdl
--- packages/devs/flash/frv/frv400/current/cdl/flash_frv_frv400.cdl	5 Sep 2004 20:56:09 -0000	1.3
+++ packages/devs/flash/frv/frv400/current/cdl/flash_frv_frv400.cdl	18 Nov 2008 01:16:07 -0000
@@ -54,12 +54,10 @@ cdl_package CYGPKG_DEVS_FLASH_FRV_FRV400
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_FRV_FRV400 || CYGPKG_HAL_FRV_MB93091
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       frv400_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/frv/pdk403/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/frv/pdk403/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/flash/frv/pdk403/current/ChangeLog	5 Sep 2004 20:56:10 -0000	1.1
+++ packages/devs/flash/frv/pdk403/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_frv_pdk403.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2004-09-05  David Woodhouse  <dwmw2@redhat.com>
 
 	* cdl/flash_frv_pdk403.cdl, src/pdk403_flash.c: New port.
 
 //===========================================================================
Index: packages/devs/flash/frv/pdk403/current/cdl/flash_frv_pdk403.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/frv/pdk403/current/cdl/flash_frv_pdk403.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_frv_pdk403.cdl
--- packages/devs/flash/frv/pdk403/current/cdl/flash_frv_pdk403.cdl	5 Sep 2004 20:56:10 -0000	1.1
+++ packages/devs/flash/frv/pdk403/current/cdl/flash_frv_pdk403.cdl	18 Nov 2008 01:16:07 -0000
@@ -54,12 +54,10 @@ cdl_package CYGPKG_DEVS_FLASH_FRV_PDK403
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_FRV_MB93093
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       pdk403_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/intel/28fxxx/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/intel/28fxxx/current/ChangeLog,v
retrieving revision 1.18
diff -u -5 -p -r1.18 ChangeLog
--- packages/devs/flash/intel/28fxxx/current/ChangeLog	4 Sep 2008 06:00:09 -0000	1.18
+++ packages/devs/flash/intel/28fxxx/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,10 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* cdl/flash_intel_28fxxx.cdl: Indicate that this driver uses
+	the legacy flash device API.
+
 2008-09-04  Dave Lawrence <dlawrence@ad-holdings.co.uk>
 
 	* include/flash_28fxxx.inl: 
 	* include/flash_28fxxx_parts.inl: Support write buffering. Add an
 	entry to the parts table indicating the size of the buffer and
Index: packages/devs/flash/intel/28fxxx/current/cdl/flash_intel_28fxxx.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/intel/28fxxx/current/cdl/flash_intel_28fxxx.cdl,v
retrieving revision 1.13
diff -u -5 -p -r1.13 flash_intel_28fxxx.cdl
--- packages/devs/flash/intel/28fxxx/current/cdl/flash_intel_28fxxx.cdl	14 Dec 2006 11:25:19 -0000	1.13
+++ packages/devs/flash/intel/28fxxx/current/cdl/flash_intel_28fxxx.cdl	18 Nov 2008 01:16:07 -0000
@@ -56,10 +56,11 @@ cdl_package CYGPKG_DEVS_FLASH_INTEL_28FX
     active_if	  CYGPKG_IO_FLASH
 
     active_if     CYGINT_DEVS_FLASH_INTEL_28FXXX_REQUIRED
 
     implements    CYGHWR_IO_FLASH_DEVICE
+    implements    CYGHWR_IO_FLASH_DEVICE_LEGACY
 
     include_dir   cyg/io
 
     requires      { CYGINT_DEVS_FLASH_INTEL_VARIANTS != 0 }
 
Index: packages/devs/flash/intel/strata/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/intel/strata/current/ChangeLog,v
retrieving revision 1.23
diff -u -5 -p -r1.23 ChangeLog
--- packages/devs/flash/intel/strata/current/ChangeLog	8 Feb 2005 20:14:40 -0000	1.23
+++ packages/devs/flash/intel/strata/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,12 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* src/strata.c: leave _FLASH_PRIVATE_ to the private strata.h
+	(Change from bartv 2004-12-02, merged from flash_v2 branch).
+	* cdl/flash_strata.cdl: Indicate that this driver uses
+	the legacy flash device API.
+
 2005-01-14  Thomas Koeller  <thomas.koeller@baslerweb.com>
 
 	* src/flash_query.c (flash_query): Fix switching the flash back to
 	array mode, which was broken on MIPS platforms. Always write
 	control codes to offset 0.
Index: packages/devs/flash/intel/strata/current/cdl/flash_strata.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/intel/strata/current/cdl/flash_strata.cdl,v
retrieving revision 1.7
diff -u -5 -p -r1.7 flash_strata.cdl
--- packages/devs/flash/intel/strata/current/cdl/flash_strata.cdl	21 Aug 2004 08:37:48 -0000	1.7
+++ packages/devs/flash/intel/strata/current/cdl/flash_strata.cdl	18 Nov 2008 01:16:07 -0000
@@ -54,10 +54,11 @@ cdl_package CYGPKG_DEVS_FLASH_STRATA {
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
 
     implements    CYGHWR_IO_FLASH_DEVICE
+    implements    CYGHWR_IO_FLASH_DEVICE_LEGACY
 
     active_if     CYGINT_DEVS_FLASH_STRATA_REQUIRED
 
     include_dir   .
     include_files ; # none _exported_ whatsoever
Index: packages/devs/flash/intel/strata/current/src/strata.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/intel/strata/current/src/strata.c,v
retrieving revision 1.9
diff -u -5 -p -r1.9 strata.c
--- packages/devs/flash/intel/strata/current/src/strata.c	26 Jan 2004 23:59:10 -0000	1.9
+++ packages/devs/flash/intel/strata/current/src/strata.c	18 Nov 2008 01:16:07 -0000
@@ -52,11 +52,10 @@
 
 #include <pkgconf/system.h>
 #include <pkgconf/hal.h>
 #include <cyg/hal/hal_arch.h>
 
-#define  _FLASH_PRIVATE_
 #include <cyg/io/flash.h>
 
 #include "strata.h"
 
 #define _si(p) ((p[1]<<8)|p[0])
Index: packages/devs/flash/mips/atlas/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mips/atlas/current/ChangeLog,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ChangeLog
--- packages/devs/flash/mips/atlas/current/ChangeLog	23 Sep 2003 09:50:17 -0000	1.6
+++ packages/devs/flash/mips/atlas/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,14 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* src/atlas_flash.c:
+	Explicitly include <cyg/io/flash_dev.h> rather than just
+	defining _FLASH_PRIVATE_. (From bartv in flash_v2 branch)
+
+	* cdl/flash_atlas.cdl: Indicate that this driver uses
+	the legacy flash device API.
+
 2003-09-23  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* cdl/flash_atlas.cdl: Added requirements for strncmp.
 
 2003-09-16  Jani Monoses <jani@iv.ro>
Index: packages/devs/flash/mips/atlas/current/cdl/flash_atlas.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mips/atlas/current/cdl/flash_atlas.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 flash_atlas.cdl
--- packages/devs/flash/mips/atlas/current/cdl/flash_atlas.cdl	23 Sep 2003 09:50:18 -0000	1.5
+++ packages/devs/flash/mips/atlas/current/cdl/flash_atlas.cdl	18 Nov 2008 01:16:07 -0000
@@ -56,10 +56,11 @@ cdl_package CYGPKG_DEVS_FLASH_ATLAS {
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_MIPS_ATLAS
     requires      CYGINT_ISO_STRING_STRFUNCS
 
     implements    CYGHWR_IO_FLASH_DEVICE
+    implements    CYGHWR_IO_FLASH_DEVICE_LEGACY
     implements    CYGHWR_IO_FLASH_BLOCK_LOCKING
 
     include_dir   .
     include_files ; # none _exported_ whatsoever
     description   "FLASH memory device support for MIPS Atlas"
Index: packages/devs/flash/mips/atlas/current/src/atlas_flash.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mips/atlas/current/src/atlas_flash.c,v
retrieving revision 1.5
diff -u -5 -p -r1.5 atlas_flash.c
--- packages/devs/flash/mips/atlas/current/src/atlas_flash.c	23 Sep 2003 09:50:18 -0000	1.5
+++ packages/devs/flash/mips/atlas/current/src/atlas_flash.c	18 Nov 2008 01:16:07 -0000
@@ -52,12 +52,12 @@
 
 #include <pkgconf/hal.h>
 #include <cyg/hal/hal_arch.h>
 #include <cyg/infra/diag.h>
 
-#define  _FLASH_PRIVATE_
 #include <cyg/io/flash.h>
+#include <cyg/io/flash_dev.h>
 
 #include "flash.h"
 
 #include <string.h>
 
Index: packages/devs/flash/mips/idt79s334a/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mips/idt79s334a/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/flash/mips/idt79s334a/current/ChangeLog	14 Feb 2003 01:44:03 -0000	1.1
+++ packages/devs/flash/mips/idt79s334a/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_mips_refidt334.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2003-02-13  Tim Michals  <t.michals@attbi.com>
 2003-02-13  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* New package - support for MIPS IDT 79s334a board.
 
Index: packages/devs/flash/mips/idt79s334a/current/cdl/flash_mips_refidt334.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mips/idt79s334a/current/cdl/flash_mips_refidt334.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_mips_refidt334.cdl
--- packages/devs/flash/mips/idt79s334a/current/cdl/flash_mips_refidt334.cdl	14 Feb 2003 01:44:03 -0000	1.1
+++ packages/devs/flash/mips/idt79s334a/current/cdl/flash_mips_refidt334.cdl	18 Nov 2008 01:16:07 -0000
@@ -53,12 +53,10 @@ cdl_package CYGPKG_DEVS_FLASH_MIPS_REFID
 
     parent        CYGPKG_IO_FLASH
     active_if     CYGPKG_IO_FLASH
     requires      CYGPKG_HAL_MIPS_IDT32334_REFIDT334
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       mips_idt334a_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/mips/malta/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mips/malta/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/flash/mips/malta/current/ChangeLog	23 May 2002 23:01:02 -0000	1.2
+++ packages/devs/flash/mips/malta/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_malta.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2001-08-10  Jesper Skov  <jskov@redhat.com>
 
 	* src/mips_malta_flash.c: Define width.
 
 	* cdl/flash_malta.cdl: Require 28F160S5 support.
Index: packages/devs/flash/mips/malta/current/cdl/flash_malta.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mips/malta/current/cdl/flash_malta.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 flash_malta.cdl
--- packages/devs/flash/mips/malta/current/cdl/flash_malta.cdl	23 May 2002 23:01:02 -0000	1.2
+++ packages/devs/flash/mips/malta/current/cdl/flash_malta.cdl	18 Nov 2008 01:16:07 -0000
@@ -53,12 +53,10 @@ cdl_package CYGPKG_DEVS_FLASH_MALTA {
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_MIPS_MALTA
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       mips_malta_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_INTEL_28FXXX_REQUIRED {
Index: packages/devs/flash/mips/ocelot/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mips/ocelot/current/ChangeLog,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ChangeLog
--- packages/devs/flash/mips/ocelot/current/ChangeLog	23 May 2002 23:01:02 -0000	1.5
+++ packages/devs/flash/mips/ocelot/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_mips_ocelot.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2001-06-08  Jesper Skov  <jskov@redhat.com>
 
 	* cdl/flash_mips_ocelot.cdl: Require AM29F040B support.
 
 2001-05-28  Jesper Skov  <jskov@redhat.com>
Index: packages/devs/flash/mips/ocelot/current/cdl/flash_mips_ocelot.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mips/ocelot/current/cdl/flash_mips_ocelot.cdl,v
retrieving revision 1.4
diff -u -5 -p -r1.4 flash_mips_ocelot.cdl
--- packages/devs/flash/mips/ocelot/current/cdl/flash_mips_ocelot.cdl	23 May 2002 23:01:02 -0000	1.4
+++ packages/devs/flash/mips/ocelot/current/cdl/flash_mips_ocelot.cdl	18 Nov 2008 01:16:07 -0000
@@ -53,12 +53,10 @@ cdl_package CYGPKG_DEVS_FLASH_MIPS_OCELO
 
     parent        CYGPKG_IO_FLASH
     active_if     CYGPKG_IO_FLASH
     requires      CYGPKG_HAL_MIPS_RM7000_OCELOT
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       mips_ocelot_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/mips/vrc437x/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mips/vrc437x/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ChangeLog
--- packages/devs/flash/mips/vrc437x/current/ChangeLog	23 May 2002 23:01:02 -0000	1.3
+++ packages/devs/flash/mips/vrc437x/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_mips_vrc437x.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2001-09-10  Nick Garnett  <nickg@redhat.com>
 
 	* cdl/flash_mips_vrc437x.cdl:
 	* src/mips_vrc437x_flash.c:
 	Created by copying the ocelot package.
Index: packages/devs/flash/mips/vrc437x/current/cdl/flash_mips_vrc437x.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mips/vrc437x/current/cdl/flash_mips_vrc437x.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 flash_mips_vrc437x.cdl
--- packages/devs/flash/mips/vrc437x/current/cdl/flash_mips_vrc437x.cdl	23 May 2002 23:01:02 -0000	1.3
+++ packages/devs/flash/mips/vrc437x/current/cdl/flash_mips_vrc437x.cdl	18 Nov 2008 01:16:07 -0000
@@ -53,12 +53,10 @@ cdl_package CYGPKG_DEVS_FLASH_MIPS_VRC43
 
     parent        CYGPKG_IO_FLASH
     active_if     CYGPKG_IO_FLASH
     requires      CYGPKG_HAL_MIPS_VR4300_VRC437X
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       mips_vrc437x_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/mn10300/asb2303/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mn10300/asb2303/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ChangeLog
--- packages/devs/flash/mn10300/asb2303/current/ChangeLog	5 Dec 2002 13:29:42 -0000	1.3
+++ packages/devs/flash/mn10300/asb2303/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_asb2303.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2002-12-05  Mark Salter  <msalter@redhat.com>
 
 	* src/mn10300_asb2303_flash.c (CYGNUM_FLASH_16AS8): Define
 	as 1 due to recent change in generic driver.
 
Index: packages/devs/flash/mn10300/asb2303/current/cdl/flash_asb2303.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mn10300/asb2303/current/cdl/flash_asb2303.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 flash_asb2303.cdl
--- packages/devs/flash/mn10300/asb2303/current/cdl/flash_asb2303.cdl	4 Dec 2002 22:20:50 -0000	1.2
+++ packages/devs/flash/mn10300/asb2303/current/cdl/flash_asb2303.cdl	18 Nov 2008 01:16:07 -0000
@@ -54,12 +54,10 @@ cdl_package CYGPKG_DEVS_FLASH_MN10300_AS
 
     parent        CYGPKG_IO_FLASH
     active_if     CYGPKG_IO_FLASH
     requires      CYGPKG_HAL_MN10300_AM33_ASB
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       mn10300_asb2303_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/mn10300/asb2305/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mn10300/asb2305/current/ChangeLog,v
retrieving revision 1.4
diff -u -5 -p -r1.4 ChangeLog
--- packages/devs/flash/mn10300/asb2305/current/ChangeLog	5 Dec 2002 13:29:44 -0000	1.4
+++ packages/devs/flash/mn10300/asb2305/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_asb2305.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2002-12-05  Mark Salter  <msalter@redhat.com>
 
 	* src/mn10300_asb2305_flash.c (CYGNUM_FLASH_16AS8): Define
 	as 1 due to recent change in generic driver.
 
Index: packages/devs/flash/mn10300/asb2305/current/cdl/flash_asb2305.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mn10300/asb2305/current/cdl/flash_asb2305.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 flash_asb2305.cdl
--- packages/devs/flash/mn10300/asb2305/current/cdl/flash_asb2305.cdl	4 Dec 2002 22:20:50 -0000	1.3
+++ packages/devs/flash/mn10300/asb2305/current/cdl/flash_asb2305.cdl	18 Nov 2008 01:16:07 -0000
@@ -54,12 +54,10 @@ cdl_package CYGPKG_DEVS_FLASH_MN10300_AS
 
     parent        CYGPKG_IO_FLASH
     active_if     CYGPKG_IO_FLASH
     requires      CYGPKG_HAL_MN10300_AM33_ASB2305
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       mn10300_asb2305_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/mn10300/stb/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mn10300/stb/current/ChangeLog,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ChangeLog
--- packages/devs/flash/mn10300/stb/current/ChangeLog	5 Dec 2002 13:29:45 -0000	1.5
+++ packages/devs/flash/mn10300/stb/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_stb.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2002-12-05  Mark Salter  <msalter@redhat.com>
 
 	* src/mn10300_stb_flash.c (CYGNUM_FLASH_16AS8): Define
 	as 1 due to recent change in generic driver.
 
Index: packages/devs/flash/mn10300/stb/current/cdl/flash_stb.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/mn10300/stb/current/cdl/flash_stb.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 flash_stb.cdl
--- packages/devs/flash/mn10300/stb/current/cdl/flash_stb.cdl	23 May 2002 23:01:03 -0000	1.3
+++ packages/devs/flash/mn10300/stb/current/cdl/flash_stb.cdl	18 Nov 2008 01:16:07 -0000
@@ -54,12 +54,10 @@ cdl_package CYGPKG_DEVS_FLASH_MN10300_ST
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_MN10300_AM33_STB
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       mn10300_stb_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/openrisc/orp/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/openrisc/orp/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/flash/openrisc/orp/current/ChangeLog	25 Apr 2003 04:11:44 -0000	1.1
+++ packages/devs/flash/openrisc/orp/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_openrisc_orp.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2003-03-06  Scott Furman <sfurman@rosum.com>
 
 	* src/openrisc_orp_flash.c, cdl/flash_openrisc_orp.cdl
 	  New package:  Flash programming for AMD AM29LVxxxxx devices
 	  used with OpenRISC Reference Platform (ORP).
Index: packages/devs/flash/openrisc/orp/current/cdl/flash_openrisc_orp.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/openrisc/orp/current/cdl/flash_openrisc_orp.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_openrisc_orp.cdl
--- packages/devs/flash/openrisc/orp/current/cdl/flash_openrisc_orp.cdl	25 Apr 2003 04:11:45 -0000	1.1
+++ packages/devs/flash/openrisc/orp/current/cdl/flash_openrisc_orp.cdl	18 Nov 2008 01:16:07 -0000
@@ -53,12 +53,10 @@ cdl_package CYGPKG_DEVS_FLASH_OPENRISC_O
 
     parent        CYGPKG_IO_FLASH
     active_if     CYGPKG_IO_FLASH
     requires      CYGPKG_HAL_OPENRISC_ORP
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       openrisc_orp_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/powerpc/adder/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/adder/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/flash/powerpc/adder/current/ChangeLog	25 Nov 2002 23:18:42 -0000	1.1
+++ packages/devs/flash/powerpc/adder/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_adder.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2002-11-25  Gary Thomas  <gthomas@ecoscentric.com>
 
 	* src/adder_flash.c: 
 	* cdl/flash_adder.cdl: New package - platform specific support
 	for Analogue & Micro Adder (PowerPC 850) boards.
Index: packages/devs/flash/powerpc/adder/current/cdl/flash_adder.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/adder/current/cdl/flash_adder.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_adder.cdl
--- packages/devs/flash/powerpc/adder/current/cdl/flash_adder.cdl	25 Nov 2002 23:18:42 -0000	1.1
+++ packages/devs/flash/powerpc/adder/current/cdl/flash_adder.cdl	18 Nov 2008 01:16:07 -0000
@@ -55,12 +55,10 @@ cdl_package CYGPKG_DEVS_FLASH_POWERPC_AD
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_POWERPC_ADDER
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       adder_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/powerpc/cme555/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/cme555/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/flash/powerpc/cme555/current/ChangeLog	23 May 2002 23:01:03 -0000	1.2
+++ packages/devs/flash/powerpc/cme555/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_cme555.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2002-04-24  Bob Koninckx  <bob.koninckx@mech.kuleuven.ac.be>
 
 	* New package.
 
 //===========================================================================
Index: packages/devs/flash/powerpc/cme555/current/cdl/flash_cme555.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/cme555/current/cdl/flash_cme555.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 flash_cme555.cdl
--- packages/devs/flash/powerpc/cme555/current/cdl/flash_cme555.cdl	23 May 2002 23:01:03 -0000	1.2
+++ packages/devs/flash/powerpc/cme555/current/cdl/flash_cme555.cdl	18 Nov 2008 01:16:07 -0000
@@ -54,12 +54,10 @@ cdl_package CYGPKG_DEVS_FLASH_CME555 {
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_POWERPC_CME555
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       powerpc_cme555_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/powerpc/ec555/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/ec555/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ChangeLog
--- packages/devs/flash/powerpc/ec555/current/ChangeLog	13 May 2004 09:12:14 -0000	1.3
+++ packages/devs/flash/powerpc/ec555/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_ec555.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2004-04-08  Bob Koninckx  <bob.koninckx@o-3s.com>
 
 	* src/powerpc_ec555_flash.c: Adapted flash start address to new
 	memory map. Up to 16 MB of flash is now supported.
 
Index: packages/devs/flash/powerpc/ec555/current/cdl/flash_ec555.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/ec555/current/cdl/flash_ec555.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 flash_ec555.cdl
--- packages/devs/flash/powerpc/ec555/current/cdl/flash_ec555.cdl	23 May 2002 23:01:03 -0000	1.2
+++ packages/devs/flash/powerpc/ec555/current/cdl/flash_ec555.cdl	18 Nov 2008 01:16:07 -0000
@@ -54,12 +54,10 @@ cdl_package CYGPKG_DEVS_FLASH_EC555 {
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_POWERPC_EC555
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       powerpc_ec555_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/powerpc/mbx/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/mbx/current/ChangeLog,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ChangeLog
--- packages/devs/flash/powerpc/mbx/current/ChangeLog	23 May 2002 23:01:03 -0000	1.7
+++ packages/devs/flash/powerpc/mbx/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_mbx.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2001-06-08  Jesper Skov  <jskov@redhat.com>
 
 	* cdl/flash_mbx.cdl: Require handling of the AM29F040.
 
 2001-05-28  Jesper Skov  <jskov@redhat.com>
Index: packages/devs/flash/powerpc/mbx/current/cdl/flash_mbx.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/mbx/current/cdl/flash_mbx.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 flash_mbx.cdl
--- packages/devs/flash/powerpc/mbx/current/cdl/flash_mbx.cdl	23 May 2002 23:01:03 -0000	1.5
+++ packages/devs/flash/powerpc/mbx/current/cdl/flash_mbx.cdl	18 Nov 2008 01:16:07 -0000
@@ -54,12 +54,10 @@ cdl_package CYGPKG_DEVS_FLASH_MBX {
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_POWERPC_MBX
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       powerpc_mbx_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/powerpc/pati/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/pati/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/flash/powerpc/pati/current/ChangeLog	15 Sep 2008 19:34:34 -0000	1.1
+++ packages/devs/flash/powerpc/pati/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_pati.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2008-06-18  Steven Clugston  <steven.clugston@ncl.ac.uk>
 
 	* src/powerpc_pati_flash.c: 
 	* cdl/flash_pati.cdl: New package - FLASH support on MPL PATI
 	  (MPC555) system.
Index: packages/devs/flash/powerpc/pati/current/cdl/flash_pati.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/pati/current/cdl/flash_pati.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_pati.cdl
--- packages/devs/flash/powerpc/pati/current/cdl/flash_pati.cdl	15 Sep 2008 19:34:34 -0000	1.1
+++ packages/devs/flash/powerpc/pati/current/cdl/flash_pati.cdl	18 Nov 2008 01:16:07 -0000
@@ -51,12 +51,10 @@ cdl_package CYGPKG_DEVS_FLASH_PATI {
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_POWERPC_PATI
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       powerpc_pati_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_INTEL_28FXXX_REQUIRED {
Index: packages/devs/flash/powerpc/rattler/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/rattler/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/flash/powerpc/rattler/current/ChangeLog	19 Aug 2003 17:29:45 -0000	1.1
+++ packages/devs/flash/powerpc/rattler/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_rattler.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2003-08-19  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/rattler_flash.c: 
 	* cdl/flash_rattler.cdl: New file(s) - platform support for
 	FLASH on Analogue & Micro Rattler (MPC8250) boards.
Index: packages/devs/flash/powerpc/rattler/current/cdl/flash_rattler.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/rattler/current/cdl/flash_rattler.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_rattler.cdl
--- packages/devs/flash/powerpc/rattler/current/cdl/flash_rattler.cdl	19 Aug 2003 17:29:45 -0000	1.1
+++ packages/devs/flash/powerpc/rattler/current/cdl/flash_rattler.cdl	18 Nov 2008 01:16:07 -0000
@@ -55,12 +55,10 @@ cdl_package CYGPKG_DEVS_FLASH_POWERPC_RA
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_POWERPC_RATTLER
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       rattler_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/powerpc/ts1000/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/ts1000/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/flash/powerpc/ts1000/current/ChangeLog	18 Oct 2002 16:56:55 -0000	1.2
+++ packages/devs/flash/powerpc/ts1000/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_ts1000.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2002-10-18  Gary Thomas  <gthomas@ecoscentric.com>
 
 	* cdl/flash_ts1000.cdl: Package renamed for consistency.
 
 2002-09-19  Gary Thomas  <gary@mlbassoc.com>
Index: packages/devs/flash/powerpc/ts1000/current/cdl/flash_ts1000.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/ts1000/current/cdl/flash_ts1000.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 flash_ts1000.cdl
--- packages/devs/flash/powerpc/ts1000/current/cdl/flash_ts1000.cdl	18 Oct 2002 16:56:55 -0000	1.2
+++ packages/devs/flash/powerpc/ts1000/current/cdl/flash_ts1000.cdl	18 Nov 2008 01:16:07 -0000
@@ -55,12 +55,10 @@ cdl_package CYGPKG_DEVS_FLASH_POWERPC_TS
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_POWERPC_TS1000
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       ts1000_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/powerpc/ts6/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/ts6/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/flash/powerpc/ts6/current/ChangeLog	12 Dec 2002 21:15:27 -0000	1.1
+++ packages/devs/flash/powerpc/ts6/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_ts6.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2002-12-12  Gary Thomas  <gthomas@ecoscentric.com>
 2002-12-12  Patrick Doyle <wpd@delcomsys.com>
 
 	* src/powerpc_ts6_flash.c: 
 	* cdl/flash_ts6.cdl: New package - FLASH support on Delphi
Index: packages/devs/flash/powerpc/ts6/current/cdl/flash_ts6.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/ts6/current/cdl/flash_ts6.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_ts6.cdl
--- packages/devs/flash/powerpc/ts6/current/cdl/flash_ts6.cdl	12 Dec 2002 21:15:28 -0000	1.1
+++ packages/devs/flash/powerpc/ts6/current/cdl/flash_ts6.cdl	18 Nov 2008 01:16:07 -0000
@@ -55,12 +55,10 @@ cdl_package CYGPKG_DEVS_FLASH_TS6 {
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_POWERPC_TS6
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       powerpc_ts6_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_INTEL_28FXXX_REQUIRED {
Index: packages/devs/flash/powerpc/vads/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/vads/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/flash/powerpc/vads/current/ChangeLog	12 Dec 2002 21:15:28 -0000	1.1
+++ packages/devs/flash/powerpc/vads/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_vads.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2002-12-12  Gary Thomas  <gthomas@ecoscentric.com>
 2002-12-12  Patrick Doyle <wpd@delcomsys.com>
 
 	* src/powerpc_vads_flash.c: 
 	* cdl/flash_vads.cdl: New package - FLASH support on Motorola
Index: packages/devs/flash/powerpc/vads/current/cdl/flash_vads.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/vads/current/cdl/flash_vads.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_vads.cdl
--- packages/devs/flash/powerpc/vads/current/cdl/flash_vads.cdl	12 Dec 2002 21:15:29 -0000	1.1
+++ packages/devs/flash/powerpc/vads/current/cdl/flash_vads.cdl	18 Nov 2008 01:16:07 -0000
@@ -55,11 +55,10 @@ cdl_package CYGPKG_DEVS_FLASH_VADS {
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_POWERPC_VADS
 
-    implements    CYGHWR_IO_FLASH_DEVICE
 #    implements    CYGHWR_IO_FLASH_DEVICE_NOT_IN_RAM
 
     compile       powerpc_vads_flash.c
 
     # Arguably this should do in the generic package
Index: packages/devs/flash/powerpc/viper/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/viper/current/ChangeLog,v
retrieving revision 1.9
diff -u -5 -p -r1.9 ChangeLog
--- packages/devs/flash/powerpc/viper/current/ChangeLog	5 Sep 2003 19:35:24 -0000	1.9
+++ packages/devs/flash/powerpc/viper/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_viper.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2003-09-05  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/viper_flash.c: Need <pkgconf.h> to make platform decisions!
 
 2003-08-19  Gary Thomas  <gary@mlbassoc.com>
Index: packages/devs/flash/powerpc/viper/current/cdl/flash_viper.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/powerpc/viper/current/cdl/flash_viper.cdl,v
retrieving revision 1.7
diff -u -5 -p -r1.7 flash_viper.cdl
--- packages/devs/flash/powerpc/viper/current/cdl/flash_viper.cdl	19 Aug 2003 17:29:46 -0000	1.7
+++ packages/devs/flash/powerpc/viper/current/cdl/flash_viper.cdl	18 Nov 2008 01:16:07 -0000
@@ -55,12 +55,10 @@ cdl_package CYGPKG_DEVS_FLASH_VIPER {
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_POWERPC_VIPER
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       viper_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/sh/hs7729pci/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/sh/hs7729pci/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/flash/sh/hs7729pci/current/ChangeLog	23 May 2002 23:01:04 -0000	1.2
+++ packages/devs/flash/sh/hs7729pci/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_sh_hs7729pci.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2001-06-08  Jesper Skov  <jskov@redhat.com>
 
 	* cdl/flash_sh_hs7729pci.cdl: Require AM29LV160 support.
 
 2001-05-29  Jesper Skov  <jskov@redhat.com>
Index: packages/devs/flash/sh/hs7729pci/current/cdl/flash_sh_hs7729pci.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/sh/hs7729pci/current/cdl/flash_sh_hs7729pci.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 flash_sh_hs7729pci.cdl
--- packages/devs/flash/sh/hs7729pci/current/cdl/flash_sh_hs7729pci.cdl	23 May 2002 23:01:04 -0000	1.2
+++ packages/devs/flash/sh/hs7729pci/current/cdl/flash_sh_hs7729pci.cdl	18 Nov 2008 01:16:07 -0000
@@ -54,12 +54,10 @@ cdl_package CYGPKG_DEVS_FLASH_SH_HS7729P
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_SH_SH7729_HS7729PCI
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       sh_hs7729pci_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/sh/se7751/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/sh/se7751/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/flash/sh/se7751/current/ChangeLog	23 May 2002 23:01:05 -0000	1.2
+++ packages/devs/flash/sh/se7751/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_sh_se7751.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2001-07-09  Jesper Skov  <jskov@redhat.com>
 
 	* Added flash support for SE7751.
 
 //===========================================================================
Index: packages/devs/flash/sh/se7751/current/cdl/flash_sh_se7751.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/sh/se7751/current/cdl/flash_sh_se7751.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 flash_sh_se7751.cdl
--- packages/devs/flash/sh/se7751/current/cdl/flash_sh_se7751.cdl	23 May 2002 23:01:05 -0000	1.2
+++ packages/devs/flash/sh/se7751/current/cdl/flash_sh_se7751.cdl	18 Nov 2008 01:16:07 -0000
@@ -54,12 +54,10 @@ cdl_package CYGPKG_DEVS_FLASH_SH_SE7751 
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_SH_SH7751_SE7751
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       sh_se7751_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/sh/se77x9/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/sh/se77x9/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/flash/sh/se77x9/current/ChangeLog	23 May 2002 23:01:05 -0000	1.2
+++ packages/devs/flash/sh/se77x9/current/ChangeLog	18 Nov 2008 01:16:07 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_sh_se77x9.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2001-06-12  Jesper Skov  <jskov@redhat.com>
 
 	* Added flash support for SE77x9.
 
 //===========================================================================
Index: packages/devs/flash/sh/se77x9/current/cdl/flash_sh_se77x9.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/sh/se77x9/current/cdl/flash_sh_se77x9.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 flash_sh_se77x9.cdl
--- packages/devs/flash/sh/se77x9/current/cdl/flash_sh_se77x9.cdl	23 May 2002 23:01:05 -0000	1.2
+++ packages/devs/flash/sh/se77x9/current/cdl/flash_sh_se77x9.cdl	18 Nov 2008 01:16:07 -0000
@@ -54,12 +54,10 @@ cdl_package CYGPKG_DEVS_FLASH_SH_SE77X9 
 
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires	  CYGPKG_HAL_SH_SH77X9_SE77X9
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     compile       sh_se77x9_flash.c
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
     cdl_interface CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED {
Index: packages/devs/flash/sst/39vf400/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/sst/39vf400/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/flash/sst/39vf400/current/ChangeLog	27 Jul 2003 09:32:21 -0000	1.1
+++ packages/devs/flash/sst/39vf400/current/ChangeLog	18 Nov 2008 01:16:08 -0000
@@ -1,5 +1,11 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+        * cdl/flash_sst_39vf400.cdl:
+        Don't implement CYGHWR_IO_FLASH_DEVICE here. Leave it for
+        the chip driver.
+
 2003-07-24  Chris Garry  <cgarry@sweeneydesign.co.uk>
 
 	* include/flash_sst_39vf400.inl: 
 	* cdl/flash_sst_39vf400.cdl: New package/file(s).
 
Index: packages/devs/flash/sst/39vf400/current/cdl/flash_sst_39vf400.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/sst/39vf400/current/cdl/flash_sst_39vf400.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_sst_39vf400.cdl
--- packages/devs/flash/sst/39vf400/current/cdl/flash_sst_39vf400.cdl	27 Jul 2003 09:32:21 -0000	1.1
+++ packages/devs/flash/sst/39vf400/current/cdl/flash_sst_39vf400.cdl	18 Nov 2008 01:16:08 -0000
@@ -54,11 +54,9 @@ cdl_package CYGPKG_DEVS_FLASH_SST_39VF40
     description   "FLASH memory device support for SST 39VF400"
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     active_if     CYGINT_DEVS_FLASH_SST_39VF400_REQUIRED
 
-    implements    CYGHWR_IO_FLASH_DEVICE
-
     include_dir   cyg/io
 }
 
-# EOF flash_sst_39vf400.cdl
\ No newline at end of file
+# EOF flash_sst_39vf400.cdl
Index: packages/devs/flash/synth/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/synth/current/ChangeLog,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ChangeLog
--- packages/devs/flash/synth/current/ChangeLog	3 Aug 2005 20:43:17 -0000	1.7
+++ packages/devs/flash/synth/current/ChangeLog	18 Nov 2008 01:16:08 -0000
@@ -1,5 +1,25 @@
+2008-11-17  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* Merge from flash_v2 branch:
+	
+ 2004-12-02  Bart Veer  <bartv@ecoscentric.com>
+
+	* src/synth.c: explicitly include <cyg/io/flash_dev.h> rather than
+	just defining _FLASH_PRIVATE_
+	* tests/flash2.c (cyg_user_start): update as per the v2 testcase
+
+ 2004-11-22  Bart Veer  <bartv@ecoscentric.com>
+
+	* cdl/flash_synth.cdl: fix testcase definitions
+
+ 2004-08-03  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* cdl/flash_synth.cdl: Indicate we need the legacy device API.
+	* cdl/flash_synth.cdl: 
+	* tests/flash2.c: Added a second test case for the new API.
+
 2005-08-02  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* tests/flash1.c (cyg_user_start): Fix a compiler warning about
 	signedness of pointers.
 
@@ -16,11 +36,11 @@
 
 	* src/synth.c: Moved cyg_hal_sys_mmap into the HAL.
 
 2003-11-20  Jani Monoses <jani@iv.ro>
 	
-	tests/flash1.c: Update flash_init() call to reflect
+	* tests/flash1.c: Update flash_init() call to reflect
 	new prototype.
 	
 2002-01-23  Jonathan Larmour  <jlarmour@redhat.com>
 
 	* cdl/flash_synth.cdl: Add CYGMEM_FLASH_SYNTH_BASE to allow
Index: packages/devs/flash/synth/current/cdl/flash_synth.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/synth/current/cdl/flash_synth.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 flash_synth.cdl
--- packages/devs/flash/synth/current/cdl/flash_synth.cdl	23 May 2002 23:01:05 -0000	1.3
+++ packages/devs/flash/synth/current/cdl/flash_synth.cdl	18 Nov 2008 01:16:08 -0000
@@ -54,10 +54,11 @@ cdl_package CYGPKG_DEVS_FLASH_SYNTH {
     parent        CYGPKG_IO_FLASH
     active_if	  CYGPKG_IO_FLASH
     requires      CYGINT_ISO_ERRNO_CODES
 
     implements    CYGHWR_IO_FLASH_DEVICE
+    implements    CYGHWR_IO_FLASH_DEVICE_LEGACY
 
     include_dir   .
     include_files ; # none _exported_ whatsoever
     description   "FLASH memory device support for Synthetic target"
     compile       synth.c flash_erase_block.c flash_program_buf.c flash_query.c
@@ -119,11 +120,11 @@ cdl_package CYGPKG_DEVS_FLASH_SYNTH {
 
     cdl_option CYGPKG_DEVS_FLASH_SYNTH_TESTS {
         display "Synth flash tests"
         flavor  data
         no_define
-        calculated { "tests/flash1.c"}
+        calculated { "tests/flash1 tests/flash2"}
             description   "
                 This option specifies the set of tests for the synth flash package."
     }
 }
 
Index: packages/devs/flash/synth/current/src/synth.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/synth/current/src/synth.c,v
retrieving revision 1.5
diff -u -5 -p -r1.5 synth.c
--- packages/devs/flash/synth/current/src/synth.c	3 Aug 2005 20:43:18 -0000	1.5
+++ packages/devs/flash/synth/current/src/synth.c	18 Nov 2008 01:16:08 -0000
@@ -55,12 +55,12 @@
 #include <cyg/hal/hal_io.h>
 #include <cyg/infra/cyg_ass.h>
 #include <errno.h>
 #include <string.h>
 
-#define  _FLASH_PRIVATE_
 #include <cyg/io/flash.h>
+#include <cyg/io/flash_dev.h>
 
 #include "synth.h"
 
 /* Holds the fd for the flash file */
 int cyg_dev_flash_synth_flashfd;
@@ -128,11 +128,11 @@ flash_hwr_init(void)
 
     if (cyg_dev_flash_synth_base <= 0) {
         return FLASH_ERR_HWR;
     }
     flash_info.start = cyg_dev_flash_synth_base;
-    flash_info.end = (void *)(((char *)cyg_dev_flash_synth_base) +
+    flash_info.end = (void *)(((char *)cyg_dev_flash_synth_base) -1 +
         (CYGNUM_FLASH_SYNTH_BLOCKSIZE * CYGNUM_FLASH_SYNTH_NUMBLOCKS));
 
     return FLASH_ERR_OK;
 }
 
Index: packages/devs/flash/synth/current/tests/flash1.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/synth/current/tests/flash1.c,v
retrieving revision 1.6
diff -u -5 -p -r1.6 flash1.c
--- packages/devs/flash/synth/current/tests/flash1.c	3 Aug 2005 20:43:18 -0000	1.6
+++ packages/devs/flash/synth/current/tests/flash1.c	18 Nov 2008 01:16:08 -0000
@@ -1,6 +1,6 @@
-/* Hay, the copyright is usefull for something! */
+/* Hey, the copyright is useful for something! */
 
 static char copyright[] = 
 "//=========================================================================="
 "//"
 "//      flash1.c"
@@ -62,10 +62,13 @@ static char copyright[] = 
 #include <string.h>
 
 #ifndef CYGINT_ISO_STRING_STRFUNCS
 # define NA_MSG "Need string functions for test"
 #endif
+#ifndef CYGSEM_IO_FLASH_LEGACY_API
+# define NA_MSG "Need legacy IO FLASH API for test"
+#endif
 
 #ifdef NA_MSG
 void cyg_user_start(void)
 {
     CYG_TEST_INIT();
Index: packages/devs/flash/synth/current/tests/flash2.c
===================================================================
RCS file: packages/devs/flash/synth/current/tests/flash2.c
diff -N packages/devs/flash/synth/current/tests/flash2.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ packages/devs/flash/synth/current/tests/flash2.c	18 Nov 2008 01:16:08 -0000
@@ -0,0 +1,209 @@
+/* Hey, the copyright is useful for something! */
+
+static char copyright[] = 
+"//=========================================================================="
+"//"
+"//      flash1.c"
+"//"
+"//      Test flash operations for the synth target synth flash driver"
+"//"
+"//=========================================================================="
+"//####ECOSGPLCOPYRIGHTBEGIN####"
+"// -------------------------------------------"
+"// This file is part of eCos, the Embedded Configurable Operating System."
+"// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, 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."
+"//"
+"// eCos is distributed in the hope that it will be useful, but WITHOUT ANY"
+"// WARRANTY; without even the implied warranty of MERCHANTABILITY or"
+"// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License"
+"// for more details."
+"//"
+"// You should have received a copy of the GNU General Public License along"
+"// with eCos; if not, write to the Free Software Foundation, Inc.,"
+"// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA."
+"//"
+"// As a special exception, if other files instantiate templates or use macros"
+"// or inline functions from this file, or you compile this file and link it"
+"// with other works to produce a work based on this file, this file does not"
+"// by itself cause the resulting work to be covered by the GNU General Public"
+"// License. However the source code for this file must still be made available"
+"// in accordance with section (3) of the GNU General Public License."
+"//"
+"// This exception does not invalidate any other reasons why a work based on"
+"// this file might be covered by the GNU General Public License."
+"//"
+"// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc."
+"// at http://sources.redhat.com/ecos/ecos-license/";
+"// -------------------------------------------"
+"//####ECOSGPLCOPYRIGHTEND####"
+"//=========================================================================="
+"//#####DESCRIPTIONBEGIN####"
+"//"
+"// Author(s):           andrew.lunn@ascom.ch"
+"// Contributors:        andrew.lunn"
+"// Date:                2000-10-31"
+"// Purpose:             Test a flash driver"
+"// Description:         Try out a number of flash operations and make sure"
+"//                      what is in the flash is what we expeect."
+"//                      "
+"//####DESCRIPTIONEND####"
+"//"
+"//==========================================================================&"
+;
+
+#include <pkgconf/devs_flash_synth.h>
+#include <cyg/io/flash.h>
+#include <cyg/infra/testcase.h>
+#include <cyg/infra/diag.h>
+
+#include <string.h>
+
+#ifndef CYGINT_ISO_STRING_STRFUNCS
+# define NA_MSG "Need string functions for test"
+#endif
+
+#ifdef NA_MSG
+void cyg_user_start(void)
+{
+    CYG_TEST_INIT();
+    CYG_TEST_NA( NA_MSG );
+}
+#else
+
+//==========================================================================
+// main
+
+void cyg_user_start(void)
+{
+    int ret;
+    cyg_flashaddr_t flash_start=0, flash_end=0;
+    cyg_flash_info_t info;
+    int block_size=0, blocks=0;
+    cyg_flashaddr_t prog_start;
+    unsigned char * ptr;
+    cyg_uint32 i=0;
+    cyg_uint32 j;
+    
+    CYG_TEST_INIT();
+  
+    ret=cyg_flash_init((cyg_flash_printf *)diag_printf);
+  
+    CYG_TEST_PASS_FAIL((ret == CYG_FLASH_ERR_OK),"flash_init");
+
+    do {
+      ret = cyg_flash_get_info(i, &info);
+      if (ret == CYG_FLASH_ERR_OK) {
+        diag_printf("INFO: Nth=%d, start=%p, end=%p\n",
+                    i, info.start, info.end);
+        if (i == 0) {
+          flash_start = info.start;
+          flash_end = info.end;
+          block_size = info.block_info[0].block_size;
+          blocks = info.block_info[0].blocks;
+        }
+        for (j=0;j < info.num_block_infos; j++) {
+          diag_printf("INFO:\t block_size %d, blocks %d\n",
+                      info.block_info[j].block_size,
+                      info.block_info[j].blocks);
+        }
+      }
+      i++;
+    } while (ret != CYG_FLASH_ERR_INVALID);
+    
+    /* Erase the whole flash. Not recommended on real hardware since this
+     will probably erase the bootloader etc!!! */
+    ret=cyg_flash_erase(flash_start,block_size * blocks,NULL);
+    CYG_TEST_PASS_FAIL((ret == CYG_FLASH_ERR_OK),"flash_erase1");
+
+    /* check that its actually been erased, and test the mmap area */
+    for (ptr=(unsigned char *)flash_start,ret=0; 
+         ptr <= (unsigned char *)flash_end; ptr++) {
+        if (*ptr != 0xff) {
+            ret++;
+        }
+    }
+  
+    CYG_TEST_PASS_FAIL((ret == 0),"flash empty check");
+
+    ret = cyg_flash_program(flash_start,&copyright,sizeof(copyright),NULL);
+    CYG_TEST_PASS_FAIL((ret == CYG_FLASH_ERR_OK),"flash_program1");
+  
+    /* Check the contents made it into the flash */
+    CYG_TEST_PASS_FAIL(!strncmp((void *)flash_start,
+                                copyright,sizeof(copyright)),
+                       "flash program contents");
+
+    /* .. and check nothing else changed */
+    for (ptr=(unsigned char *)flash_start+sizeof(copyright),ret=0; 
+         ptr < (unsigned char *)flash_end; ptr++) {
+        if (*ptr != 0xff) {
+            ret++;
+        }
+    }
+  
+    CYG_TEST_PASS_FAIL((ret == 0),"flash program overrun check");
+
+    /* Program over a block boundary */
+    prog_start = flash_start + block_size - sizeof(copyright)/2;
+    ret = cyg_flash_program(prog_start,&copyright,sizeof(copyright),NULL);
+    CYG_TEST_PASS_FAIL((ret == CYG_FLASH_ERR_OK),"flash_program2");
+  
+    /* Check the first version is still OK */
+    CYG_TEST_PASS_FAIL(!strncmp((void *)flash_start,
+                                copyright,
+                                sizeof(copyright)),
+                       "Original contents");
+  
+    CYG_TEST_PASS_FAIL(!strncmp((void *)prog_start,
+                                copyright,
+                                sizeof(copyright)),
+                       "New program contents");
+
+    /* Check the bit in between is still erased */
+    for (ptr=(unsigned char *)flash_start+sizeof(copyright),ret=0; 
+         ptr < (unsigned char *)prog_start; ptr++) {
+        if (*ptr != 0xff) {
+            ret++;
+        }
+    }
+    CYG_TEST_PASS_FAIL((ret == 0),"flash erase check1");
+  
+    /* Erase the second block and make sure the first is not erased */
+    ret=cyg_flash_erase(flash_start+block_size,block_size,NULL);
+    CYG_TEST_PASS_FAIL((ret == CYG_FLASH_ERR_OK),"flash_erase2");
+
+    /* Check the erase worked */
+    for (ptr=(unsigned char *)flash_start+block_size,ret=0; 
+         ptr < (unsigned char *)flash_start+block_size*2; 
+         ptr++) {
+        if (*ptr != 0xff) {
+            ret++;
+        }
+    }
+
+    CYG_TEST_PASS_FAIL((ret == 0), "flash erase check2");
+  
+    /* Lastly check the first half of the copyright message is still there */
+    CYG_TEST_PASS_FAIL(!strncmp((void *)prog_start,
+                                copyright,
+                                sizeof(copyright)/2),
+                       "Block 1 OK");
+
+#if 0
+    /* This test is be fatal! Its not run by default!
+     Check the flash is read only, by trying to write to it. We expect
+     to get an exception */
+
+    *(char *)flash_start = 'a';
+#endif
+
+    CYG_TEST_PASS_FINISH("flash1");
+}
+
+#endif /* ifndef NA_MSG */
+
+/* EOF flash2.c */
Index: packages/devs/flash/toshiba/tc58xxx/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/toshiba/tc58xxx/current/ChangeLog,v
retrieving revision 1.4
diff -u -5 -p -r1.4 ChangeLog
--- packages/devs/flash/toshiba/tc58xxx/current/ChangeLog	24 Aug 2004 13:16:40 -0000	1.4
+++ packages/devs/flash/toshiba/tc58xxx/current/ChangeLog	18 Nov 2008 01:16:08 -0000
@@ -1,5 +1,14 @@
+2004-11-20  Bart Veer  <bartv@ecoscentric.com>
+
+	* cdl/flash_toshiba_tc58xxx.cdl: NAND flash requires indirect read
+	support in the main flash code
+
+2004-08-03  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* cdl/flash_toshiba_tc58xxx.cdl: Indicate we need the legacy device API
+
 2004-08-24  Gary Thomas  <gary@mlbassoc.com>
 
 	* include/flash_tc58xxx.inl: Initial implementation of NAND ECC 
 	support (used by JFFS2).
 
Index: packages/devs/flash/toshiba/tc58xxx/current/cdl/flash_toshiba_tc58xxx.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/flash/toshiba/tc58xxx/current/cdl/flash_toshiba_tc58xxx.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 flash_toshiba_tc58xxx.cdl
--- packages/devs/flash/toshiba/tc58xxx/current/cdl/flash_toshiba_tc58xxx.cdl	19 Sep 2003 17:11:23 -0000	1.1
+++ packages/devs/flash/toshiba/tc58xxx/current/cdl/flash_toshiba_tc58xxx.cdl	18 Nov 2008 01:16:08 -0000
@@ -59,10 +59,12 @@ cdl_package CYGPKG_DEVS_FLASH_TOSHIBA_TC
     requires      { CYGSEM_IO_FLASH_READ_INDIRECT == 1 }
 
     active_if     CYGINT_DEVS_FLASH_TOSHIBA_TC58XXX_REQUIRED
 
     implements    CYGHWR_IO_FLASH_DEVICE
+    implements    CYGHWR_IO_FLASH_DEVICE_LEGACY
+    implements    CYGHWR_IO_FLASH_INDIRECT_READS
 
     include_dir   cyg/io
 }
 
 # EOF flash_toshiba_tc58xxx.cdl

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]