# HG changeset patch # User asl # Date 1091713093 0 # Node ID d4ce7bf7bdb71819fceac02fffd0dda09ca95983 # Parent 772ee36b344d9a606ac996a4ef6146d08e1966be Indicate that these drivers need the legacy device API. diff --git a/packages/devs/flash/amd/am29xxxxx/current/ChangeLog b/packages/devs/flash/amd/am29xxxxx/current/ChangeLog --- a/packages/devs/flash/amd/am29xxxxx/current/ChangeLog +++ b/packages/devs/flash/amd/am29xxxxx/current/ChangeLog @@ -1,3 +1,7 @@ +2004-08-03 Andrew Lunn + + * cdl/flash_amd_am29xxxxx.cdl: Indicate we need the legacy device API. + 2004-04-21 Sebastien Couret * include/flash_am29xxxxx.inl: Minor changes to silence warnings. diff --git a/packages/devs/flash/amd/am29xxxxx/current/cdl/flash_amd_am29xxxxx.cdl b/packages/devs/flash/amd/am29xxxxx/current/cdl/flash_amd_am29xxxxx.cdl --- a/packages/devs/flash/amd/am29xxxxx/current/cdl/flash_amd_am29xxxxx.cdl +++ b/packages/devs/flash/amd/am29xxxxx/current/cdl/flash_amd_am29xxxxx.cdl @@ -58,7 +58,8 @@ cdl_package CYGPKG_DEVS_FLASH_AMD_AM29XX 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 } diff --git a/packages/devs/flash/arm/aim711/current/ChangeLog b/packages/devs/flash/arm/aim711/current/ChangeLog --- a/packages/devs/flash/arm/aim711/current/ChangeLog +++ b/packages/devs/flash/arm/aim711/current/ChangeLog @@ -1,3 +1,8 @@ +2004-07-16 Andrew Lunn + + * 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 * src/arm_aim711_flash.c: diff --git a/packages/devs/flash/arm/aim711/current/cdl/flash_arm_aim711.cdl b/packages/devs/flash/arm/aim711/current/cdl/flash_arm_aim711.cdl --- a/packages/devs/flash/arm/aim711/current/cdl/flash_arm_aim711.cdl +++ b/packages/devs/flash/arm/aim711/current/cdl/flash_arm_aim711.cdl @@ -57,7 +57,7 @@ cdl_package CYGPKG_DEVS_FLASH_ARM_AIM711 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. diff --git a/packages/devs/flash/arm/aim711/current/src/arm_aim711_flash.c b/packages/devs/flash/arm/aim711/current/src/arm_aim711_flash.c --- a/packages/devs/flash/arm/aim711/current/src/arm_aim711_flash.c +++ b/packages/devs/flash/arm/aim711/current/src/arm_aim711_flash.c @@ -9,6 +9,7 @@ // ------------------------------------------- // 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 @@ -41,7 +42,7 @@ //#####DESCRIPTIONBEGIN#### // // Author(s): jskov, rcassebohm -// Contributors: jskov, rcassebohm +// Contributors: jskov, rcassebohm, andrew lunn // Date: 2001-02-21 // Purpose: // Description: @@ -59,8 +60,6 @@ #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 @@ -68,9 +67,15 @@ #define CYGNUM_FLASH_SERIES (1) #define CYGNUM_FLASH_BASE (0x2000000u) +#endif + #include "cyg/io/flash_sst_39vfxxx.inl" -#endif +CYG_FLASH_DRIVER(cyg_flash_sst_flashdev, + &cyg_sst_funs, + NULL, + CYGNUM_FLASH_BASE, + sizeof(struct cyg_flash_sst_priv)); // ------------------------------------------------------------------------ // EOF arm_aim711_flash.c diff --git a/packages/devs/flash/arm/at91/current/ChangeLog b/packages/devs/flash/arm/at91/current/ChangeLog --- a/packages/devs/flash/arm/at91/current/ChangeLog +++ b/packages/devs/flash/arm/at91/current/ChangeLog @@ -1,3 +1,7 @@ +2004-08-03 Andrew Lunn + + * cdl/flash_at91.cdl: Indicate we need the legacy device API. + 2001-07-19 Gary Thomas * src/flash_program_buf.c: Fix - needs to have A16 set. diff --git a/packages/devs/flash/arm/at91/current/cdl/flash_at91.cdl b/packages/devs/flash/arm/at91/current/cdl/flash_at91.cdl --- a/packages/devs/flash/arm/at91/current/cdl/flash_at91.cdl +++ b/packages/devs/flash/arm/at91/current/cdl/flash_at91.cdl @@ -57,6 +57,7 @@ cdl_package CYGPKG_DEVS_FLASH_AT91 { requires CYGPKG_HAL_ARM_AT91 implements CYGHWR_IO_FLASH_DEVICE + implements CYGHWR_IO_FLASH_DEVICE_LEGACY implements CYGHWR_IO_FLASH_DEVICE_NOT_IN_RAM include_dir . diff --git a/packages/devs/flash/arm/e7t/current/ChangeLog b/packages/devs/flash/arm/e7t/current/ChangeLog --- a/packages/devs/flash/arm/e7t/current/ChangeLog +++ b/packages/devs/flash/arm/e7t/current/ChangeLog @@ -1,3 +1,9 @@ +2004-08-03 Andrew Lunn + + * 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 * cdl/flash_e7t.cdl: diff --git a/packages/devs/flash/arm/e7t/current/cdl/flash_e7t.cdl b/packages/devs/flash/arm/e7t/current/cdl/flash_e7t.cdl --- a/packages/devs/flash/arm/e7t/current/cdl/flash_e7t.cdl +++ b/packages/devs/flash/arm/e7t/current/cdl/flash_e7t.cdl @@ -56,7 +56,7 @@ cdl_package CYGPKG_DEVS_FLASH_ARM_E7T { 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. diff --git a/packages/devs/flash/arm/e7t/current/src/arm_e7t_flash.c b/packages/devs/flash/arm/e7t/current/src/arm_e7t_flash.c --- a/packages/devs/flash/arm/e7t/current/src/arm_e7t_flash.c +++ b/packages/devs/flash/arm/e7t/current/src/arm_e7t_flash.c @@ -9,7 +9,7 @@ // ------------------------------------------- // 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 @@ -42,7 +42,7 @@ //#####DESCRIPTIONBEGIN#### // // Author(s): Chris Garry -// Contributors: +// Contributors: andrew.lunn@ascom.ch // Date: 2003-04-21 // Purpose: // Description: @@ -70,6 +70,12 @@ // Now include the driver code. #ifdef CYGINT_DEVS_FLASH_SST_39VFXXX_REQUIRED #include "cyg/io/flash_sst_39vfxxx.inl" + +CYG_FLASH_DRIVER(cyg_flash_sst_flashdev, + &cyg_sst_funs, + NULL, + CYGNUM_FLASH_BASE, + sizeof(struct cyg_flash_sst_priv)); #endif #ifdef CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED diff --git a/packages/devs/flash/arm/ebsa285/current/ChangeLog b/packages/devs/flash/arm/ebsa285/current/ChangeLog --- a/packages/devs/flash/arm/ebsa285/current/ChangeLog +++ b/packages/devs/flash/arm/ebsa285/current/ChangeLog @@ -1,3 +1,7 @@ +2004-08-03 Andrew Lunn + + * cdl/flash_ebsa285.cdl: Indicate we need the legacy device API. + 2003-09-14 Andrew Lunn * src/flash_query.c (flash_query): Casts to stop warnings. diff --git a/packages/devs/flash/arm/ebsa285/current/cdl/flash_ebsa285.cdl b/packages/devs/flash/arm/ebsa285/current/cdl/flash_ebsa285.cdl --- a/packages/devs/flash/arm/ebsa285/current/cdl/flash_ebsa285.cdl +++ b/packages/devs/flash/arm/ebsa285/current/cdl/flash_ebsa285.cdl @@ -57,6 +57,7 @@ cdl_package CYGPKG_DEVS_FLASH_EBSA285 { requires CYGPKG_HAL_ARM_EBSA285 implements CYGHWR_IO_FLASH_DEVICE + implements CYGHWR_IO_FLASH_DEVICE_LEGACY include_dir . include_files ; # none _exported_ whatsoever diff --git a/packages/devs/flash/arm/edb7xxx/current/ChangeLog b/packages/devs/flash/arm/edb7xxx/current/ChangeLog --- a/packages/devs/flash/arm/edb7xxx/current/ChangeLog +++ b/packages/devs/flash/arm/edb7xxx/current/ChangeLog @@ -1,3 +1,7 @@ +2004-08-03 Andrew Lunn + + * cdl/flash_edb7xxx.cdl: Indicate we need the legacy device API. + 2003-11-20 Jani Monoses * cdl/flash_edb7xxx.cdl: diff --git a/packages/devs/flash/arm/edb7xxx/current/cdl/flash_edb7xxx.cdl b/packages/devs/flash/arm/edb7xxx/current/cdl/flash_edb7xxx.cdl --- a/packages/devs/flash/arm/edb7xxx/current/cdl/flash_edb7xxx.cdl +++ b/packages/devs/flash/arm/edb7xxx/current/cdl/flash_edb7xxx.cdl @@ -67,6 +67,7 @@ cdl_package CYGPKG_DEVS_FLASH_EDB7XXX { 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 diff --git a/packages/devs/flash/arm/iq80310/current/ChangeLog b/packages/devs/flash/arm/iq80310/current/ChangeLog --- a/packages/devs/flash/arm/iq80310/current/ChangeLog +++ b/packages/devs/flash/arm/iq80310/current/ChangeLog @@ -1,3 +1,7 @@ +2004-08-03 Andrew Lunn + + * cdl/flash_iq80310.cdl: Indicate we need the legacy device API + 2003-09-16 Jani Monoses * src/flash_lock_block.c (flash_lock_block): diff --git a/packages/devs/flash/arm/iq80310/current/cdl/flash_iq80310.cdl b/packages/devs/flash/arm/iq80310/current/cdl/flash_iq80310.cdl --- a/packages/devs/flash/arm/iq80310/current/cdl/flash_iq80310.cdl +++ b/packages/devs/flash/arm/iq80310/current/cdl/flash_iq80310.cdl @@ -58,6 +58,7 @@ cdl_package CYGPKG_DEVS_FLASH_ARM_XSCALE 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 . diff --git a/packages/devs/flash/arm/sa1100mm/current/ChangeLog b/packages/devs/flash/arm/sa1100mm/current/ChangeLog --- a/packages/devs/flash/arm/sa1100mm/current/ChangeLog +++ b/packages/devs/flash/arm/sa1100mm/current/ChangeLog @@ -1,3 +1,7 @@ +2004-08-03 Andrew Lunn + + * cdl/flash_sa1100mm.cdl: Indicate we need the legacy device API. + 2003-09-12 Jani Monoses * src/flash_erase_block.c (flash_erase_block): diff --git a/packages/devs/flash/arm/sa1100mm/current/cdl/flash_sa1100mm.cdl b/packages/devs/flash/arm/sa1100mm/current/cdl/flash_sa1100mm.cdl --- a/packages/devs/flash/arm/sa1100mm/current/cdl/flash_sa1100mm.cdl +++ b/packages/devs/flash/arm/sa1100mm/current/cdl/flash_sa1100mm.cdl @@ -57,6 +57,7 @@ cdl_package CYGPKG_DEVS_FLASH_SA1100MM { requires CYGPKG_HAL_ARM_SA11X0 implements CYGHWR_IO_FLASH_DEVICE + implements CYGHWR_IO_FLASH_DEVICE_LEGACY include_dir . include_files ; # none _exported_ whatsoever diff --git a/packages/devs/flash/atmel/at29cxxxx/current/ChangeLog b/packages/devs/flash/atmel/at29cxxxx/current/ChangeLog --- a/packages/devs/flash/atmel/at29cxxxx/current/ChangeLog +++ b/packages/devs/flash/atmel/at29cxxxx/current/ChangeLog @@ -1,3 +1,7 @@ +2004-08-03 Andrew Lunn + + * cdl/flash_atmel_at29cxxxx.cdl: Indicate we need the legacy device API + 2003-10-02 Roland Cassebohm * include/flash_at29cxxxx.inl: Improves driver, to work with 16 bit diff --git a/packages/devs/flash/atmel/at29cxxxx/current/cdl/flash_atmel_at29cxxxx.cdl b/packages/devs/flash/atmel/at29cxxxx/current/cdl/flash_atmel_at29cxxxx.cdl --- a/packages/devs/flash/atmel/at29cxxxx/current/cdl/flash_atmel_at29cxxxx.cdl +++ b/packages/devs/flash/atmel/at29cxxxx/current/cdl/flash_atmel_at29cxxxx.cdl @@ -57,6 +57,7 @@ cdl_package CYGPKG_DEVS_FLASH_ATMEL_AT29 active_if CYGINT_DEVS_FLASH_ATMEL_AT29CXXXX_REQUIRED implements CYGHWR_IO_FLASH_DEVICE - + implements CYGHWR_IO_FLASH_DEVICE_LEGACY + include_dir cyg/io } diff --git a/packages/devs/flash/atmel/at49xxxx/current/ChangeLog b/packages/devs/flash/atmel/at49xxxx/current/ChangeLog --- a/packages/devs/flash/atmel/at49xxxx/current/ChangeLog +++ b/packages/devs/flash/atmel/at49xxxx/current/ChangeLog @@ -1,3 +1,7 @@ +2004-08-03 Andrew Lunn + + * cdl/flash_atmel_at49xxxx.cdl: Indicate we need the legacy device API + 2004-05-11 Thomas Koeller * cdl/flash_atmel_at49xxxx.cdl: diff --git a/packages/devs/flash/atmel/at49xxxx/current/cdl/flash_atmel_at49xxxx.cdl b/packages/devs/flash/atmel/at49xxxx/current/cdl/flash_atmel_at49xxxx.cdl --- a/packages/devs/flash/atmel/at49xxxx/current/cdl/flash_atmel_at49xxxx.cdl +++ b/packages/devs/flash/atmel/at49xxxx/current/cdl/flash_atmel_at49xxxx.cdl @@ -57,7 +57,8 @@ cdl_package CYGPKG_DEVS_FLASH_ATMEL_AT49 active_if CYGINT_DEVS_FLASH_ATMEL_AT49XXXX_REQUIRED implements CYGHWR_IO_FLASH_DEVICE - + implements CYGHDR_IO_FLASH_DEVICE_LEGACY + include_dir cyg/io cdl_option CYGHWR_DEVS_FLASH_ATMEL_AT49XXXX_ERASE_BUG_WORKAROUND { diff --git a/packages/devs/flash/intel/28fxxx/current/ChangeLog b/packages/devs/flash/intel/28fxxx/current/ChangeLog --- a/packages/devs/flash/intel/28fxxx/current/ChangeLog +++ b/packages/devs/flash/intel/28fxxx/current/ChangeLog @@ -1,3 +1,7 @@ +2004-08-03 Andrew Lunn + + * cdl/flash_intel_28fxxx.cdl: Indicate we need the legacy device API + 2002-12-12 Gary Thomas 2002-12-12 Patrick Doyle diff --git a/packages/devs/flash/intel/28fxxx/current/cdl/flash_intel_28fxxx.cdl b/packages/devs/flash/intel/28fxxx/current/cdl/flash_intel_28fxxx.cdl --- a/packages/devs/flash/intel/28fxxx/current/cdl/flash_intel_28fxxx.cdl +++ b/packages/devs/flash/intel/28fxxx/current/cdl/flash_intel_28fxxx.cdl @@ -58,6 +58,7 @@ cdl_package CYGPKG_DEVS_FLASH_INTEL_28FX active_if CYGINT_DEVS_FLASH_INTEL_28FXXX_REQUIRED implements CYGHWR_IO_FLASH_DEVICE + implements CYGHWR_IO_FLASH_DEVICE_LEGACY include_dir cyg/io diff --git a/packages/devs/flash/intel/bootblock/current/cdl/flash_intel_bootblock.cdl b/packages/devs/flash/intel/bootblock/current/cdl/flash_intel_bootblock.cdl --- a/packages/devs/flash/intel/bootblock/current/cdl/flash_intel_bootblock.cdl +++ b/packages/devs/flash/intel/bootblock/current/cdl/flash_intel_bootblock.cdl @@ -55,6 +55,7 @@ cdl_package CYGPKG_DEVS_FLASH_INTEL_BOOT active_if CYGPKG_IO_FLASH implements CYGHWR_IO_FLASH_DEVICE + implements CYGHWR_IO_FLASH_DEVICE_LEGACY implements CYGHWR_IO_FLASH_DEVICE_NOT_IN_RAM include_dir . diff --git a/packages/devs/flash/intel/strata/current/cdl/flash_strata.cdl b/packages/devs/flash/intel/strata/current/cdl/flash_strata.cdl --- a/packages/devs/flash/intel/strata/current/cdl/flash_strata.cdl +++ b/packages/devs/flash/intel/strata/current/cdl/flash_strata.cdl @@ -56,6 +56,7 @@ cdl_package CYGPKG_DEVS_FLASH_STRATA { active_if CYGPKG_IO_FLASH implements CYGHWR_IO_FLASH_DEVICE + implements CYGHWR_IO_FLASH_DEVICE_LEGACY active_if CYGINT_DEVS_FLASH_STRATA_REQUIRED diff --git a/packages/devs/flash/mips/atlas/current/ChangeLog b/packages/devs/flash/mips/atlas/current/ChangeLog --- a/packages/devs/flash/mips/atlas/current/ChangeLog +++ b/packages/devs/flash/mips/atlas/current/ChangeLog @@ -1,3 +1,7 @@ +2004-08-03 Andrew Lunn + + * cdl/flash_atlas.cdl: Indicate we need the legacy device API + 2003-09-23 Andrew Lunn * cdl/flash_atlas.cdl: Added requirements for strncmp. diff --git a/packages/devs/flash/mips/atlas/current/cdl/flash_atlas.cdl b/packages/devs/flash/mips/atlas/current/cdl/flash_atlas.cdl --- a/packages/devs/flash/mips/atlas/current/cdl/flash_atlas.cdl +++ b/packages/devs/flash/mips/atlas/current/cdl/flash_atlas.cdl @@ -58,6 +58,7 @@ cdl_package CYGPKG_DEVS_FLASH_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 . diff --git a/packages/devs/flash/sst/39vf400/current/ChangeLog b/packages/devs/flash/sst/39vf400/current/ChangeLog --- a/packages/devs/flash/sst/39vf400/current/ChangeLog +++ b/packages/devs/flash/sst/39vf400/current/ChangeLog @@ -1,3 +1,7 @@ +2004-08-03 Andrew Lunn + + * cdl/flash_sst_39vf400.cdl: Indicate we need the legacy device API. + 2003-07-24 Chris Garry * include/flash_sst_39vf400.inl: diff --git a/packages/devs/flash/sst/39vf400/current/cdl/flash_sst_39vf400.cdl b/packages/devs/flash/sst/39vf400/current/cdl/flash_sst_39vf400.cdl --- a/packages/devs/flash/sst/39vf400/current/cdl/flash_sst_39vf400.cdl +++ b/packages/devs/flash/sst/39vf400/current/cdl/flash_sst_39vf400.cdl @@ -57,6 +57,7 @@ cdl_package CYGPKG_DEVS_FLASH_SST_39VF40 active_if CYGINT_DEVS_FLASH_SST_39VF400_REQUIRED implements CYGHWR_IO_FLASH_DEVICE + implements CYGHWR_IO_FLASH_DEVICE_LEGACY include_dir cyg/io } diff --git a/packages/devs/flash/toshiba/tc58xxx/current/ChangeLog b/packages/devs/flash/toshiba/tc58xxx/current/ChangeLog --- a/packages/devs/flash/toshiba/tc58xxx/current/ChangeLog +++ b/packages/devs/flash/toshiba/tc58xxx/current/ChangeLog @@ -1,3 +1,7 @@ +2004-08-03 Andrew Lunn + + * cdl/flash_toshiba_tc58xxx.cdl: Indicate we need the legacy device API + 2004-03-07 Gary Thomas * include/flash_tc58xxx.inl: Page addressing was wrong for large (> 32MB) devices. diff --git a/packages/devs/flash/toshiba/tc58xxx/current/cdl/flash_toshiba_tc58xxx.cdl b/packages/devs/flash/toshiba/tc58xxx/current/cdl/flash_toshiba_tc58xxx.cdl --- a/packages/devs/flash/toshiba/tc58xxx/current/cdl/flash_toshiba_tc58xxx.cdl +++ b/packages/devs/flash/toshiba/tc58xxx/current/cdl/flash_toshiba_tc58xxx.cdl @@ -61,6 +61,7 @@ cdl_package CYGPKG_DEVS_FLASH_TOSHIBA_TC active_if CYGINT_DEVS_FLASH_TOSHIBA_TC58XXX_REQUIRED implements CYGHWR_IO_FLASH_DEVICE + implements CYGHWR_IO_FLASH_DEVICE_LEGACY include_dir cyg/io }