changeset 358:3de713ddbde9

This repository is deprecated in favour of http://hg-pub.ecoscentric.com/yaffs-ecoscentric-gpl/
author Ross Younger <wry@ecoscentric.com>
date Fri, 31 Dec 2010 00:00:00 +1300
parents 9f250509e64c
children 8d2a6b62b66d
files REPOSITORY-DEPRECATED.txt packages/ecos.db packages/fs/yaffs/current/ChangeLog packages/fs/yaffs/current/GPL-2 packages/fs/yaffs/current/cdl/yaffs.cdl packages/fs/yaffs/current/doc/.gitignore packages/fs/yaffs/current/doc/makefile packages/fs/yaffs/current/doc/yaffs.sgml packages/fs/yaffs/current/src/devextras.h packages/fs/yaffs/current/src/ecos-yaffs-diriter.c packages/fs/yaffs/current/src/ecos-yaffs-diriter.h packages/fs/yaffs/current/src/ecos-yaffs-nand.c packages/fs/yaffs/current/src/ecos-yaffs-nand.h packages/fs/yaffs/current/src/ecos-yaffs.c packages/fs/yaffs/current/src/ecos-yaffs.h packages/fs/yaffs/current/src/ecos-yport.h packages/fs/yaffs/current/src/yaffs_checkptrw.c packages/fs/yaffs/current/src/yaffs_checkptrw.h packages/fs/yaffs/current/src/yaffs_ecc.c packages/fs/yaffs/current/src/yaffs_ecc.h packages/fs/yaffs/current/src/yaffs_getblockinfo.h packages/fs/yaffs/current/src/yaffs_guts.c packages/fs/yaffs/current/src/yaffs_guts.h packages/fs/yaffs/current/src/yaffs_nand.c packages/fs/yaffs/current/src/yaffs_nand.h packages/fs/yaffs/current/src/yaffs_packedtags1.c packages/fs/yaffs/current/src/yaffs_packedtags1.h packages/fs/yaffs/current/src/yaffs_packedtags2.c packages/fs/yaffs/current/src/yaffs_packedtags2.h packages/fs/yaffs/current/src/yaffs_qsort.h packages/fs/yaffs/current/src/yaffs_tagscompat.c packages/fs/yaffs/current/src/yaffs_tagscompat.h packages/fs/yaffs/current/src/yaffs_tagsvalidity.c packages/fs/yaffs/current/src/yaffs_tagsvalidity.h packages/fs/yaffs/current/src/yaffsinterface.h packages/fs/yaffs/current/src/yportenv.h packages/fs/yaffs/current/tests/ar4prng.inl packages/fs/yaffs/current/tests/fops.c packages/fs/yaffs/current/tests/mounttime.c packages/fs/yaffs/current/tests/yaffs1.c packages/fs/yaffs/current/tests/yaffs2.c packages/fs/yaffs/current/tests/yaffs4.c packages/fs/yaffs/current/tests/yaffs5.c packages/fs/yaffs/current/tests/yaffs6.c
diffstat 44 files changed, 1 insertions(+), 20238 deletions(-) [+]
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/REPOSITORY-DEPRECATED.txt
@@ -0,0 +1,1 @@
+This repository is deprecated in favour of http://hg-pub.ecoscentric.com/yaffs-ecoscentric-gpl/
deleted file mode 100644
--- a/packages/ecos.db
+++ /dev/null
@@ -1,16 +0,0 @@
-# ecos.db for ecos-anon-yaffs
-#
-# NB. This repo isn't expected to form part of the ordinary eCos
-# repository, because of the special licensing of its contents.
-# Nevertheless an ecos.db is useful so we can test-build against it easily.
-
-package CYGPKG_FS_YAFFS {
-	alias		{ "YAFFS filesystem" fs_yaffs yaffs }
-	directory	fs/yaffs
-	script		yaffs.cdl
-	description "
-		This package provides the YAFFS filesystem.
-        This software is covered by the full GNU GPL; see
-        the file GPL-2 for details."
-}
-
deleted file mode 100644
--- a/packages/fs/yaffs/current/ChangeLog
+++ /dev/null
@@ -1,106 +0,0 @@
-2009-12-01  Ross Younger  <wry@ecoscentric.com>
-
-	* ecos-yaffs.c: Interface tweaks to allow this this package
-	to be easily used with eCosPro.
-	* yaffs.cdl: Create CYGSEM_FS_YAFFS_COMPATIBILITY_ECOSPRO switch
-	for the above, default off (i.e. for anoncvs).
-
-2009-11-19  Ross Younger  <wry@ecoscentric.com>
-
-	* ecos-yaffs.c, ecos-yaffs-nand.c: Update to NAND interface v2.
-	* yaffs.cdl: Require CYGSEM_IO_NAND_APPINTERFACE_VERSION > 1.
-	Declare CYGSEM_FS_YAFFS_NAND_APPINTERFACE to satisfy the two-way check.
-
-2009-11-17  Ross Younger  <wry@ecoscentric.com>
-
-	* yaffs_guts.c: Tweak last upstream merge. Be noisy if
-	we ran out of memory during mount.
-
-2009-11-13  Ross Younger  <wry@ecoscentric.com>
-
-	* tests: yaffs1-6 NA unless CYGPKG_KERNEL is present.
-	* Update upstream: (pulled up to 2009-11-11 02:11:13 +0000)
-	- mostly bugfixes
-
-2009-11-09  Ross Younger  <wry@ecoscentric.com>
-
-	* ecos-yaffs-nand.c: Update for changes to NAND interface.
-
-2009-11-03  Ross Younger  <wry@ecoscentric.com>
-
-	* tests: Import from eCosPro: mounttime, yaffs1, yaffs2,
-	yaffs4, yaffs5, yaffs6. Patch for codebase differences.
-
-2009-11-02  Ross Younger  <wry@ecoscentric.com>
-
-	* Update to latest snapshot from Aleph One CVS (mostly
-	tidyups): last upstream change is dated "2009-10-30 02:32:32 +0000"
-
-2009-10-29  Ross Younger  <wry@ecoscentric.com>
-
-	* yaffs_guts.c: Fix low-memory assert bug.
-
-2009-10-09  Ross Younger  <wry@ecoscentric.com>
-
-	* tests/fops.c: Don't make unreasonable use of stack.
-	* Update for latest upstream snapshot (yaffs_FlushFile)
-
-2009-09-24  Ross Younger  <wry@ecoscentric.com>
-
-	* doc/yaffs.sgml: Various fixups.
-	* ecos-yaffs-nand.h, ecos-yaffs.c, yaffs_guts.c: Build fixes for
-	older gcc
-
-2009-09-16  Ross Younger  <wry@ecoscentric.com>
-
-	* ecos-yaffs-nand.c: Correctly use ECC on YAFFS tags in yaffs2
-	filesystems when not in inbandTags mode (ref: 1000821)
-	* ecos-yaffs.c: Improve spare area size sanity checking on mount
-	* yaffs_packedtags2.c: Add framework (usually conditioned out)
-	to count ECC corrections within the spare area.
-
-2009-08-28  Ross Younger  <wry@ecoscentric.com>
-
-	* doc/yaffs.sgml: Bring explanations of CDL options up-to-date.
-	* yaffs.cdl: Add CYGNUM_FS_YAFFS_TEMP_BUFFERS tuning parameter.
-
-2009-08-26  Ross Younger  <wry@ecoscentric.com>
-
-	* Added support for small-page chips: incorporates and builds on work
-	by Simon Kallweit.  Small page devices can operate either in YAFFS1
-	mode, or YAFFS2 mode with inbandTags. 
-	* Updated #defines to omit unneeded YAFFS code.
-
-2009-08-18  Ross Younger  <wry@ecoscentric.com>
-
-	* yaffs-guts.c: Update from Aleph One CVS (1.85 -> 1.88)
-
-2009-07-20  Ross Younger  <wry@ecoscentric.com>
-
-	* ecos-yaffs.c: Compute free-space from nErasedBlocks (recommended by
-	Charles Manning) - not yaffs_GetNumberOfFreeChunks.
-
-2009-07-03 Ross Younger  <wry@eCosCentric.com>
-
-	* Add detailed RAM use estimate and worked example.
-
-2009-06-18 Ross Younger  <wry@eCosCentric.com>
-
-	* General enhancements and bugfixes.
-	* Add mount-time mallinfo check/warning in debug builds.
-	* Replace unconditional diag_printfs with calls to TOUT macro.
-	* TOUT (trace output) macro now uses configable cdl function,
-	  may be disabled.
-	* Improve our definition of YBUG.
-	* Upstream: Merge from cvs datestamp "2009-05-16 00:00"
-	* Retab eCos-specific files, for consistency.
-	* Pare down use of libextras.
-	* doc: linewrap for consistency.
-	* Elide unneeded YAFFS1 code.
-	* Use eCos qsort, not yaffs's own.
-
-2009-05-01 Ross Younger  <wry@eCosCentric.com>
-
-	* New package. YAFFS filesystem. Beware license terms; this
-	package is not covered by the standard eCos license!
-
deleted file mode 100644
--- a/packages/fs/yaffs/current/GPL-2
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
deleted file mode 100644
--- a/packages/fs/yaffs/current/cdl/yaffs.cdl
+++ /dev/null
@@ -1,308 +0,0 @@
-# ====================================================================
-#
-#      yaffs.cdl
-#
-#      YAFFS (Yet Another Flash File System) port to eCos
-#
-# ====================================================================
-# ####ECOSGPLCOPYRIGHTBEGIN####                                            
-# -------------------------------------------                              
-# This file is part of eCos, the Embedded Configurable Operating System.   
-# Copyright (C) 2009 eCosCentric Limited.
-#
-# 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.,    
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-#
-# This exception does not invalidate any other reasons why a work based    
-# on this file might be covered by the GNU General Public License.         
-# -------------------------------------------                              
-# ####ECOSGPLCOPYRIGHTEND####                                              
-# ====================================================================
-######DESCRIPTIONBEGIN####
-#
-# Author(s):      wry
-# Date:           2009-05-01
-#
-#####DESCRIPTIONEND####
-#
-# ====================================================================
-
-cdl_package CYGPKG_FS_YAFFS {
-    display         "YAFFS flash filesystem"
-    parent          CYGPKG_FS
-	include_files	
-	# there's nothing to include as we patch in to the fstab.
-
-	requires		CYGPKG_IO_FILEIO
-	requires		CYGPKG_IO_NAND
-    requires        ( CYGSEM_IO_NAND_APPINTERFACE_VERSION > 1 )
-	requires        CYGPKG_ISOINFRA
-	requires        CYGINT_ISO_ERRNO
-	requires        CYGINT_ISO_ERRNO_CODES
-	requires        CYGINT_ISO_MALLOC
-	requires		CYGPKG_LIBC_STDLIB
-	# STDLIB requires CYGINT_ISO_CTYPE, which is provided by CYGPKG_LIBC_I18N
-	requires		CYGPKG_LIBC_STRING
-
-    requires        { CYGPKG_REDBOOT implies (CYGMEM_REDBOOT_WORKSPACE_HEAP_SIZE >= 0x00014000) }
-
-	implements		CYGINT_IO_FILEIO_FS
-
-	compile		-library=libextras.a 	ecos-yaffs.c
-    compile         yaffs_checkptrw.c       \
-                    yaffs_guts.c            \
-                    yaffs_nand.c            \
-                    yaffs_ecc.c             \
-                    yaffs_packedtags1.c     \
-                    yaffs_packedtags2.c     \
-                    yaffs_tagscompat.c      \
-                    yaffs_tagsvalidity.c    \
-                    ecos-yaffs-nand.c       \
-                    ecos-yaffs-diriter.c
-
-    #doc             ref/yaffs.html
-    description     "
-        This package provides the YAFFS filesystem which is intended for 
-		NAND flash devices."
-
-	cdl_component CYGPKG_FS_YAFFS_OPTIONS {
-		display "YAFFS build options"
-		flavor  none
-		description   "
-			Package specific build options including control over
-			compiler flags used only in building the YAFFS code."
-
-		cdl_option CYGPKG_FS_YAFFS_CFLAGS_ADD {
-			display "Additional compiler flags"
-			flavor  data
-			no_define
-			default_value { "-Werror" }
-			description   "
-				This option modifies the set of compiler flags for
-				building the YAFFS filesystem. These flags
-				are used in addition to the set of global flags."
-			}
-		cdl_option CYGPKG_FS_YAFFS_CFLAGS_REMOVE {
-			display "Suppressed compiler flags"
-			flavor  data
-			no_define
-			default_value { "" }
-			description   "
-				This option modifies the set of compiler flags for
-				building the YAFFS filesystem. These flags
-				are removed from the set of global flags if present."
-		}
-	}
-
-	cdl_option CYGSEM_FS_YAFFS_SMALLPAGE_MODE {
-	   display         "YAFFS mode for small page devices"
-	   flavor          data
-	   default_value   { "YAFFS2" }
-	   legal_values    { "YAFFS1" "YAFFS2" }
-	   description     "
-           Small page devices - those with 512 bytes/page - may operate
-           in either YAFFS1 mode, or YAFFS2 with the inband tags option. 
-           This option selects the mode to use. Note that some chips
-           cannot support YAFFS1 mode, so this option may not be
-           relevant to you."
-	}
-
-	cdl_option CYGSEM_FS_YAFFS_CACHE_SHORT_NAMES {
-			display "Cache short filenames in RAM"
-			default_value 1
-			description	"
-				If set, short names are cached in memory.
-				This consumes more RAM, but allows faster file look-ups."
-	}
-
-	cdl_option CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE {
-        display "Omit YAFFS2-specific code"
-        default_value 1
-        active_if { CYGSEM_FS_YAFFS_SMALLPAGE_MODE == "YAFFS1" }
-        active_if CYGNUM_NAND_PAGEBUFFER <= 512
-        description	"
-            This option causes some of the YAFFS2-specific code
-            to be omitted from the build, in order to reduce code
-            size. Obviously, this can only ever work if all your devices
-            are small-page, and you have configured YAFFS to run them in
-            YAFFS1 mode."
-	}
-
-	cdl_option CYGPKG_FS_YAFFS_RET_DIRENT_DTYPE {
-		display			"Support for fileio's struct dirent d_type field"
-		flavor			bool
-		default_value	0
-		active_if		CYGPKG_FILEIO_DIRENT_DTYPE
-		description		"This option controls whether the YAFFS filesystem 
-						 supports setting fileio's struct dirent d_type field.
-					     If this option is enabled, d_type will be set."
-	}
-
-	cdl_option CYGNUM_FS_YAFFS_RESERVED_BLOCKS {
-		display			"Number of reserved blocks"
-		flavor			data
-		default_value	5
-		legal_values	2 to 0x7fffffff
-		description		"
-			The number of eraseblocks YAFFS should keep in reserve to allow
-			for garbage collection and for block failures. A
-			minimum value of 5 is recommended if you are using real
-			(non-synthetic) NAND devices; wizards may wish to tune it to
-			improve performance. Note that this setting is a global 
-			default and may be tuned per-device by a mount-time option."
-	}
-
-	cdl_option CYGNUM_FS_YAFFS_SHORTOP_CACHES {
-		display			"Number of cache entries"
-		flavor			data
-		default_value	10
-		legal_values	0 to 0x7fffffff
-		description		"
-			The number of page cache entries to use. Values from 10 to 20
-			are recommended; set to 0 to disable cacheing.
-			Wizards may wish to tune this value to improve performance.
-			Note that this setting is a global default and may be
-			configured per-device by a mount-time option. There is also
-            an upper limit hard-wired into the code as
-            YAFFS_MAX_SHORT_OP_CACHES; numbers in excess of this ceiling
-            will be ignored."
-	}
-
-	cdl_option CYGNUM_FS_YAFFS_TEMP_BUFFERS {
-		display			"Number of preallocated temporary page buffers"
-		flavor			data
-		default_value	6
-		legal_values	0 to 0x7fffffff
-		description		"
-            At mount time, YAFFS preallocates a number of temporary
-            buffers, which are used in many places throughout the code. 
-            This setting controls how many.
-            If YAFFS ever runs out of temporary buffers, it calls malloc to
-            dynamically allocate further buffers as needed. 
-            Most users will not need to change this setting, but it may
-            prove a useful tuning parameter."
-	}
-
-    cdl_option CYGNUM_FS_YAFFS_TRACEMASK {
-        display         "Output trace mask"
-        flavor          data
-        default_value   0
-        legal_values    0 to 0xffffffff
-        description     "
-            The YAFFS filesystem has a number of categories in which it can
-            emit diagnostic output. They are controlled by this setting,
-            which is a bitfield; set bits enable various categories.
-            For the definition of the bits used, see yportenv.h
-            (\"Tracing flags\"). They tend only to be useful for debugging.
-            "
-    }
-
-    cdl_option CYGSEM_FS_YAFFS_TRACEFN {
-        display         "Enable debug tracing"
-        flavor          booldata
-        default_value   { "diag_printf" }
-        description     "
-            If enabled, diagnostic output from YAFFS will be sent to
-            this function."
-    }
-
-    cdl_option CYGSEM_FS_YAFFS_COMPATIBILITY_ECOSPRO {
-        display         "eCosPro compatibility mode"
-        flavor          bool
-        default_value   0
-        description     "This package is targetted at eCos but may be
-            built under eCosPro by setting this switch."
-    }
-
-	cdl_option CYGPKG_FS_YAFFS_TESTS {
-		display "YAFFS filesystem tests"
-		flavor data
-		no_define
-		calculated { "tests/fops tests/mounttime" 
-                   . " tests/yaffs1 tests/yaffs2 tests/yaffs4"
-                   . " tests/yaffs5 tests/yaffs6"
-        }
-		description "
-		This special option specifies the set of tests to build for YAFFS."
-	}
-
-    cdl_component CYGPKG_FS_YAFFS_TESTING {
-        display          "Testing configuration"
-        default_value    1
-
-        define_proc {
-            puts $::cdl_system_header "/***** Synthdisk driver proc output start *****/"
-            puts $::cdl_system_header "#define CYGDAT_DEVS_DISK_CFG <pkgconf/fs_yaffs.h>"
-            puts $::cdl_system_header "/***** Synthdisk driver proc output end  *****/"        
-        }
-
-        
-        cdl_option CYGDAT_DEVS_DISK_TEST_DEVICE {
-            display      "Test device driver"
-            flavor       data
-            default_value { CYGPKG_DEVS_NAND_SYNTH?"\"synth/0\"":"\"onboard/0\"" }
-        }
-
-        cdl_option CYGDAT_DEVS_DISK_TEST_MOUNTPOINT {
-            display      "Test filesystem mountpoint"
-            flavor       data
-            default_value {"\"/nand\"" }
-        }
-
-        cdl_option CYGDAT_DEVS_DISK_TEST_DIRECTORY {
-            display      "Test directory on test device"
-            flavor       data
-            default_value {"\"/test\"" }
-        }
-
-        
-        cdl_option CYGDAT_DEVS_DISK_TEST_DEVICE2 {
-            display      "Second Test device driver"
-            flavor       data
-            default_value { CYGPKG_DEVS_NAND_SYNTH?"\"synth/1\"":"\"onboard/1\"" }
-        }
-
-        cdl_option CYGDAT_DEVS_DISK_TEST_MOUNTPOINT2 {
-            display      "Second Test filesystem mountpoint"
-            flavor       data
-            default_value {"\"/nand2\"" }
-        }
-
-        cdl_option CYGDAT_DEVS_DISK_TEST_DIRECTORY2 {
-            display      "Test directory on second test device"
-            flavor       data
-            default_value {"\"/test\"" }
-        }
-
-    }
-
-    cdl_option CYGSEM_FS_YAFFS_NAND_APPINTERFACE {
-        display     "NAND application interface version required"
-        flavor      data
-        calculated  2
-        no_define
-        description "This is the version of the NAND application
-            interface which this package requires. It exists to flag
-            up changes at the CDL level."
-    }
-
-}
deleted file mode 100644
--- a/packages/fs/yaffs/current/doc/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*.html
-*.aux
-*.log
-*.out
-*.pdf
-*.tex
deleted file mode 100644
--- a/packages/fs/yaffs/current/doc/makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-TOPLEVEL   := ../../../..
-MAIN_SGML  := yaffs.sgml
-MAIN_HTML  := fs-yaffs.html
-MAIN_PDF   := fs-yaffs.pdf
-OTHER_SGML :=
-PICTURES   :=
-
-include $(TOPLEVEL)/pkgconf/rules.doc
deleted file mode 100644
--- a/packages/fs/yaffs/current/doc/yaffs.sgml
+++ /dev/null
@@ -1,685 +0,0 @@
-<!-- {{{ Banner                         -->
-
-<!-- =============================================================== -->
-<!--                                                                 -->
-<!--     yaffs.sgml                                                  -->
-<!--                                                                 -->
-<!--     Documentation for the eCos port of the YAFFS filesystem.    -->
-<!--                                                                 -->
-<!-- =============================================================== -->
-<!-- ####ECOSDOCCOPYRIGHTBEGIN####                                   -->
-<!-- =============================================================== -->
-<!-- Copyright (C) 2009 eCosCentric Ltd.                             -->
-<!-- This material may be distributed only subject to the terms      -->
-<!-- and conditions set forth in the Open Publication License, v1.0  -->
-<!-- or later (the latest version is presently available at          -->
-<!-- http://www.opencontent.org/openpub/)                            -->
-<!-- Distribution of the work or derivative of the work in any       -->
-<!-- standard (paper) book form is prohibited unless prior           -->
-<!-- permission obtained from the copyright holder                   -->
-<!-- =============================================================== -->
-<!-- ####ECOSDOCCOPYRIGHTEND####                                     -->
-<!-- =============================================================== -->
-<!-- #####DESCRIPTIONBEGIN####                                       -->
-<!--                                                                 -->
-<!-- Author(s):   wry                                                -->
-<!-- Date:        2009-05-28                                         -->
-<!--                                                                 -->
-<!-- ####DESCRIPTIONEND####                                          -->
-<!-- =============================================================== -->
-
-<!-- }}} -->
-
-<!-- ### Uncomment to make a standalone book:
-<!DOCTYPE book  PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
-<book id="fs-yaffs-book">
-    <bookinfo>
-        <title>The YAFFS filesystem for eCos</title>
-        <copyright><year>2009</year><holder>eCosCentric Limited</holder></copyright>
-        <legalnotice>
-            <title>Documentation licensing terms</title>
-            <para>This material may be distributed only subject to the terms
-                and conditions set forth in the Open Publication License, v1.0
-                or later (the latest version is presently available at
-                <ulink url="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</ulink>).
-            </para>
-            <para>
-                Distribution of the work or derivative of the work in any
-                standard (paper) book form is prohibited unless prior
-                permission is obtained from the copyright holder.
-            </para>
-        </legalnotice>
-    </bookinfo>
-     !   /### -->
-
-<part id="fs-yaffs">
-<title>The YAFFS filesystem</title>
-
-<chapter id="yaffs-overview-c">
-<title>What is YAFFS?</title>
-
-<para>
-YAFFS is a filesystem for NAND flash chips.
-</para>
-
-<para>
-YAFFS is accessed through the FILEIO package which presents a standard 
-POSIX compatible IO interface through which applications use standard 
-open(), read(), write() and close() calls.
-</para>
-
-<para>
-YAFFS is a <emphasis>journalling</emphasis> filesystem 
-with <emphasis>wear-levelling</emphasis>. It is 
-particularly suited to NAND flash parts, having been
-designed with their unique properties in mind.
-The use of traditional filesystems (FAT, ext2, etc) which do not have
-these features is not recommended on such chips because their design
-requires the use of fixed address on the underlying hardware.
-Such behaviour causes flash sectors to wear out, the consequence of
-which would typically be to cause the whole device to become unbootable.
-</para>
-
-<para>
-YAFFS also provides a high degree of robustness, which is usually
-a requirement of embedded devices.
-A power failure or other crash can leave a traditional filesystem
-in an inconsistent state which is often difficult to repair,
-especially in the field.
-</para>
-
-<para>
-YAFFS can also be built into RedBoot, which allows you to store
-application images on NAND flash and boot them with
-RedBoot's usual flexible scripting system.
-</para>
-
-<para>
-For more information about NAND flash chips,
-how they differ from NOR flash parts
-and other ways to access them, refer to the documentation for the
-<xref linkend="io-nand-overview" endterm="io-nand-short">.
-</para>
-
-<para>
-For more information about YAFFS itself, refer to 
-<ulink url="http://www.yaffs.net/">yaffs.net</ulink>.
-</para>
-</chapter>
-
-<chapter id="yaffs-getstarted"><title>Getting started with YAFFS</title>
-
-<sect1 id="yaffs-licensing"><title>Licensing considerations</title>
-<para>
-Before you can use YAFFS, you must accept its license.
-<emphasis>YAFFS is not covered by the standard eCos license.</emphasis>
-You will be reminded of your license to use YAFFS when you install it.
-</para>
-
-<para>
-Most users will only have access to YAFFS under the GNU GPL. 
-This costs nothing to license. However this usually means that if you ever
-distribute your application,
-you must do so under the GPL.
-This requires you to publish or otherwise make all of your application,
-eCos and everything else you link with it available as source code.
-For full details refer to the text of the
-<ulink url="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GPL
-(v2)</ulink>.
-</para>
-
-<para>
-If you cannot accept the restrictions and obligations of the GPL, 
-YAFFS for eCos is available under a proprietary license, for a fee.
-Details are available on request from
-<ulink url="http://www.ecoscentric.com/">eCosCentric</ulink> or
-<ulink url="http://www.yaffs.net/yaffs-licences">Aleph One</ulink>.
-</para>
-</sect1>
-
-<sect1 id="yaffs-install"><title>Installation</title>
-<para>
-YAFFS is supplied as an EPK (eCos Package) file.
-</para>
-
-<sect2 id="yaffs-install-configtool"><title>Installation via the eCos
-Configuration Tool</title>
-<para>
-<orderedlist>
-<listitem><para>Open up the eCos Configuration Tool.</para></listitem>
-<listitem><para>Open up the <emphasis>Administration</emphasis> dialog,
-from the <emphasis>Tools</emphasis> menu.</para></listitem>
-<listitem><para>Press the <emphasis>Add</emphasis> button.</para></listitem>
-<listitem><para>A file browser windows opens. Navigate to the YAFFS EPK file.</para></listitem>
-<listitem><para>The License screen shows. You must accept the license
-in order to install the package. Press Yes if you do.</para></listitem>
-</orderedlist>
-</para>
-</sect2>
-
-<sect2 id="yaffs-install-commandline"><title>Installing from the
-command-line</title>
-<para> Advanced users may alternatively use the
-<filename>ecosadmin.tcl</filename> tool from the command line. You
-will be prompted to accept the license at the appropriate time during
-the procedure.
-</para>
-
-<programlisting>
-tclsh $ECOS_REPOSITORY/ecosadmin.tcl add yaffs-v1_2_3.epk
-</programlisting>
-</sect2>
-</sect1>
-
-<sect1 id="yaffs-config-build"><title>Configuration and Building</title>
-<para>
-After installing the EPK, YAFFS is added to your eCos repository
-and is configured and built in the normal way.
-</para>
-
-<sect2 id="yaffs-pkg-deps"><title>Package dependencies</title>
-<para>
-To link YAFFS into your application,
-add <filename>CYGPKG_FS_YAFFS</filename> to your eCos
-configuration in the normal way, either using the eCos Configuration Tool
-(<emphasis>Packages</emphasis> dialog on the <emphasis>Build</emphasis>
-menu), or the <filename>ecosconfig</filename> command-line tool.</para>
-
-<para>
-You will also need to add <filename>CYGPKG_IO_NAND</filename> and 
-<filename>CYGPKG_IO_FILEIO</filename> to your configuration if they
-are not already present.
-Your platform HAL should supply packages for all NAND device(s) present.
-</para>
-
-<para>
-If you started with a smaller template than <emphasis>default</emphasis>,
-you may also need to add some of the following:</para>
-<itemizedlist>
-<listitem><para><filename>CYGPKG_LIBC_STDLIB</filename></para></listitem>
-<listitem><para><filename>CYGPKG_LIBC_STRING</filename> </para></listitem>
-<listitem><para><filename>CYGPKG_MEMALLOC</filename> or something else
-which provides <filename>CYGINT_ISO_MALLOC</filename></para></listitem>
-<listitem><para><filename>CYGPKG_LIBC_I18N</filename> or something else
-which provides <filename>CYGINT_ISO_CTYPE</filename></para></listitem>
-</itemizedlist>
-</sect2>
-
-<sect2 id="yaffs-pkg-options"><title>Configuration options</title>
-<para>
-YAFFS provides a number of package options, including tuning parameters.
-</para>
-
-<variablelist>
-<varlistentry><term><constant>CYGSEM_FS_YAFFS_CACHE_SHORT_NAMES</constant></term><listitem><para>If
-set, caches files' short names in RAM. This consumes more RAM but
-improves performance.</para></listitem></varlistentry>
-<varlistentry><term><constant>CYGPKG_FS_YAFFS_RET_DIRENT_DTYPE</constant></term><listitem><para>Controls
-whether YAFFS supports setting the <structfield>d_type</structfield>
-field in a <structname>struct dirent</structname>.  If you don't need
-this, leave it switched off to save a little code size.</para></listitem></varlistentry>
-<varlistentry><term><constant>CYGNUM_FS_YAFFS_RESERVED_BLOCKS</constant></term><listitem><para>
-The number of blocks to keep in reserve to allow for garbage collection
-and block failures. The recommended value is 5, but it can be tuned to suit your application:
-higher numbers can reduce the delay caused by garbage collection, at the cost of removing
-available space for storing files.
-<emphasis>This setting is a global default and may be
-changed by a mount-time option.</emphasis></para></listitem></varlistentry>
-<varlistentry><term><constant>CYGNUM_FS_YAFFS_SHORTOP_CACHES</constant></term><listitem><para>
-The number of page cache entries to use. Values of 10 to 20 are
-recommended as a good compromise; increasing the number consumes more RAM but may
-improve performance.
-Set to 0 to disable these caches altogether. 
-<emphasis>This setting is a global default and may be
-changed by a mount-time option.</emphasis></para></listitem></varlistentry>
-<varlistentry><term><constant>CYGNUM_FS_YAFFS_TEMP_BUFFERS</constant></term>
-<listitem><para>
-YAFFS requires temporary buffers in many places throughout the code.
-To avoid the overhead of a dynamic malloc every time, a number of
-buffers are preallocated at mount time. This setting controls how many;
-should it not prove enough, YAFFS will call maloc on demand as required.
-The default setting is 6; most users will not need to change it.
-</para></listitem></varlistentry>
-<varlistentry><term><constant>CYGNUM_FS_YAFFS_TRACEMASK</constant></term><listitem><para>This
-is a 32-bit bitfield which controls diagnostic output. The bit definitions
-are found in <filename>yportenv.h</filename>; changing this setting tends to only be useful
-if you wish to debug YAFFS itself.</para></listitem></varlistentry>
-<varlistentry><term><constant>CYGPKG_FS_YAFFS_CFLAGS_ADD</constant></term>
-<term><constant>CYGPKG_FS_YAFFS_CFLAGS_REMOVE</constant></term><listitem><para>
-These settings allow specific build options to be added to or removed from the CFLAGS
-list when building YAFFS.</para></listitem></varlistentry>
-<varlistentry><term><constant>CYGSEM_FS_YAFFS_SMALLPAGE_MODE</constant></term>
-<listitem><para>This option only affects behaviour on so-called "small page" NAND devices
-(those whose pages are 512 bytes long).
-Such devices do not have enough space in their Out Of Band area to
-store a full set of YAFFS metadata tags. There are two ways to work
-around this: <itemizedlist><listitem><para><constant>YAFFS2</constant> mode -
-the default - uses regular tags, but at
-a price: it steals 16 bytes from the available space per page to store
-them. <emphasis>This reduces the apparent available
-size of your filesystem by 1/32!</emphasis></para></listitem>
-<listitem><para><constant>YAFFS1</constant> mode places a smaller tagset
-in the OOB area, but with a different side-effect: whenever a page is
-deleted, one byte of the tags area has to be rewritten.  Some devices
-forbid rewrite-without-erase in this way, so it may not be safe for you
-to use this option.  <emphasis>You must refer to the spec sheet for the chip on
-your board before selecting this option!</emphasis></para></listitem></itemizedlist>
-</para></listitem></varlistentry>
-<varlistentry><term><constant>CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE</constant></term><listitem><para>
-This causes all YAFFS2 code to be omitted from the build. This option only makes sense when
-all the devices on which YAFFS is to be used are small-page and operating in YAFFS1 mode.
-<note><para>There is no corresponding option to omit YAFFS1 code, because that code is only
-compiled when <constant>CYGSEM_FS_YAFFS_SMALLPAGE_MODE</constant> is set to YAFFS1.  </para></note>
-</para></listitem></varlistentry>
-</variablelist>
-</sect2>
-</sect1>
-
-<sect1 id="yaffs-using"><title>Using YAFFS</title>
-<para>
-YAFFS appears in the eCos filesystem table.
-This means that you can mount a filesystem in the standard Unix-like way,
-then interact with it with calls to open, read, etc.
-</para>
-
-<sect2 id="yaffs-mounting"><title>Mounting a filesystem</title>
-
-<para>
-Before you can use a filesystem, it must be <emphasis>mounted</emphasis>.
-</para>
-
-<para>
-A NAND device is logically organised as one or more
-<emphasis>partitions</emphasis>, which are
-usually set up by the relevant platform HAL.
-You need to tell the mount command
-which device and partition you wish to access. In the following example,
-we are mounting partition 0 of the <emphasis>onboard</emphasis> NAND device.
-</para>
-<!-- FIXME: Update if partition naming is changed. -->
-
-<programlisting>
-rv = mount("onboard/0", "/nand", "yaffs");
-</programlisting>
-
-<note><para>The <emphasis>device</emphasis> argument to the
-<function>mount</function> call is a NAND-specific device name, not
-an entry in /dev.
-Refer to the documentation for your platform HAL for details of how
-the NAND device(s) are named, and to the NAND library documentation
-for details of how partitions are addressed.
-</para></note>
-
-<para>
-You can, if you wish, make the filesystem mounting automatic at
-static constructor time with the MTAB_ENTRY macro. (Your platform
-HAL may already do this; check it carefully.)
-</para>
-
-<programlisting>
-MTAB_ENTRY(my_nand, "/nand", "yaffs", "onboard/0", "", 0);
-</programlisting>
-
-<note><para>This example is for eCosPro. In eCos, the MTAB_ENTRY macro
-takes only four arguments.</para></note>
-
-<sect3 id="yaffs-mount-options"><title>Mount-time options</title>
-<para>
-eCosPro allows various options to be passed to a filesystem at mount time,
-by combining them with the filesystem argument in a particular format.
-YAFFS understands the following options:
-</para>
-
-<itemizedlist>
-<listitem><para><constant>reserved</constant>=&lt;int&gt; The number of
-physical NAND blocks to reserve for garbage collection and block failures
-(minimum 2).  The default is set in CDL as
-<constant>CYGNUM_FS_YAFFS_RESERVED_BLOCKS</constant>.</para></listitem>
-<listitem><para><constant>caches</constant>=&lt;int&gt; The number of
-page cache entries to use.
-Values of 10 to 20 are recommended.
-The default is set in CDL as 
-<constant>CYGNUM_FS_YAFFS_SHORTOP_CACHES</constant>.</para></listitem>
-<listitem><para><constant>skip-checkpoint-read</constant> Instructs YAFFS
-to not attempt to reload the filesystem from a checkpoint, if one exists.
-In other words, this option forces a full filesystem scan whether or not
-one is necessary.</para></listitem>
-</itemizedlist>
-</sect3>
-</sect2>
-
-<sect2 id="yaffs-sync"><title>Data flushing</title>
-<para>
-YAFFS operates a cacheing layer in order to save undue wear on the
-NAND chip if many small writes are performed. Because of this, 
-if you wish to ensure that any data written to a still-open file has
-been fully flushed, you must make a synchronisation request. This is
-done with the <function>fsync</function> function, which takes as its
-argument the file descriptor of the file you wish to synchronise.</para>
-</sect2>
-
-<sect2 id="yaffs-checkpointing"><title>Checkpointing</title>
-<para>
-When mounting a filesystem, YAFFS has to scan the NAND chip to recreate
-its internal state. This can be a slow process, but is made much
-faster if there is a valid <emphasis>checkpoint</emphasis>.
-</para>
-
-<para>
-A checkpoint is written out automatically when you unmount the filesystem.
-At any other time, you can manually force a checkpoint to be written
-with one of the following functions:
-</para>
-
-<itemizedlist>
-<listitem><para><function>cyg_fs_fssync(mountpoint)</function> 
-synchronises a filesystem (automatically called on umount)</para></listitem>
-<listitem><para><function>sync</function> synchronises all mounted
-filesystems.</para></listitem>
-</itemizedlist>
-
-<note><para>
-A checkpoint becomes invalid as soon as there have been any other writes
-to the filesystem. Finding a good place to sync is necessarily dependent
-on your application logic.</para>
-</note>
-</sect2>
-
-<sect2 id="yaffs-limitations"><title>Limitations</title>
-<para>
-Although YAFFS is a Unix-compatible filesystem, the eCos port does not
-provide support for the full range of Unix attributes.
-</para>
-<itemizedlist>
-<listitem><para> eCos does not check file or directory permissions;
-everything it creates is given fixed user and group IDs of zero and
-standard permissions (files rw-r--r--, directories rwxr-xr-x).</para></listitem>
-<listitem><para> It is not currently possible to change file ownership
-or permissions.</para></listitem>
-<listitem><para> It is not currently possible to create symbolic links,
-FIFOs (named pipes), sockets or device nodes.</para></listitem>
-<listitem><para> Hard links to files work in the expected way. Hard
-links to directories are forbidden.</para></listitem>
-<listitem><para> It is not possible to unlink the '.', '..' or
-'lost+found' special directories.</para></listitem>
-</itemizedlist>
-
-<note><para>
-If you will be sharing a YAFFS filesystem between eCos and some other
-operating system, you are advised to carefully check the other system's
-definitions of mode (permission) bits and whether any translation may be
-required.</para>
-</note>
-</sect2>
-</sect1>
-
-<sect1 id="yaffs-mem-reqs"><title>Memory requirements</title>
-<para>
-The amount of RAM required by YAFFS to hold its in-memory data structures
-grows with the number of objects (files and directories) in your
-filesystem.
-You are recommended to test your application thoroughly to ensure
-that sufficient memory exists for YAFFS to operate with the
-most complicated filesystem it is likely to encounter.</para>
-
-<para>
-If you wish to estimate your RAM usage, the YAFFS author provides the
-following calculation:</para>
-
-<itemizedlist>
-<listitem><para> The partition itself requires a yaffs_DeviceStruct of 3608
-bytes.</para></listitem>
-<listitem><para> If CYGNUM_FS_YAFFS_SHORTOP_CACHES is enabled, each
-is the size of a NAND page plus 28 bytes.</para></listitem>
-<listitem><para> Every object (file, directory or hardlink) in the
-filesystem takes a yaffs_Object struct, which is 124 bytes.</para></listitem>
-<listitem><para> Every page of every file requires a Tnode entry, but
-they are always allocated in groups of 16 at a time.</para>
-  <itemizedlist>
-    <listitem><para>The size of a single Tnode entry is the
-    number of <emphasis>bits</emphasis> required to number all the
-    pages in the NAND partition YAFFS is using, numbering from
-    <emphasis>one</emphasis>; this is rounded up to a multiple of 2,
-    and has an absolute minimum of sixteen bits.</para></listitem>
-    <listitem><para>For example: on a partition with 65536 pages,
-    seventeen bits are required for the numbering, which round up to
-    18. Therefore each file takes 288 bits (36 bytes) per group of Tnodes,
-    and one group of Tnodes will cover up to sixteen pages of data.</para></listitem>
-  </itemizedlist>
-  </listitem>
-</itemizedlist>
-
-<note><para><emphasis>Actual memory consumption will be slightly
-higher than suggested by the above.</emphasis> This arises from the
-tree structure holding the Tnodes, overheads from the heap itself,
-and so on.</para></note>
-
-<para>
-YAFFS calls the standard <function>malloc</function> function to allocate
-memory and <function>free</function> to release it.  Normally, the eCos
-heap occupies all spare RAM not needed for the program, its static
-data or the stacks. Therefore, most applications will not need to do
-anything special beyond ensuring there is enough spare RAM available on
-the platform.</para>
-
-<tip><para>
-If you wish to experiment with restricted-size heaps to determine
-much memory your application actually uses under YAFFS,
-you may find the option
-<constant>CYGSEM_MEMALLOC_INVOKE_OUT_OF_MEMORY</constant> of use.
-</para></tip>
-
-<sect2 id="yaffs-mem-reqs-example"><title>Worked example</title>
-<para>
-Consider a YAFFS filesystem hosted by a NAND partition with 65536 pages,
-each of size 2k, using the default setting of ten short-op caches.
-On this filesystem we shall store 10000 files each of
-size 10240 bytes, hence each requires a single group of Tnodes.
-</para>
-
-<table frame=all pgwide=0><title>YAFFS RAM use worked example</title>
-<tgroup cols=2>
-<colspec colname=c1>
-<colspec colname=c2>
-<thead><row>
-<entry>Consumer</entry>
-<entry>RAM used (bytes)</entry>
-</row></thead>
-<tfoot><row>
-<entry>Total</entry>
-<entry align=right> 1,624,368 </entry>
-</row></tfoot>
-<tbody>
-<row>
-<entry> yaffs_DeviceStruct </entry>
-<entry align=right> 3,608 </entry>
-</row>
-<row>
-<entry> Short-op caches @ 10 x (2048+28)</entry>
-<entry align=right> 20,760 </entry>
-</row>
-<row>
-<entry> yaffs_Objects @ 10,000 x 124 </entry>
-<entry align=right> 1,240,000 </entry>
-</row>
-<row>
-<entry> Tnode groups @ 10,000 x 36 <emphasis>(see above)</emphasis></entry>
-<entry align=right> 360,000 </entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-
-<para>
-This example is a close match to the actual consumption measured by 
-eCosCentric during testing. (The measured consumption as reported 
-by <function>mallinfo</function> was 1,681,112 bytes, which includes
-the heap's own overheads.)
-</para>
-</sect2>
-</sect1>
-
-<sect1 id="yaffs-testing"><title>Testing</title>
-<para>
-YAFFS is supplied with a number of test programs, some of which are have been
-adapted from tests for other filesystems in eCos.
-</para>
-
-<glosslist>
-<glossentry><glossterm>fops</glossterm><glossdef><para>
-This was the first basic test created for the port of the filesystem.
-It is believed to exercise all of the code paths (filesystem operations,
-file operations and directory operations) within the eCos-YAFFS
-adaptation layer.  </para> <para>
-This test was originally intended to run on a synthetic NAND filesystem.
-On real NAND chips, it deliberately omits the more stressful routines to
-avoid undue wear on the hardware.
-</para></glossdef></glossentry>
-<glossentry><glossterm>yaffs1</glossterm><glossdef><para>
-A number of filesystem edge-case semantic tests, including 
-file and directory creation and deletion, 
-invalid open and rename operations, and
-removing nonexistent files and directories.
-</para></glossdef></glossentry>
-<glossentry><glossterm>yaffs2</glossterm><glossdef><para>
-Concurrent multi-threaded filesystem access and consistency checks.
-</para></glossdef></glossentry>
-<glossentry><glossterm>yaffs4</glossterm><glossdef><para>
-Semantic and edge-case testing - like yaffs1 - but with long file names.
-</para></glossdef></glossentry>
-<glossentry><glossterm>yaffs5</glossterm><glossdef><para>
-Tests that file reading and writing works over reasonably large files
-(up to 1Mbyte) with different I/O chunk sizes. Some operation timings
-are collected and reported, as is the data rate on large files.
-</para></glossdef></glossentry>
-<glossentry><glossterm>yaffs6</glossterm><glossdef><para>
-Semantic and edge-case testing - like yaffs1 - but with Cyrillic filenames
-in order to test UTF-8 correctness.
-</para></glossdef></glossentry>
-<glossentry><glossterm>mounttime</glossterm><glossdef><para>
-A simple benchmark which repeatedly mounts and unmounts the filesystem
-and measures how long this takes.
-You can optionally use the <filename>mkfiles</filename> routine - also
-present in the tests directory - to create many short files so you can 
-test performance on a loaded filesystem.
-</para></glossdef></glossentry>
-<glossentry><glossterm>hammer</glossterm><glossdef><para>
-A stress test designed to shake out corner cases.
-Repeatedly creates many files of varying sizes from multiple threads
-until the filesystem fills up, then verifies their contents and removes
-them. From time to time, all threads pause and the filesystem is
-unmounted and remounted. </para><para>This test is particularly useful when 
-combined with the bad block injection functionality provided by
-the synthetic NAND device. It has been used in this way by eCosCentric to 
-thoroughly test this package's stability under error conditions.
-<note><para>This test runs forever, until interrupted.</para></note>
-</para></glossdef></glossentry>
-</glosslist>
-</sect1>
-</chapter>
-
-<chapter id="yaffs-redboot"><title>Using YAFFS with RedBoot</title>
-<para>
-It is possible to link YAFFS into RedBoot and use it to boot an
-executable image stored on a NAND array. 
-</para>
-
-<para>
-This is done by configuring and building RedBoot largely in the normal way.
-You will need to add <filename>CYGPKG_FS_YAFFS</filename> and
-<filename>CYGPKG_IO_FILEIO</filename> to your configuration, plus their
-attendant dependencies.
-</para>
-
-<para>
-The presence of CYGPKG_IO_FILEIO activates the <filename>fs</filename> series
-of RedBoot commands. The following (edited) transcript illustrates how
-they might
-be used in concert with other RedBoot commands to store an ELF image on
-a NAND partition, load it back and execute:
-</para>
-
-<programlisting>
-RedBoot> fs mount -d onboard/0 -t yaffs /nand
-yaffs: restored from checkpoint
-RedBoot> load -r -h my.tftp.ip.address -b %{freememlo} my.image
-Using default protocol (TFTP)
-Raw file loaded 0xa013f000-0xa01554b3, assumed entry at 0xa013f000
-RedBoot> fs write /nand/myimg.elf
-RedBoot> fs list /nand                                                          
-   1 drwxr-xr-x  0 size      0 .
-   1 drwxr-xr-x  0 size      0 ..
- 262 -rw-r--r--  0 size  91316 myimg.elf
-   2 drwxr-xr-x  0 size      0 lost+found
-RedBoot> load -m file /nand/myimg.elf
-RedBoot> go
-Hello, NAND world!
-</programlisting>
-
-<note><para>When you command RedBoot to execute an image, it 
-first synchronises all mounted filesystems. Therefore,
-provided these filesystems support the synchronisation operation
-(which YAFFS does), it is not always necessary to unmount them before
-invoking an image.
-</para>
-</note>
-
-<sect1 id="yaffs-rb-mem"><title>Memory considerations under RedBoot</title>
-<para>
-RedBoot traditionally has very limited requirements for memory management;
-the main need is for there to be free space in RAM at the correct
-(physical) address to load an image before jumping to it.
-</para>
-
-<para>
-Introducing YAFFS brings with it not just the need to have dynamically
-allocatable RAM (<filename>CYGPKG_MEMALLOC</filename>), but enough
-to replay the filesystem journal. This must be balanced against the need
-for RAM to load images into.
-</para>
-
-<para>
-When the <filename>CYGPKG_MEMALLOC</filename> package is present in
-RedBoot, by default a small (64k) heap is set up so that the maximum RAM
-possible is available for loading images. This is not enough to 
-support YAFFS in any circumstances, so the following definition has
-been included in the <filename>yaffs.cdl</filename> file:
-</para>
-
-<programlisting>
-requires        { CYGPKG_REDBOOT implies (CYGMEM_REDBOOT_WORKSPACE_HEAP_SIZE >= 0x00014000) }
-</programlisting>
-
-<caution><para>
-This declaration only provideds the bare minimum heap required to mount a 
-trivial YAFFS filesystem. More will be required for all but the simplest
-of cases and it is recommended that you test for typical use in your
-environment. Refer also to <xref linkend="yaffs-mem-reqs">.
-</para></caution>
-
-<para>
-It is recommended that, should you wish to make a filesystem usable by
-RedBoot, your platform HAL should make a similar
-declaration in its CDL to establish an appropriate heap size.
-
-For example, the platform HAL for the EA LPC2468 OEM board - which has
-a 128MB NAND chip on-board - contains the following declaration:
-</para>
-
-<programlisting>
-requires        { (CYGPKG_REDBOOT && CYGPKG_FS_YAFFS) implies (CYGMEM_REDBOOT_WORKSPACE_HEAP_SIZE >= 0x20000) }
-</programlisting>
-
-<tip><para>
-If you wish to experiment with restricted heaps to determine
-much memory your application actually uses under YAFFS,
-you may find the option
-<constant>CYGSEM_MEMALLOC_INVOKE_OUT_OF_MEMORY</constant> of use.
-</para></tip>
-</sect1>
-</chapter>
-</part>
-
-<!-- ### Uncomment to make a standalone book:
-</book>
-     /### -->
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/devextras.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-/*
- * This file is just holds extra declarations of macros that would normally
- * be providesd in the Linux kernel. These macros have been written from
- * scratch but are functionally equivalent to the Linux ones.
- *
- */
-
-#include "ecos-yaffs.h"
-
-#ifndef __EXTRAS_H__
-#define __EXTRAS_H__
-
-
-#if !(defined __KERNEL__)
-
-/* Definition of types */
-typedef unsigned char __u8;
-typedef unsigned short __u16;
-typedef unsigned __u32;
-
-#endif
-
-/*
- * This is a simple doubly linked list implementation that matches the
- * way the Linux kernel doubly linked list implementation works.
- */
-
-struct ylist_head {
-	struct ylist_head *next; /* next in chain */
-	struct ylist_head *prev; /* previous in chain */
-};
-
-
-/* Initialise a static list */
-#define YLIST_HEAD(name) \
-struct ylist_head name = { &(name), &(name)}
-
-
-
-/* Initialise a list head to an empty list */
-#define YINIT_LIST_HEAD(p) \
-do { \
-	(p)->next = (p);\
-	(p)->prev = (p); \
-} while (0)
-
-
-/* Add an element to a list */
-static __inline__ void ylist_add(struct ylist_head *newEntry,
-				struct ylist_head *list)
-{
-	struct ylist_head *listNext = list->next;
-
-	list->next = newEntry;
-	newEntry->prev = list;
-	newEntry->next = listNext;
-	listNext->prev = newEntry;
-
-}
-
-static __inline__ void ylist_add_tail(struct ylist_head *newEntry,
-				 struct ylist_head *list)
-{
-	struct ylist_head *listPrev = list->prev;
-
-	list->prev = newEntry;
-	newEntry->next = list;
-	newEntry->prev = listPrev;
-	listPrev->next = newEntry;
-
-}
-
-
-/* Take an element out of its current list, with or without
- * reinitialising the links.of the entry*/
-static __inline__ void ylist_del(struct ylist_head *entry)
-{
-	struct ylist_head *listNext = entry->next;
-	struct ylist_head *listPrev = entry->prev;
-
-	listNext->prev = listPrev;
-	listPrev->next = listNext;
-
-}
-
-static __inline__ void ylist_del_init(struct ylist_head *entry)
-{
-	ylist_del(entry);
-	entry->next = entry->prev = entry;
-}
-
-
-/* Test if the list is empty */
-static __inline__ int ylist_empty(struct ylist_head *entry)
-{
-	return (entry->next == entry);
-}
-
-
-/* ylist_entry takes a pointer to a list entry and offsets it to that
- * we can find a pointer to the object it is embedded in.
- */
-
-
-#define ylist_entry(entry, type, member) \
-	((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))
-
-
-/* ylist_for_each and list_for_each_safe  iterate over lists.
- * ylist_for_each_safe uses temporary storage to make the list delete safe
- */
-
-#define ylist_for_each(itervar, list) \
-	for (itervar = (list)->next; itervar != (list); itervar = itervar->next)
-
-#define ylist_for_each_safe(itervar, saveVar, list) \
-	for (itervar = (list)->next, saveVar = (list)->next->next; \
-		itervar != (list); itervar = saveVar, saveVar = saveVar->next)
-
-
-#if !(defined __KERNEL__)
-
-
-#ifndef WIN32
-#include <sys/stat.h>
-#endif
-
-
-#ifdef CONFIG_YAFFS_PROVIDE_DEFS
-/* File types */
-
-
-#define DT_UNKNOWN	0
-#define DT_FIFO		1
-#define DT_CHR		2
-#define DT_DIR		4
-#define DT_BLK		6
-#define DT_REG		8
-#define DT_LNK		10
-#define DT_SOCK		12
-#define DT_WHT		14
-
-
-#ifndef WIN32
-#include <sys/stat.h>
-#endif
-
-/*
- * Attribute flags.  These should be or-ed together to figure out what
- * has been changed!
- */
-#define ATTR_MODE	1
-#define ATTR_UID	2
-#define ATTR_GID	4
-#define ATTR_SIZE	8
-#define ATTR_ATIME	16
-#define ATTR_MTIME	32
-#define ATTR_CTIME	64
-
-struct iattr {
-	unsigned int ia_valid;
-	unsigned ia_mode;
-	unsigned ia_uid;
-	unsigned ia_gid;
-	unsigned ia_size;
-	unsigned ia_atime;
-	unsigned ia_mtime;
-	unsigned ia_ctime;
-	unsigned int ia_attr_flags;
-};
-
-#endif
-
-#else
-
-#include <linux/types.h>
-#include <linux/fs.h>
-#include <linux/stat.h>
-
-#endif
-
-
-#endif
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/ecos-yaffs-diriter.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-//=============================================================================
-//
-//      ecos-yaffs-diriter.c
-//
-//      Directory Iterator support for the eCos-YAFFS adaptation layer
-//
-//=============================================================================
-//
-//=============================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):   wry
-// Date:        2009-05-07
-// Note:        This file is a derivative work of direct/yaffsfs.c and so
-//              should be taken as inheriting its license terms - hence the
-//              copyright banner above.
-//
-//####DESCRIPTIONEND####
-//=============================================================================
-
-#include "ecos-yaffs-diriter.h"
-#include <cyg/infra/cyg_ass.h>
-
-// Directory operations --------------------------------------------------
-
-struct ylist_head eyaffs_all_diriters;
-
-void eyaffs_diriter_advance(eyaffs_diriter *ctx)
-{
-    CYG_ASSERT(ctx && ctx->node && ctx->node->variantType == YAFFS_OBJECT_TYPE_DIRECTORY, "node not a directory");
-    if ( !ctx->nextret ) return; // already finished, nothing to do
-
-    struct ylist_head * top = &ctx->node->variant.directoryVariant.children;
-
-    if (ylist_empty(top)) {
-        ctx->nextret = NULL;
-        return;
-    }
-
-    struct ylist_head *next = ctx->nextret->siblings.next;
-
-    if( next == top ) // finished
-        ctx->nextret = NULL;
-    else
-        ctx->nextret = ylist_entry(next,yaffs_Object,siblings); // works backwards from 'next' to its containing y_Object
-}
-
-void eyaffs_diriter_rewind(eyaffs_diriter *ctx)
-{
-    CYG_ASSERT(ctx && ctx->node && ctx->node->variantType == YAFFS_OBJECT_TYPE_DIRECTORY, "node not a directory");
-    
-    struct ylist_head * top = &ctx->node->variant.directoryVariant.children;
-    if (ylist_empty(top))
-        ctx->nextret = NULL;
-    else
-        ctx->nextret = ylist_entry(top->next, yaffs_Object, siblings);
-}
-
-void eyaffs_diriter_objremove_callback(yaffs_Object *obj)
-{
-    struct ylist_head *i;
-    eyaffs_diriter *cur;
-
-    if(!eyaffs_all_diriters.next) return; // nothing to do
-
-    ylist_for_each(i, &eyaffs_all_diriters) { // foreach ($i) @eyaffs_all_diriters
-        if (i) {
-            // 'i' points to the 'iterlist' member of an eyaffs_diriter, sort out cur to point to it
-            cur = ylist_entry(i, eyaffs_diriter, iterlist);
-
-            if(cur->nextret == obj) // then fix it up
-                eyaffs_diriter_advance(cur);
-        }
-    }
-}
-
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/ecos-yaffs-diriter.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef CYGONCE_ECOS_YAFFS_DIRITER_H
-#define CYGONCE_ECOS_YAFFS_DIRITER_H
-//=============================================================================
-//
-//      ecos-yaffs-diriter.h
-//
-//      Directory Iterator support for the eCos-YAFFS adaptation layer
-//
-//=============================================================================
-// ####ECOSGPLCOPYRIGHTBEGIN####                                            
-// -------------------------------------------                              
-// This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 2009 eCosCentric Limited.
-//
-// 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.,    
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-//
-// This exception does not invalidate any other reasons why a work based    
-// on this file might be covered by the GNU General Public License.         
-// -------------------------------------------                              
-// ####ECOSGPLCOPYRIGHTEND####                                              
-//=============================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):   wry
-// Date:        2009-05-07
-//
-//####DESCRIPTIONEND####
-//=============================================================================
-
-#include "yaffs_guts.h"
-
-// Directory operations --------------------------------------------------
-
-/* Directory iterator used by readdir().
- * We need to keep track of all live diriters so as to avoid jumping off
- * to Fishkill in the event that our next-object-to-return is deleted.
- * Thankfully, yaffs provides a callback mechanism so we can detect
- * this case. */
-typedef struct eyaffs_diriter {
-    struct ylist_head iterlist; // doubly linked list, impl by devextras.h
-    yaffs_Object * node;
-    yaffs_Object * nextret; // next one to return
-} eyaffs_diriter;
-
-extern struct ylist_head eyaffs_all_diriters;
-
-void eyaffs_diriter_advance(eyaffs_diriter *ctx);
-void eyaffs_diriter_rewind(eyaffs_diriter *ctx);
-void eyaffs_diriter_objremove_callback(yaffs_Object *obj);
-
-#endif //CYGONCE_ECOS_YAFFS_DIRITER_H
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/ecos-yaffs-nand.c
+++ /dev/null
@@ -1,282 +0,0 @@
-//=============================================================================
-//
-//      ecos-yaffs-nand.c
-//
-//      Glue for YAFFS to the eCos NAND library
-//
-//=============================================================================
-// ####ECOSGPLCOPYRIGHTBEGIN####                                            
-// -------------------------------------------                              
-// This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 2009 eCosCentric Limited.
-//
-// 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.,    
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-//
-// This exception does not invalidate any other reasons why a work based    
-// on this file might be covered by the GNU General Public License.         
-// -------------------------------------------                              
-// ####ECOSGPLCOPYRIGHTEND####                                              
-//=============================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):   wry
-// Date:        2009-05-07
-//
-//####DESCRIPTIONEND####
-//=============================================================================
-
-#include "ecos-yaffs.h"
-#include "ecos-yaffs-nand.h"
-#include "yaffs_packedtags1.h"
-#include "yaffs_packedtags2.h"
-#include "yaffs_tagscompat.h"
-#include <cyg/nand/util.h> // for BLOCK2PAGEADDR
-
-int eyaffs_initialiseNAND (struct yaffs_DeviceStruct * dev)
-{
-    // Nothing to do - we've already inited it in mount().
-    //cyg_nand_partition *part = (cyg_nand_partition*) dev->genericDevice;
-    return YAFFS_OK;
-}
-
-int eyaffs_deinitialiseNAND (struct yaffs_DeviceStruct * dev)
-{
-    // Nothing to do
-    //cyg_nand_partition *part = (cyg_nand_partition*) dev->genericDevice;
-    return YAFFS_OK;
-}
-
-int eyaffs_eraseBlockInNAND (struct yaffs_DeviceStruct * dev, int blockInNAND)
-{
-    cyg_nand_partition *part = (cyg_nand_partition*) dev->genericDevice;
-    int rv = cyg_nandp_erase_block(part, blockInNAND);
-    return rv==0 ? YAFFS_OK : YAFFS_FAIL;
-}
-
-int eyaffs_writeChunkWithTagsToNAND (struct yaffs_DeviceStruct * dev,
-        int chunkInNAND, const __u8 * data,
-        const yaffs_ExtendedTags * tags)
-{
-    cyg_nand_partition *part = (cyg_nand_partition*) dev->genericDevice;
-    int rv;
-
-    if (!dev->isYaffs2) {
-#ifdef CONFIG_YAFFS_NO_YAFFS1
-        rv = 1;
-#else
-        yaffs_PackedTags1 pt1;
-
-        if (tags->chunkDeleted) {
-            memset(&pt1, 0xff, sizeof(pt1));
-            pt1.deleted = 0;
-            //((CYG_BYTE*)&pt1)[8] = 0; // TODO: support 9BYTE_TAGS, if there is a demand to (requires corresponding fixup in the ECC check below)
-        } else {
-            yaffs_PackTags1(&pt1, tags);
-            yaffs_CalcTagsECC((yaffs_Tags *)&pt1);
-        }
-        rv = cyg_nandp_write_page(part, chunkInNAND, data, &pt1, PACKEDTAGS1_OOBSIZE);
-#endif
-    } else {
-#ifdef CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE
-        return YAFFS_FAIL;
-#else
-        // YAFFS2 mode.
-        // N.B. We are not doing ECC - the NAND layer does that - so don't
-        // need to bother with the whole tags struct, just the bit that matters.
-
-        if (!data || !tags) {
-            T(YAFFS_TRACE_ERROR,
-                (TSTR("**>> yaffs2: both data and tags must be present" TENDSTR)));
-            YBUG();
-            return YAFFS_FAIL;
-        }
-
-        if (dev->inbandTags) {
-            yaffs_PackedTags2TagsPart *pt2tp;
-            pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
-            yaffs_PackTags2TagsPart(pt2tp, tags);
-            rv = cyg_nandp_write_page(part, chunkInNAND, data, 0, 0);
-        } else {
-            yaffs_PackedTags2 pt;
-            void *packed_tags_ptr = dev->noTagsECC ? (void*) &pt.t : (void*) &pt;
-            yaffs_PackTags2(dev, &pt, tags);
-            rv = cyg_nandp_write_page(part, chunkInNAND, data, packed_tags_ptr, PACKEDTAGS2_OOBSIZE(dev));
-        }
-#endif
-    }
-
-    // all done:
-    return rv==0 ? YAFFS_OK : YAFFS_FAIL;
-}
-
-int eyaffs_readChunkWithTagsFromNAND (struct yaffs_DeviceStruct * dev,
-        int chunkInNAND, __u8 * data,
-        yaffs_ExtendedTags * tags)
-{
-    cyg_nand_partition *part = (cyg_nand_partition*) dev->genericDevice;
-    int localData = 0;
-    int rv;
-
-    if (!dev->isYaffs2) {
-#ifdef CONFIG_YAFFS_NO_YAFFS1
-        rv = 1;
-#else
-        yaffs_PackedTags1 pt1;
-        memset(&pt1, 0xff, sizeof(yaffs_PackedTags1));
-
-        rv = cyg_nandp_read_page(part, chunkInNAND, data, &pt1, PACKEDTAGS1_OOBSIZE);
-
-        if (rv == 0) {
-            if (yaffs_CheckFF((CYG_BYTE*)&pt1, 8)) {
-                // block is empty
-                if (tags) {
-                    memset(tags, 0, sizeof(*tags));
-                    tags->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-                }
-            } else {
-                // must check and correct tags' mini-ecc.
-                int deleted = !pt1.deleted; // this would break the tags ECC.
-                pt1.deleted = 1;
-                // TODO: support 9BYTE_TAGS if there is a demand.
-                int rv2 = yaffs_CheckECCOnTags((yaffs_Tags *)&pt1);
-                if (rv2 < 0) {
-                    T(YAFFS_TRACE_ERROR,
-                            (TSTR ("**>>yaffs ecc error unfixed on chunk %d:0"
-                                   TENDSTR), chunkInNAND));
-                    dev->eccUnfixed++;
-                    rv = EIO;
-                } else {
-                    if (tags) {
-                        yaffs_UnpackTags1(tags, &pt1);
-                        tags->chunkDeleted = deleted;
-                        tags->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-                    }
-
-                    if (rv2 > 0) {
-                        T(YAFFS_TRACE_ERROR,
-                                (TSTR ("**>>yaffs ecc tags error fix performed on chunk %d:0"
-                                       TENDSTR), chunkInNAND));
-                        dev->eccFixed++;
-                        if (tags)
-                            tags->eccResult = YAFFS_ECC_RESULT_FIXED;
-                    }
-                }
-            }
-        } // else reading the NAND failed; drop out
-#endif
-
-    } else { // YAFFS2 mode
-#ifdef CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE
-        return YAFFS_FAIL;
-#else
-        if (dev->inbandTags) {
-            if (!data) {
-                localData = 1;
-                data = yaffs_GetTempBuffer(dev, __LINE__);
-            }
-
-            rv = cyg_nandp_read_page(part, chunkInNAND, data, 0, 0);
-            if (tags) {
-                yaffs_PackedTags2TagsPart *pt2tp;
-                pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
-                yaffs_UnpackTags2TagsPart(tags, pt2tp);
-            }
-        } else {
-            yaffs_PackedTags2 pt;
-            void *packed_tags_ptr = dev->noTagsECC ? (void*) &pt.t : (void*) &pt;
-            rv = cyg_nandp_read_page(part, chunkInNAND, data, packed_tags_ptr, tags ? PACKEDTAGS2_OOBSIZE(dev) : 0);
-            if (tags)
-                yaffs_UnpackTags2(dev, tags, &pt);
-        }
-#endif
-    }
-
-    // all done:
-    if (localData)
-        yaffs_ReleaseTempBuffer(dev, data, __LINE__);
-
-    if (rv != 0) {
-        if (tags) {
-            // mark the tags as clearly useless
-            memset(tags, 0, sizeof(yaffs_ExtendedTags));
-            tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-            tags->blockBad = 1;
-        }
-        return YAFFS_FAIL;
-    }
-    return YAFFS_OK;
-    // TODO: go through yaffs_guts and ensure that all calls to ReadChunksWithTagsFromNAND DTRT on FAIL or if the read tags aren't valid.
-}
-
-int eyaffs_markNANDBlockBad (struct yaffs_DeviceStruct * dev, int blockNo)
-{
-    cyg_nand_partition *part = (cyg_nand_partition*) dev->genericDevice;
-    int rv = cyg_nandp_bbt_markbad(part, blockNo);
-    return rv==0 ? YAFFS_OK : YAFFS_FAIL;
-}
-
-int eyaffs_queryNANDBlock (struct yaffs_DeviceStruct * dev, int blockNo,
-        yaffs_BlockState * state, __u32 *sequenceNumber)
-{
-    yaffs_ExtendedTags tags;
-    cyg_nand_page_addr pg;
-    cyg_nand_partition *part = (cyg_nand_partition*) dev->genericDevice;
-
-    int rv = cyg_nandp_bbt_query(part, blockNo);
-    if (rv < 0) return YAFFS_FAIL;
-
-    switch(rv) {
-        case CYG_NAND_BBT_OK:
-            // Now we need to read the tags from the OOB area of the first page
-            pg = CYG_NAND_BLOCK2PAGEADDR(part->dev, blockNo);
-            // TODO: This is quite inefficient on small page devices in
-            // YAFFS2 mode with inbandTags enabled, as the whole page has
-            // to be read. Some day, it would be nice to implement part-page
-            // reads in the NAND layer where this can be efficiently done.
-            int rv2 = eyaffs_readChunkWithTagsFromNAND(dev, pg, 0, &tags);
-            if (rv2 == YAFFS_FAIL) {
-                (void) cyg_nandp_bbt_markbad(part, blockNo);
-                goto deadblock;
-            }
-            if (tags.chunkUsed) {
-                *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-                *sequenceNumber = tags.sequenceNumber;
-                return YAFFS_OK;
-            }
-            *state = YAFFS_BLOCK_STATE_EMPTY;
-            *sequenceNumber = 0;
-            return YAFFS_OK;
-
-        case CYG_NAND_BBT_WORNBAD:
-        case CYG_NAND_BBT_RESERVED:
-        case CYG_NAND_BBT_FACTORY_BAD:
-        deadblock:
-            *state = YAFFS_BLOCK_STATE_DEAD;
-            *sequenceNumber = 0;
-            return YAFFS_OK;
-        default:
-            YBUG(); // can't happen
-            return YAFFS_FAIL;
-    }
-}
-
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/ecos-yaffs-nand.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifndef CYGONCE_ECOS_YAFFS_NAND_H
-#define CYGONCE_ECOS_YAFFS_NAND_H
-//=============================================================================
-//
-//      ecos-yaffs-nand.h
-//
-//      Glue for YAFFS to the eCos NAND library
-//
-//=============================================================================
-// ####ECOSGPLCOPYRIGHTBEGIN####                                            
-// -------------------------------------------                              
-// This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 2009 eCosCentric Limited.
-//
-// 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.,    
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-//
-// This exception does not invalidate any other reasons why a work based    
-// on this file might be covered by the GNU General Public License.         
-// -------------------------------------------                              
-// ####ECOSGPLCOPYRIGHTEND####                                              
-//=============================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):   wry
-// Date:        2009-05-07
-//
-//####DESCRIPTIONEND####
-//=============================================================================
-
-#include <cyg/nand/nand.h>
-#include "yaffs_guts.h" // extendedTags
-#include "devextras.h" // __u8 and __u32
-
-// If writing a yaffs_PackedTags1, we store only its eight meaningful bytes 
-#define PACKEDTAGS1_OOBSIZE 8
-#define PACKEDTAGS2_OOBSIZE(dev) (dev->noTagsECC ?      \
-        (unsigned)sizeof(yaffs_PackedTags2TagsPart) :   \
-        (unsigned)sizeof(yaffs_PackedTags2))
-
-int eyaffs_eraseBlockInNAND (struct yaffs_DeviceStruct * dev, int blockInNAND);
-int eyaffs_initialiseNAND (struct yaffs_DeviceStruct * dev);
-// not mandatory:
-int eyaffs_deinitialiseNAND (struct yaffs_DeviceStruct * dev);
-
-#ifdef CYGSEM_FS_YAFFS_SMALLPAGE_MODE_YAFFS1
-int eyaffs_writeChunkToNAND(struct yaffs_DeviceStruct *dev,
-        int chunkInNAND, const __u8 *data,
-        const yaffs_Spare *spare);
-int eyaffs_readChunkFromNAND(struct yaffs_DeviceStruct *dev,
-        int chunkInNAND, __u8 *data,
-        yaffs_Spare *spare);
-#endif
-
-int eyaffs_writeChunkWithTagsToNAND (struct yaffs_DeviceStruct * dev,
-        int chunkInNAND, const __u8 * data,
-        const yaffs_ExtendedTags * tags);
-int eyaffs_readChunkWithTagsFromNAND (struct yaffs_DeviceStruct * dev,
-        int chunkInNAND, __u8 * data,
-        yaffs_ExtendedTags * tags);
-int eyaffs_markNANDBlockBad (struct yaffs_DeviceStruct * dev, int blockNo);
-int eyaffs_queryNANDBlock (struct yaffs_DeviceStruct * dev, int blockNo,
-        yaffs_BlockState * state, __u32 *sequenceNumber);
-
-#endif //CYGONCE_ECOS_YAFFS_NAND_H
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/ecos-yaffs.c
+++ /dev/null
@@ -1,1057 +0,0 @@
-//=============================================================================
-//
-//      ecos-eyaffs.c
-//
-//      eyaffs interface to the eCos filesystem layer
-//
-//=============================================================================
-// ####ECOSGPLCOPYRIGHTBEGIN####                                            
-// -------------------------------------------                              
-// This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 2009 eCosCentric Limited.
-//
-// 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.,    
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-//
-// This exception does not invalidate any other reasons why a work based    
-// on this file might be covered by the GNU General Public License.         
-// -------------------------------------------                              
-// ####ECOSGPLCOPYRIGHTEND####                                              
-//=============================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):   wry
-// Date:        2009-05-05
-//
-//####DESCRIPTIONEND####
-//=============================================================================
-
-/* Major TODO:
- *   At the moment we tend to look files up by name(dirsearch), perform
- *   our own sanity checks, then pass on to YAFFS fns which then go and
- *   repeat the last step of the lookup. IWBNI we exposed corresponding
- *   YAFFS functions which took yaffs_Object* instead of name.          */
-
-#include "yportenv.h"
-#include "yaffs_guts.h"
-#include "yaffs_packedtags2.h"
-#include "ecos-yaffs.h"
-#include "ecos-yaffs-nand.h"
-#include "ecos-yaffs-diriter.h"
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <cyg/fileio/fileio.h>
-#include <cyg/fileio/dirent.h>
-#include <cyg/infra/cyg_ass.h>
-#include <cyg/nand/nand.h>
-#include <cyg/nand/util.h>
-
-// convenience error test macros. x should be an ecos error code.
-#define ER(x) do { int _x = (x); if (_x != 0) return _x; } while(0)
-#define EG(x) do { _err = (x); if (_err != 0) goto err_exit; } while(0)
-// ... variants which take a negative ecos error code
-#define ERm(x) ER(-(x))
-#define EGm(x) EG(-(x))
-// ... variants for YAFFS ops, which return YAFFS_OK or YAFFS_FAIL
-#define YER(x) do { int _x = (x); if (_x == YAFFS_FAIL) return EIO; } while(0)
-
-// sneaky grab from fileio misc.cxx:
-__externC cyg_mtab_entry cyg_mtab[];
-__externC cyg_mtab_entry cyg_mtab_end;
-
-// For yaffs_guts:
-unsigned int yaffs_traceMask = CYGNUM_FS_YAFFS_TRACEMASK;
-
-// How many attempts do we make to write a page before giving up?
-// This could easily be added to CDL.
-unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
-
-// eCos doesn't support file permissions or user IDs at all.
-// We hard-code sensible values in case anybody makes decisions on
-// the output from stat() et al.
-// (Update: As of March 2009 there is now limited support for chmod in both
-// anoncvs and eCosPro.)
-#define FIXED_UID 0
-#define FIXED_GID 0
-#define DIRECTORY_FIXED_PERMS (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
-#define FILE_FIXED_PERMS (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)
-// TODO: We could make uid/gid/fixedperms configurable.
-
-// Helper functions and forward defs -------------------------------------
-static int eyaffs_count_links(yaffs_Object * node)
-{
-    int links = 0;
-    struct ylist_head *tmp;
-    ylist_for_each(tmp, &(node->hardLinks)) {
-        ++links;
-    }
-    return links;
-}
-
-static int eyaffs_stat_object(yaffs_Object *node, struct stat *buf);
-
-// Directory search / traversal ------------------------------------------
-typedef struct ey_dirsearch
-{
-    yaffs_Object        *dir;   // directory to search
-    const char          *path;  // path to follow
-    yaffs_Object        *node;  // Node found
-    const char          *name;  // last name used
-    int                 namelen;// name fragment length
-    cyg_bool            last;   // last name in path?
-} ey_dirsearch;
-
-static void init_dirsearch(ey_dirsearch *ds, yaffs_Object *dir, const char *name)
-{
-    ds->dir = dir;
-    ds->path = name;
-    ds->node = dir;
-    ds->name = name;
-    ds->namelen = 0;
-    ds->last = false;
-}
-
-// Search a single directory for the next name in a path
-static int find_entry(ey_dirsearch *ds)
-{
-    yaffs_Object *dir = ds->dir;
-    const char *name = ds->path;
-    const char *n = name;
-    char namelen = 0;
-
-    yaffs_Object *d;
-
-    // check that we really have a directory
-    switch (yaffs_GetObjectType(dir)) {
-        case DT_DIR: break;
-
-        case DT_LNK: // TODO: symlink support
-        default: return ENOTDIR;
-    }
-
-    // Isolate the next element of the path name. 
-    while( *n != '\0' && *n != '/' )
-        n++, namelen++;
-
-    // Check if this is the last path element.
-    while( *n == '/') n++;
-    if( *n == '\0' )
-        ds->last = true;
-
-    // update name in dirsearch object
-    ds->name = name;
-    ds->namelen = namelen;
-
-    // First, special case "." and "..":
-    if (name[0] == '.') {
-        if (namelen == 1) { // "."
-            ds->node = dir;
-            return ENOERR;
-        } else if (name[1] == '.' && namelen == 2) { // ".."
-            ds->node = dir->parent;
-            if (!ds->node) ds->node = dir; // ".." at the root stays in the root
-            return ENOERR;
-        }
-    }
-
-    // Otherwise, search the directory for a matching entry
-    YCHAR namebuf[YAFFS_MAX_NAME_LENGTH+1];
-    memcpy(namebuf, name, namelen);
-    namebuf[(int)namelen]=0;
-
-    d = yaffs_FindObjectByName(dir, namebuf);
-    // TODO: Create a variant of y_FindObjectByName which takes dir, name and len. Indeed, that would be beneficial for a lot of its functions.
-    if( d == NULL ) return ENOENT;
-    d = yaffs_GetEquivalentObject(d); // traverse hardlinks
-
-    // pass back the node we have found
-    ds->node = d;
-
-    return ENOERR;
-}
-
-/* Main directory search code. Use init_dirsearch() to init the struct.
- * If we return with d->last set, d->name _might_ be null-terminated.
- * (It will iff no trailing slashes were passed in.)
- * Code that acts on the output name MUST use d->namelen and not assume
- * null-termination without testing first.
- */
-static int eyaffs_find(ey_dirsearch *d)
-{
-    if ( *(d->path) == 0 )
-        return ENOERR;
-    for (;;) {
-        ER(find_entry(d));
-        if (d->last) return ENOERR;
-        // Not done yet? Next one down...
-        d->dir = d->node;
-        d->path += d->namelen;
-        // While we could check file perms here, eCos doesn't support them.
-        while ( *(d->path) == '/' ) ++d->path; // skip separators
-    }
-}
-
-// File operations --------------------------------------------------------
-
-static int eyaffs_pathconf(yaffs_Object *node, struct cyg_pathconf_info *info)
-{
-    switch(info->name) {
-        case _PC_LINK_MAX:
-            info->value = LINK_MAX;
-            return ENOERR;
-
-        case _PC_NAME_MAX:
-            info->value = YAFFS_MAX_NAME_LENGTH;
-            return ENOERR;
-
-        case _PC_PATH_MAX:
-            info->value = PATH_MAX;
-            return ENOERR;
-
-        case _PC_PRIO_IO:
-        case _PC_SYNC_IO:
-            info->value=0;
-            return ENOERR;
-
-        case _PC_NO_TRUNC:
-            info->value=1;
-            return ENOERR;
-
-        case _PC_MAX_CANON: // terminals only
-        case _PC_MAX_INPUT: // terminals
-        case _PC_PIPE_BUF:  // pipes
-        case _PC_ASYNC_IO:  // not supported
-        case _PC_CHOWN_RESTRICTED: // we don't track owners
-        case _PC_VDISABLE: // terminals
-        default:
-            info->value = -1;
-            return EINVAL;
-    }
-}
-
-static int eyaffs_fo_read    (struct CYG_FILE_TAG *fp, struct CYG_UIO_TAG *uio)
-{
-    yaffs_Object *node = (yaffs_Object*) fp->f_data;
-    int i;
-    off_t pos = fp->f_offset;
-    ssize_t resid = uio->uio_resid;
-
-    for (i=0; i < uio->uio_iovcnt; i++) {
-        cyg_iovec  *iov  = &uio->uio_iov[i];
-        unsigned char *buf  = iov->iov_base;
-        off_t       len  = iov->iov_len;
-
-        if (pos + len > node->variant.fileVariant.fileSize)
-            len = node->variant.fileVariant.fileSize - pos;
-
-        while (len > 0 && pos < node->variant.fileVariant.fileSize) {
-            off_t l = yaffs_ReadDataFromFile(node, buf, pos, len);
-            len -= l;
-            pos += l;
-            buf += l;
-            resid -= l;
-        }
-    }
-    uio->uio_resid = resid;
-    fp->f_offset = pos;
-    return ENOERR;
-}
-
-static int eyaffs_fo_write   (struct CYG_FILE_TAG *fp, struct CYG_UIO_TAG *uio)
-{
-    yaffs_Object *node = (yaffs_Object*) fp->f_data;
-    int i;
-    off_t pos = fp->f_offset;
-    ssize_t resid = uio->uio_resid;
-
-    if (fp->f_flag & CYG_FAPPEND)
-        pos = fp->f_offset = node->variant.fileVariant.fileSize;
-
-    CYG_ASSERT(pos >= 0, "pos became negative");
-
-    for (i=0; i < uio->uio_iovcnt; i++) {
-        cyg_iovec  *iov  = &uio->uio_iov[i];
-        unsigned char *buf  = iov->iov_base;
-        off_t       len  = iov->iov_len;
-
-        while (len > 0) {
-            off_t l = yaffs_WriteDataToFile(node, buf, pos, len, 0);
-            len -= l;
-            buf += l;
-            pos += l;
-            resid -= l;
-
-            if (l==0) goto stop; // urgh, how does this cope with dire errors?
-        }
-    }
-
-    // Timestamps are updated on yaffs_FlushFile()
-stop:
-    uio->uio_resid = resid;
-    fp->f_offset = pos;
-    return ENOERR;
-}
-
-
-static int eyaffs_fo_lseek   (struct CYG_FILE_TAG *fp, off_t *apos, int whence )
-{
-    yaffs_Object *node = (yaffs_Object*) fp->f_data;
-    off_t pos = *apos;
-
-    switch (whence)
-    {
-        case SEEK_SET:
-            // Pos is already where we want to be
-            break;
-         case SEEK_CUR:
-            // Add pos to current offset
-            pos += fp->f_offset;
-            break;
-         case SEEK_END:
-            // Add pos to file size
-            pos += node->variant.fileVariant.fileSize;
-            break;
-         default:
-            return EINVAL;
-    }
-
-    // Check that pos is still within current file size, 
-    // or at the very end
-    if (pos < 0 || pos > node->variant.fileVariant.fileSize)
-        return EINVAL;
-  
-    *apos = fp->f_offset = pos;
-    return ENOERR;
-}
-
-static int eyaffs_fo_ioctl   (struct CYG_FILE_TAG *fp, CYG_ADDRWORD com,
-                              CYG_ADDRWORD data)
-{
-    return EINVAL; // No ioctls defined
-}
-
-static int eyaffs_fo_fsync   (struct CYG_FILE_TAG *fp, int mode )
-{
-    yaffs_Object *node = (yaffs_Object*) fp->f_data;
-    int ymode = (mode == CYG_FDATASYNC) ? 1 : 0;
-    YER(yaffs_FlushFile(node,1,ymode));
-    return ENOERR;
-}
-
-static int eyaffs_fo_close   (struct CYG_FILE_TAG *fp)
-{
-    yaffs_Object *node = (yaffs_Object*) fp->f_data;
-
-    if (node->inUse) {
-        YER(yaffs_FlushFile(node,1,0));
-        node->inUse--;
-        if (node->inUse <= 0 && node->unlinked) {
-            YER(yaffs_DeleteObject(node));
-        }
-    }
-    fp->f_data = 0;
-    return ENOERR;
-}
-
-static int eyaffs_fo_fstat   (struct CYG_FILE_TAG *fp, struct stat *buf )
-{
-    yaffs_Object *node = (yaffs_Object*) fp->f_data;
-    
-    return eyaffs_stat_object(node, buf);
-}
-
-static int eyaffs_fo_getinfo (struct CYG_FILE_TAG *fp, int key, void *buf, int len )
-{
-    yaffs_Object *node = (yaffs_Object*) fp->f_data;
-
-    switch(key) {
-        case FS_INFO_CONF:
-            return eyaffs_pathconf(node, (struct cyg_pathconf_info *)buf );
-    }
-    return EINVAL;
-}
-static int eyaffs_fo_setinfo (struct CYG_FILE_TAG *fp, int key, void *buf, int len )
-{
-    return EINVAL; // None defined
-}
-
-static cyg_fileops eyaffs_fileops = 
-{
-    eyaffs_fo_read, eyaffs_fo_write, 
-    eyaffs_fo_lseek, eyaffs_fo_ioctl, 
-    cyg_fileio_seltrue,
-    eyaffs_fo_fsync, eyaffs_fo_close, 
-    eyaffs_fo_fstat, 
-    eyaffs_fo_getinfo, eyaffs_fo_setinfo
-};
-
-// Directory entrypoints --------------
-
-static int eyaffs_fo_dirread (struct CYG_FILE_TAG *fp, struct CYG_UIO_TAG *uio)
-{
-    eyaffs_diriter *diriter = (eyaffs_diriter*) fp->f_data;
-    struct dirent *ent = (struct dirent *)uio->uio_iov[0].iov_base;
-    unsigned offset = fp->f_offset;
-    off_t len = uio->uio_iov[0].iov_len;
-
-    if( len < sizeof(struct dirent) )
-        return EINVAL;    
-
-    if (offset == 0) {
-        strcpy(ent->d_name, ".");
-#ifdef CYGPKG_FS_YAFFS_RET_DIRENT_DTYPE
-        ent->d_type = __stat_mode_DIR;
-#endif
-        goto done;
-    }
-    if (offset == 1) {
-        strcpy(ent->d_name, "..");
-#ifdef CYGPKG_FS_YAFFS_RET_DIRENT_DTYPE
-        ent->d_type = __stat_mode_DIR;
-#endif
-        goto done;
-    }
-
-    // else use the iter:
-    yaffs_Object * node = diriter->nextret;
-
-    if (!node) goto done_eof;
-
-    yaffs_GetObjectName(node, ent->d_name, sizeof(ent->d_name));
-#ifdef CYGPKG_FS_YAFFS_RET_DIRENT_DTYPE
-    ent->d_type = yaffs_GetObjectType(node);
-#endif
-    eyaffs_diriter_advance(diriter);
-
-done:
-    uio->uio_resid         -= sizeof(struct dirent);
-    fp->f_offset++;
-done_eof:
-    return ENOERR;
-}
-
-static int eyaffs_fo_dirlseek (struct CYG_FILE_TAG *fp, off_t *pos, int whence )
-{
-    // This is easy, we only allow a full rewind.
-    if (whence != SEEK_SET || *pos != 0)
-        return EINVAL;
-    // get and rewind the diriter
-    eyaffs_diriter *diriter = (eyaffs_diriter*) fp->f_data;
-    eyaffs_diriter_rewind(diriter);
-    fp->f_offset = 0;
-    return ENOERR;
-}
-
-static int eyaffs_fo_dirclose (struct CYG_FILE_TAG *fp)
-{
-    eyaffs_diriter *diriter = (eyaffs_diriter*) fp->f_data;
-
-    diriter->node->inUse--;
-    ylist_del(&diriter->iterlist);
-    memset(diriter, 0xbb, sizeof(eyaffs_diriter));
-    fp->f_data = 0;
-    YFREE(diriter);
-    return ENOERR;
-}
-
-
-static cyg_fileops eyaffs_dirops = 
-{
-    eyaffs_fo_dirread, 
-    (cyg_fileop_write *)cyg_fileio_enosys,
-    eyaffs_fo_dirlseek,
-    (cyg_fileop_ioctl *)cyg_fileio_enosys,
-    cyg_fileio_seltrue,
-    (cyg_fileop_fsync *)cyg_fileio_enosys,
-    eyaffs_fo_dirclose,
-    (cyg_fileop_fstat *)cyg_fileio_enosys,
-    (cyg_fileop_getinfo *)cyg_fileio_enosys,
-    (cyg_fileop_setinfo *)cyg_fileio_enosys
-};
-
-// Filesystem operations -------------------------------------------------
-// N.B. Function names are prefixed with 'e' to distinguish them from
-//      those internal to yaffs.
-
-
-static int eyaffs_mount    ( cyg_fstab_entry *fste, cyg_mtab_entry *mte )
-{
-    int _err = ENOERR;
-
-    cyg_nand_device *nand = 0;
-    cyg_nand_partition *part = 0;
-    ERm(cyg_nand_resolve_device(mte->devname, &nand, &part));
-
-    if (!part || !part->dev || (part->last <= part->first) ) {
-        TOUT(("eyaffs_mount: Invalid partition\n"));
-        ER(EINVAL);
-    }
-
-    // Is this partition already mounted?
-    cyg_mtab_entry *m = cyg_mtab;
-    while (m != &cyg_mtab_end) {
-        if (m->valid
-                && (0==strcmp(m->fsname,"yaffs"))
-                && (((yaffs_Device *)m->data)->genericDevice == part) ) {
-            ER(EBUSY);
-            /* TODO: Set up a refcount to allow a yaffs/nand fs
-             * to be mounted multiple times. In that case,
-             * re-use the existing yaffs device struct. */
-        }
-        m++;
-    }
-
-    // Option handling. Defaults come from CDL.
-    int o_nReserved = CYGNUM_FS_YAFFS_RESERVED_BLOCKS;
-    int o_nShortOpCaches = CYGNUM_FS_YAFFS_SHORTOP_CACHES;
-    int o_skipCheckpointRead = 0;
-
-#if defined(CYGSEM_FS_YAFFS_COMPATIBILITY_ECOSPRO) && (CYGSEM_FS_YAFFS_COMPATIBILITY_ECOSPRO == 1)
-    if (mte->options) {
-        int t;
-        char buf[10];
-        // reserved=<int>: Number of blocks to reserve (minimum 2)
-        if (0==cyg_fs_get_option(mte->options, "reserved", buf, sizeof buf)) {
-            t = atoi(buf);
-            if (t>=2 && t <= (part->last - part->first))
-                o_nReserved = t;
-            else
-                TOUT(("eyaffs_mount: ignoring invalid value `reserved=%d'", t));
-        }
-        // caches=<int>: Number of cache entries to use (10-20 recommended)
-        if (0==cyg_fs_get_option(mte->options, "caches", buf, sizeof buf)) {
-            t = atoi(buf);
-            if (t>=0)
-                o_nShortOpCaches = t;
-            else
-                TOUT(("eyaffs_mount: ignoring invalid value `caches=%d'", t));
-        }
-        // skip-checkpoint-read: Ignore the checkpoint restore and instead
-        // do a full filesystem scan.
-        if (0==cyg_fs_get_option(mte->options, "skip-checkpoint-read", buf, sizeof buf)) {
-            o_skipCheckpointRead = 1;
-        }
-        // TODO: readonly option, runtime and/or CDL?
-    }
-#endif
-
-#ifdef CYGPKG_INFRA_DEBUG
-    // Best-efforts sanity check that there's enough heap.
-    // The rule of thumb is 2 bytes per page.
-    struct mallinfo mi = mallinfo();
-    unsigned want = ( 1 << (nand->block_page_bits + 1) ) * (1 + part->last - part->first);
-    if ( mi.fordblks < want) {
-        TOUT(("eyaffs_mount: warning: arena reports %u bytes free; %u recommended for this device\n", mi.fordblks, want));
-    }
-#endif // CYGSEM_FS_YAFFS_COMPATIBILITY
-
-    yaffs_Device *y = YMALLOC(sizeof(yaffs_Device)); // ^^^^^^^^^^^^^^^^
-    if (!y) EG(ENOMEM);
-    memset(y, 0, sizeof(yaffs_Device));
-    y->name = mte->devname;
-    y->genericDevice = (void*) part;
-
-    y->nDataBytesPerChunk =
-        y->totalBytesPerChunk = CYG_NAND_BYTES_PER_PAGE(nand);
-    y->inbandTags = 0;
-
-    y->nChunksPerBlock = CYG_NAND_PAGES_PER_BLOCK(nand);
-    y->nReservedBlocks = o_nReserved;
-    y->startBlock = 0;
-    y->endBlock = CYG_NAND_PARTITION_NBLOCKS(part)-1;
-    y->useNANDECC = 1;
-    y->nShortOpCaches = o_nShortOpCaches;
-
-    if (CYG_NAND_BYTES_PER_PAGE(nand) == 512) {
-#ifdef CYGSEM_FS_YAFFS_SMALLPAGE_MODE_YAFFS1
-        y->isYaffs2 = 0;
-        if (CYG_NAND_APPSPARE_PER_PAGE(nand) < PACKEDTAGS1_OOBSIZE) {
-            NAND_ERROR(nand,
-                    "Device has %d spare per page but YAFFS1 needs %d\n",
-                    CYG_NAND_APPSPARE_PER_PAGE(nand), PACKEDTAGS1_OOBSIZE);
-            EG(EINVAL);
-        }
-#else // CYGSEM_FS_YAFFS_SMALLPAGE_MODE_YAFFS2
-        y->isYaffs2 = 1;
-        // 512-byte page devices normally have 8-byte spare areas.
-        // This isn't big enough for YAFFS2 tags, which need 25.
-        y->inbandTags = 1;
-#endif
-    } else {
-        y->isYaffs2 = 1;
-        if (CYG_NAND_APPSPARE_PER_PAGE(nand) < PACKEDTAGS2_OOBSIZE(y)) {
-            NAND_ERROR(nand,
-                    "Device has %d spare per page but YAFFS2 needs %u\n",
-                    CYG_NAND_APPSPARE_PER_PAGE(nand), PACKEDTAGS2_OOBSIZE(y));
-            EG(EINVAL);
-        }
-    }
-
-#ifdef CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE
-    if (y->isYaffs2) {
-        NAND_ERROR(nand, "Device is set to run with yaffs2 code, which is compiled out.\n");
-        EG(ENODEV);
-    }
-#endif
-
-    y->eraseBlockInNAND = eyaffs_eraseBlockInNAND;
-    y->initialiseNAND = eyaffs_initialiseNAND;
-    y->deinitialiseNAND = eyaffs_deinitialiseNAND;
-
-    y->writeChunkWithTagsToNAND = eyaffs_writeChunkWithTagsToNAND;
-    y->readChunkWithTagsFromNAND = eyaffs_readChunkWithTagsFromNAND;
-    y->markNANDBlockBad = eyaffs_markNANDBlockBad;
-    y->queryNANDBlock = eyaffs_queryNANDBlock;
-
-    y->isMounted = 0;
-    y->removeObjectCallback = eyaffs_diriter_objremove_callback;
-
-    if (o_skipCheckpointRead) {
-        NAND_CHATTER(1, nand, "mounting with skip-checkpoint-read\n");
-        y->skipCheckpointRead = 1;
-    }
-
-    int yerr = yaffs_GutsInitialise(y);
-    if (yerr == YAFFS_FAIL) {
-        NAND_CHATTER(1, nand, "yaffs_GutsInitialise failed!\n");
-        EG(EIO);
-    }
-
-    yaffs_Object * root = yaffs_Root(y);
-    mte->root = (cyg_dir) root;
-    mte->data = (CYG_ADDRWORD) y;
-    CYG_ASSERT(_err == ENOERR, "Unhandled error in initialisation");
-    // At this point we could use the device struct's devList to link it
-    // into a global devList. (We don't currently need to, so won't.)
-    return ENOERR;
-err_exit:
-    if (y) YFREE(y);
-    return _err;
-}
-
-#if defined(CYGSEM_FS_YAFFS_COMPATIBILITY_ECOSPRO) && (CYGSEM_FS_YAFFS_COMPATIBILITY_ECOSPRO == 1)
-static int eyaffs_umount   ( cyg_mtab_entry *mte, cyg_bool force )
-#else
-static int eyaffs_umount   ( cyg_mtab_entry *mte )
-#endif
-{
-    yaffs_Device *y = (yaffs_Device*) mte->data;
-    
-    yaffs_FlushEntireDeviceCache(y);
-    yaffs_CheckpointSave(y);
-    yaffs_Deinitialise(y);
-
-    YFREE(y);
-    return ENOERR;
-}
-
-static int eyaffs_open   ( cyg_mtab_entry *mte, cyg_dir dir, const char *name,
-                             int mode,  cyg_file *file )
-{
-    int _err;
-    ey_dirsearch ds;
-    yaffs_Object *node = 0;
-
-    // 'mode' is the open options (flags), not the permissions.
-    // (eCos doesn't support file perms.)
-
-    // fileio gives us either the root, or the current wd, to start at
-    init_dirsearch(&ds, (yaffs_Object*) dir, name);
-    _err = eyaffs_find(&ds);
-
-    if (_err == ENOENT) {
-        // It's not there. Are we creat()ing?
-        if (ds.last && (mode & O_CREAT) ) {
-            // A trailing slash implies directory, which makes no sense here
-            if (ds.name[ds.namelen] == '/') return EISDIR;
-            CYG_ASSERT(ds.name[ds.namelen]==0, "Length fencepost failed");
-            node = yaffs_MknodFile(ds.dir, ds.name, FILE_FIXED_PERMS, FIXED_UID, FIXED_GID);
-            if (!node || (node==YAFFS_FAIL)) return ENOMEM;
-            _err = ENOERR;
-        }
-        // else we return ENOENT
-    } else if (_err == ENOERR) {
-        // The node exists. If the O_CREAT and O_EXCL bits are set, we
-        // must fail the open.
-        if( (mode & (O_CREAT|O_EXCL)) == (O_CREAT|O_EXCL) )
-            _err = EEXIST;
-        else node = ds.node;
-    }
-
-    if( _err != ENOERR ) return _err;
-
-    if (yaffs_GetObjectType(node) == DT_LNK) {
-        // TODO: symlink support
-        return ENOSYS;
-    }
-
-    if(yaffs_GetObjectType(node) == DT_DIR) return EISDIR;
-
-    // Could check perms here (and on the dir tree too)
-
-    if( mode & O_TRUNC )
-        YER(yaffs_ResizeFile(node, 0));
-
-    node->inUse++;
-
-    file->f_flag |= mode & CYG_FILE_MODE_MASK;
-    file->f_type = CYG_FILE_TYPE_FILE;
-    file->f_ops = &eyaffs_fileops;
-    file->f_offset = (mode & O_APPEND) ?  yaffs_GetObjectFileLength(node) : 0;
-    file->f_data = (CYG_ADDRWORD) node;
-    file->f_xops = 0;
-
-    return ENOERR;
-}
-
-static int eyaffs_unlink ( cyg_mtab_entry *mte, cyg_dir dir, const char *name )
-{
-    int _err;
-    ey_dirsearch ds;
-
-    init_dirsearch(&ds, (yaffs_Object*) dir, name);
-    _err = eyaffs_find(&ds);
-    if (_err != ENOERR) return _err;
-
-    if(yaffs_GetObjectType(ds.node) == DT_DIR) return EISDIR;
-    if (ds.name[ds.namelen] == '/') return EISDIR; // cannot unlink dirs
-    YER(yaffs_Unlink(ds.dir,ds.name)); // this appears to DTRT wrt 0-linked still-open files
-    return ENOERR;
-}
-
-static int eyaffs_mkdir  ( cyg_mtab_entry *mte, cyg_dir dir, const char *name )
-{
-    ey_dirsearch ds;
-
-    init_dirsearch(&ds, (yaffs_Object*) dir, name);
-    int _err = eyaffs_find(&ds);
-    if (_err == ENOENT) {
-        if (ds.last) {
-            char dirname[ds.namelen+1];
-            memcpy(dirname, ds.name, ds.namelen);
-            dirname[ds.namelen] = 0;
-            // OK, create it!
-            yaffs_Object * node = yaffs_MknodDirectory(ds.dir, dirname, DIRECTORY_FIXED_PERMS, FIXED_UID, FIXED_GID);
-            _err = (node == NULL) ? EIO : ENOERR;
-        } else {
-            // Intermediate directory doesn't exist - ENOENT
-        }
-    } else {
-        // something there already
-        if (_err == ENOERR) _err = EEXIST;
-    }
-    return _err;
-}
-
-static int eyaffs_rmdir  ( cyg_mtab_entry *mte, cyg_dir dir, const char *name )
-{
-    ey_dirsearch ds;
-
-    init_dirsearch(&ds, (yaffs_Object*) dir, name);
-    int _err = eyaffs_find(&ds);
-    if (_err != ENOERR) return _err;
-
-    if(yaffs_GetObjectType(ds.node) != DT_DIR) return ENOTDIR;
-    if (0==strcmp(ds.name,".")) return EINVAL;
-    if (0==ds.namelen) return EINVAL;
-
-    char dirname[ds.namelen+1];
-    memcpy(dirname, ds.name, ds.namelen);
-    dirname[ds.namelen] = 0;
-
-    if (YAFFS_FAIL == yaffs_Unlink(ds.dir,dirname)) return ENOTEMPTY;
-    return ENOERR;
-}
-
-static int eyaffs_rename ( cyg_mtab_entry *mte, cyg_dir dir1, const char *name1,
-                           cyg_dir dir2, const char *name2 )
-{
-    ey_dirsearch ds1, ds2;
-
-    init_dirsearch(&ds1, (yaffs_Object*) dir1, name1);
-    int _err = eyaffs_find(&ds1);
-    if (_err != ENOERR) return _err;
-
-    init_dirsearch(&ds2, (yaffs_Object*) dir2, name2);
-    _err = eyaffs_find(&ds2);
-
-    if (ds2.last && _err == ENOENT)
-        ds2.node = NULL, _err = ENOERR; // through-rename
-
-    if (_err != ENOERR) return _err;
-
-    if (ds1.node == ds2.node) return ENOERR; // identity op
-
-    if (ds2.node) {
-        int type1 = yaffs_GetObjectType(ds1.node),
-            type2 = yaffs_GetObjectType(ds2.node);
-        if ( (type1 != DT_DIR) && (type2 == DT_DIR) ) 
-            return EISDIR;
-        if ( (type1 == DT_DIR) && (type2 != DT_DIR) ) 
-            return ENOTDIR;
-        // YAFFS will delete the target
-    }
-    // Alas, if this is a directory rename, there may be trailing / involved, 
-    // so we have to strip them.
-    char xname1[ds1.namelen+1];
-    memcpy(xname1, ds1.name, ds1.namelen);
-    xname1[ds1.namelen] = 0;
-    char xname2[ds2.namelen+1];
-    memcpy(xname2, ds2.name, ds2.namelen);
-    xname2[ds2.namelen] = 0;
-
-    YER(yaffs_RenameObject(ds1.dir, xname1, ds2.dir, xname2));
-    return ENOERR;
-}
-
-static int eyaffs_link   ( cyg_mtab_entry *mte, cyg_dir dir1, const char *name1,
-                           cyg_dir dir2, const char *name2, int type )
-{
-    ey_dirsearch ds1, ds2;
-
-    // Only do hard links for now
-    if (type != CYG_FSLINK_HARD) return EINVAL;
-
-    init_dirsearch(&ds1, (yaffs_Object*) dir1, name1);
-    int _err = eyaffs_find(&ds1);
-    if (_err != ENOERR) return _err;
-
-    init_dirsearch(&ds2, (yaffs_Object*) dir2, name2);
-    _err = eyaffs_find(&ds2);
-    if (_err == ENOERR) return EEXIST; // Can't rename-over
-
-    if (ds2.last && _err == ENOENT)
-        ds2.node = 0, _err = ENOERR; // link-through
-
-    ER(_err);
-
-    // Forbid hard links to directories
-    if (ds1.node->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
-        return EPERM;
-
-    if (ds2.name[ds2.namelen] == '/') return EISDIR; // eh? makes no sense.
-    yaffs_Object * newnode = yaffs_Link(ds2.dir, ds2.name, ds1.node);
-    if (newnode) return ENOERR;
-    else return EIO;
-}
-
-static int eyaffs_opendir( cyg_mtab_entry *mte, cyg_dir dir, const char *name,
-                           cyg_file *file )
-{
-    int _err;
-    ey_dirsearch ds;
-
-    init_dirsearch(&ds, (yaffs_Object*) dir, name);
-    _err = eyaffs_find(&ds);
-    if (_err != ENOERR) return _err;
-
-    if(yaffs_GetObjectType(ds.node) != DT_DIR) return ENOTDIR;
-
-    eyaffs_diriter *diriter = YMALLOC(sizeof(eyaffs_diriter));
-    if (!diriter) return ENOMEM;
-
-    ds.node->inUse++;
-
-    YINIT_LIST_HEAD(&diriter->iterlist);
-    diriter->node = ds.node;
-
-    if (!eyaffs_all_diriters.next) YINIT_LIST_HEAD(&eyaffs_all_diriters);
-    ylist_add(&diriter->iterlist, &eyaffs_all_diriters);
-    eyaffs_diriter_rewind(diriter);
-
-    file->f_type = CYG_FILE_TYPE_FILE;
-    file->f_ops = &eyaffs_dirops;
-    file->f_offset = 0;
-    file->f_data = (CYG_ADDRWORD) diriter;
-    file->f_xops = 0;
-    return ENOERR;
-}
-
-static int eyaffs_chdir  ( cyg_mtab_entry *mte, cyg_dir xdir, const char *name,
-                           cyg_dir *dir_out )
-{
-    yaffs_Object *dir = (yaffs_Object*) xdir;
-    if (dir_out) {
-        ey_dirsearch ds;
-        init_dirsearch(&ds, dir, name);
-        int _err = eyaffs_find(&ds);
-        if (_err != ENOERR) return _err;
-        if (yaffs_GetObjectType(ds.node) != DT_DIR)
-            return ENOTDIR;
-        *dir_out = (cyg_dir)ds.node;
-    } else {
-        // the "dec-refcount" case: nothing to do
-    }
-    return ENOERR;
-}
-
-static int eyaffs_stat   ( cyg_mtab_entry *mte, cyg_dir dir, const char *name,
-                           struct stat *buf)
-{
-    int _err;
-    ey_dirsearch ds;
-
-    init_dirsearch(&ds, (yaffs_Object*) dir, name);
-    _err = eyaffs_find(&ds);
-    if (_err != ENOERR) return _err;
-
-    return eyaffs_stat_object(ds.node, buf);
-}
-
-static int eyaffs_stat_object(yaffs_Object *node, struct stat *buf)
-{
-    switch (yaffs_GetObjectType(node)) {
-        case DT_REG:
-            buf->st_mode = __stat_mode_REG;
-            buf->st_size = node->variant.fileVariant.fileSize;
-            break;
-        case DT_DIR:
-            buf->st_mode = __stat_mode_DIR;
-            buf->st_size = 0;
-            break;
-        default:
-            return ENOSYS; // Don't support anything else yet
-    }
-
-    buf->st_mode |= node->yst_mode &~ S_IFMT;
-
-    buf->st_ino         = node->objectId;
-    buf->st_dev         = 0;
-    buf->st_nlink       = eyaffs_count_links(node);
-    buf->st_uid         = node->yst_uid;
-    buf->st_gid         = node->yst_gid;
-
-    buf->st_atime       = node->yst_atime;
-    buf->st_mtime       = node->yst_mtime;
-    buf->st_ctime       = node->yst_ctime;
-
-    return ENOERR;
-}
-
-static int eyaffs_getinfo( cyg_mtab_entry *mte, cyg_dir dir, const char *name,
-                           int key, void *buf, int len )
-{
-    int _err;
-    ey_dirsearch ds;
-    yaffs_Device *y = (yaffs_Device*) mte->data;
-
-    switch(key) {
-        case FS_INFO_CONF:
-            break;
-
-#ifdef CYGSEM_FILEIO_INFO_DISK_USAGE
-        case FS_INFO_DISK_USAGE:
-            {
-                struct cyg_fs_disk_usage *usage = (struct cyg_fs_disk_usage *) buf;
-                CYG_CHECK_DATA_PTR(buf, "getinfo buf");
-                if (len < sizeof(struct cyg_fs_disk_usage)) return EINVAL;
-                usage->total_blocks = y->endBlock - y->startBlock + 1;
-                usage->free_blocks = y->nErasedBlocks;
-                usage->block_size = y->nDataBytesPerChunk * y->nChunksPerBlock;
-                return ENOERR;
-            }
-#else
-            (void)y;
-#endif
-
-        case FS_INFO_GETCWD:
-            // yaffs doesn't provide anything special, we'd only end up duplicating the fallback ".." method.
-        case FS_INFO_ATTRIB: // not supported
-#ifdef FS_INFO_CALLBACK
-        case FS_INFO_CALLBACK: // not supported
-#endif
-        default:
-            return ENOSYS;
-    }
-
-    init_dirsearch(&ds, (yaffs_Object*) dir, name);
-    _err = eyaffs_find(&ds);
-    if (_err != ENOERR) return _err;
-
-    switch(key) {
-        case FS_INFO_CONF:
-            if (len < sizeof (struct cyg_pathconf_info)) return EINVAL;
-            return eyaffs_pathconf(ds.node, (struct cyg_pathconf_info *) buf);
-
-#ifdef FS_INFO_MBCS_TRANSLATE
-        case FS_INFO_MBCS_TRANSLATE:
-#endif
-        default:
-            return ENOSYS;
-    }
-}
-
-static int eyaffs_do_sync_fs(yaffs_Device * y)
-{
-    yaffs_FlushEntireDeviceCache(y);
-    // TODO: If there were a convenient way to enumerate all the open
-    // files in a filesystem, we could fsync them all here.
-    // This might involve code similar to cyg_fd_filesys_close().
-    yaffs_CheckpointSave(y);
-    return ENOERR;
-}
-
-static int eyaffs_setinfo( cyg_mtab_entry *mte, cyg_dir dir, const char *name,
-                           int key, void *buf, int len )
-{
-    switch (key) {
-        case FS_INFO_SYNC:
-            return eyaffs_do_sync_fs( (yaffs_Device*) mte->data );
-        case FS_INFO_ATTRIB: // not supported
-#ifdef FS_INFO_CALLBACK
-        case FS_INFO_CALLBACK: // not supported
-#endif
-#ifdef FS_INFO_SECURE_ERASE
-        case FS_INFO_SECURE_ERASE:
-#endif
-#ifdef FS_INFO_MBCS_TRANSLATE
-        case FS_INFO_MBCS_TRANSLATE:
-#endif
-            return ENOSYS;
-    }
-    return EINVAL;
-}
-
-FSTAB_ENTRY(eyaffs_fste, "yaffs", 0, CYG_SYNCMODE_FILE_FILESYSTEM|CYG_SYNCMODE_IO_FILESYSTEM, 
-        /* N.B. If you get a build failure here (initialization
-           from incompatible pointer type), it might be because you're
-           using this GPL-licensed package on eCosPro and need to set
-           CYGSEM_FS_YAFFS_COMPATIBILITY_ECOSPRO.
-         */
-        eyaffs_mount,
-        eyaffs_umount,
-        eyaffs_open,
-        eyaffs_unlink,
-        eyaffs_mkdir,
-        eyaffs_rmdir,
-        eyaffs_rename,
-        eyaffs_link,
-        eyaffs_opendir,
-        eyaffs_chdir,
-        eyaffs_stat,
-        eyaffs_getinfo,
-        eyaffs_setinfo);
-
-// -----------------------------------------------------------------------
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/ecos-yaffs.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef CYGONCE_FS_ECOS_YAFFS_H
-#define CYGONCE_FS_ECOS_YAFFS_H
-//=============================================================================
-//
-//      ecos-yaffs.h
-//
-//      Options for the eCos interface to the YAFFS filesystem
-//
-//=============================================================================
-// ####ECOSGPLCOPYRIGHTBEGIN####                                            
-// -------------------------------------------                              
-// This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 2009 eCosCentric Limited.
-//
-// 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.,    
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-//
-// This exception does not invalidate any other reasons why a work based    
-// on this file might be covered by the GNU General Public License.         
-// -------------------------------------------                              
-// ####ECOSGPLCOPYRIGHTEND####                                              
-//=============================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):   wry
-// Date:        2009-05-05
-//
-//####DESCRIPTIONEND####
-//=============================================================================
-
-#include <pkgconf/system.h>
-#include <pkgconf/fs_yaffs.h>
-
-/* Options from yaffs moduleconfig.h */
-#define CONFIG_YAFFS_FS
-
-#ifdef CYGSEM_FS_YAFFS_SMALLPAGE_MODE_YAFFS1
-# define CONFIG_YAFFS_YAFFS1
-# define CONFIG_YAFFS_YAFFS2
-#else // CYGSEM_FS_YAFFS_SMALLPAGE_MODE_YAFFS2
-# define CONFIG_YAFFS_NO_YAFFS1
-# define CONFIG_YAFFS_YAFFS2
-#endif
-
-/* eCos does not currently supply DT_REG &c. and ATTR_MODE &c., so we'll
- * use YAFFS's: */
-#define CONFIG_YAFFS_PROVIDE_DEFS
-
-/* Our NAND layer does ECC, so we won't use YAFFS's - but we do need
- * to use its internal ECC on the tags */
-//#define YAFFS_IGNORE_TAGS_ECC
-//#define CONFIG_YAFFS_DOES_ECC
-//#define CONFIG_YAFFS_ECC_WRONG_ORDER
-
-/* Do not test whether chunks are erased before writing to them */
-#define CONFIG_YAFFS_DISABLE_CHUNK_ERASED_CHECK
-
-/* Cache short names, taking more RAM, but faster look-ups */
-#ifdef CYGSEM_FS_YAFFS_CACHE_SHORT_NAMES
-#define CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-#endif
-
-/* The count of blocks to reserve for checkpointing */
-#define CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS 10
-
-/* Use older-style on-NAND data format with pageStatus byte?
- * This probably requires work in the NAND layer in order to support. */
-//#define CONFIG_YAFFS_9BYTE_TAGS
-
-#endif /* CYGONCE_FS_ECOS_YAFFS_H */
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/ecos-yport.h
+++ /dev/null
@@ -1,135 +0,0 @@
-#ifndef CYGONCE_FS_ECOS_YPORT_H
-#define CYGONCE_FS_ECOS_YPORT_H
-//=============================================================================
-//
-//      ecos-yport.h
-//
-//      eCos porting layer for YAFFS
-//
-//=============================================================================
-// ####ECOSGPLCOPYRIGHTBEGIN####                                            
-// -------------------------------------------                              
-// This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 2009 eCosCentric Limited.
-//
-// 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.,    
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-//
-// This exception does not invalidate any other reasons why a work based    
-// on this file might be covered by the GNU General Public License.         
-// -------------------------------------------                              
-// ####ECOSGPLCOPYRIGHTEND####                                              
-//=============================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):   wry
-// Date:        2009-05-05
-//
-//####DESCRIPTIONEND####
-//=============================================================================
-
-#include "ecos-yaffs.h"
-
-#include "devextras.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <cyg/infra/cyg_ass.h>
-#include <cyg/infra/diag.h>
-#include <cyg/infra/cyg_type.h>
-
-#define YCHAR char
-#define YUCHAR unsigned char
-#define _Y(x) x
-#define yaffs_strcat(a,b)    strcat(a,b)
-#define yaffs_strcpy(a,b)    strcpy(a,b)
-#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
-#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
-#define yaffs_strlen(s)      strlen(s)
-#define yaffs_sprintf        sprintf
-#define yaffs_toupper(a)     toupper(a)
-
-#define YAFFS_PATH_DIVIDERS  "/"
-
-#define Y_INLINE inline
-
-#define YMALLOC(x) malloc(x)
-#define YFREE(x)   free(x)
-#define YMALLOC_ALT(x) malloc(x)
-#define YFREE_ALT(x)   free(x)
-
-#define YMALLOC_DMA(x) YMALLOC(x)
-
-#ifdef CYGFUN_KERNEL_API_C
-#include <cyg/kernel/kapi.h>
-#define YYIELD()  do { cyg_thread_yield(); } while(0)
-#else
-#define YYIELD()  do {} while(0)
-#endif
-
-
-//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s))
-//#define YALERT(s) YINFO(s)
-#define YBUG() do { cyg_assert_fail(__PRETTY_FUNCTION__, __FILE__, __LINE__, "==>> yaffs bug detected"); } while(0)
-
-#define TENDSTR "\n"
-#define TSTR(x) x
-#define TCONT(x) x
-#ifdef CYGSEM_FS_YAFFS_TRACEFN
-externC int CYGSEM_FS_YAFFS_TRACEFN (const char *fmt, ...) CYGBLD_ATTRIB_PRINTF_FORMAT(1,2);
-#define TOUT(p) CYGSEM_FS_YAFFS_TRACEFN p
-#else
-static inline int _yaffs_trace_ignore (const char *fmt, ...) CYGBLD_ATTRIB_PRINTF_FORMAT(1,2);
-static inline int _yaffs_trace_ignore (const char *fmt, ...) { return 0; }
-#define TOUT(p) _yaffs_trace_ignore p
-#endif
-
-
-#define YAFFS_LOSTNFOUND_NAME       "lost+found"
-#define YAFFS_LOSTNFOUND_PREFIX     "obj"
-//#define YPRINTF(x) printf x
-
-#ifdef CYGPKG_LIBC_TIME
-#define Y_CURRENT_TIME time(NULL)
-#else
-#define Y_CURRENT_TIME ((time_t)-1)
-#endif
-#define Y_TIME_CONVERT(x) (x)
-
-// eCos defines mode bits differently to POSIX.
-#define YAFFS_ROOT_MODE             ( S_IRUSR | S_IWUSR | S_IXUSR |  \
-                                      S_IRGRP |           S_IXGRP |  \
-                                      S_IROTH |           S_IXOTH   )
-#define YAFFS_LOSTNFOUND_MODE       YAFFS_ROOT_MODE
-
-#define yaffs_SumCompare(x,y) ((x) == (y))
-#define yaffs_strcmp(a,b) strcmp(a,b)
-
-typedef off_t loff_t; /* This will break and should probably be removed 
-                         if/when we add 64-bit file support generally. */
-
-#define yaffs_qsort qsort /* provided by eCos stdlib */
-
-#endif /* CYGONCE_FS_ECOS_YPORT_H */
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_checkptrw.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-const char *yaffs_checkptrw_c_version =
-	"$Id$";
-
-
-#include "yaffs_checkptrw.h"
-#include "yaffs_getblockinfo.h"
-
-static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
-{
-	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
-
-	T(YAFFS_TRACE_CHECKPOINT,
-		(TSTR("checkpt blocks available = %d" TENDSTR),
-		blocksAvailable));
-
-	return (blocksAvailable <= 0) ? 0 : 1;
-}
-
-
-static int yaffs_CheckpointErase(yaffs_Device *dev)
-{
-	int i;
-
-	if (!dev->eraseBlockInNAND)
-		return 0;
-	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d"TENDSTR),
-		dev->internalStartBlock, dev->internalEndBlock));
-
-	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
-			T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
-
-			dev->nBlockErasures++;
-
-			if (dev->eraseBlockInNAND(dev, i - dev->blockOffset /* realign */)) {
-				bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
-				dev->nErasedBlocks++;
-				dev->nFreeChunks += dev->nChunksPerBlock;
-			} else {
-				dev->markNANDBlockBad(dev, i);
-				bi->blockState = YAFFS_BLOCK_STATE_DEAD;
-			}
-		}
-	}
-
-	dev->blocksInCheckpoint = 0;
-
-	return 1;
-}
-
-
-static void yaffs_CheckpointFindNextErasedBlock(yaffs_Device *dev)
-{
-	int  i;
-	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
-	T(YAFFS_TRACE_CHECKPOINT,
-		(TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
-		dev->nErasedBlocks, dev->nReservedBlocks, blocksAvailable, dev->checkpointNextBlock));
-
-	if (dev->checkpointNextBlock >= 0 &&
-			dev->checkpointNextBlock <= dev->internalEndBlock &&
-			blocksAvailable > 0) {
-
-		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
-			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
-				dev->checkpointNextBlock = i + 1;
-				dev->checkpointCurrentBlock = i;
-				T(YAFFS_TRACE_CHECKPOINT, (TSTR("allocating checkpt block %d"TENDSTR), i));
-				return;
-			}
-		}
-	}
-	T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks"TENDSTR)));
-
-	dev->checkpointNextBlock = -1;
-	dev->checkpointCurrentBlock = -1;
-}
-
-static void yaffs_CheckpointFindNextCheckpointBlock(yaffs_Device *dev)
-{
-	int  i;
-	yaffs_ExtendedTags tags;
-
-	T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
-		dev->blocksInCheckpoint, dev->checkpointNextBlock));
-
-	if (dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
-		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
-			int chunk = i * dev->nChunksPerBlock;
-			int realignedChunk = chunk - dev->chunkOffset;
-
-			dev->readChunkWithTagsFromNAND(dev, realignedChunk,
-					NULL, &tags);
-			T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
-				i, tags.objectId, tags.sequenceNumber, tags.eccResult));
-
-			if (tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
-				/* Right kind of block */
-				dev->checkpointNextBlock = tags.objectId;
-				dev->checkpointCurrentBlock = i;
-				dev->checkpointBlockList[dev->blocksInCheckpoint] = i;
-				dev->blocksInCheckpoint++;
-				T(YAFFS_TRACE_CHECKPOINT, (TSTR("found checkpt block %d"TENDSTR), i));
-				return;
-			}
-		}
-
-	T(YAFFS_TRACE_CHECKPOINT, (TSTR("found no more checkpt blocks"TENDSTR)));
-
-	dev->checkpointNextBlock = -1;
-	dev->checkpointCurrentBlock = -1;
-}
-
-
-int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting)
-{
-
-
-	dev->checkpointOpenForWrite = forWriting;
-
-	/* Got the functions we need? */
-	if (!dev->writeChunkWithTagsToNAND ||
-			!dev->readChunkWithTagsFromNAND ||
-			!dev->eraseBlockInNAND ||
-			!dev->markNANDBlockBad)
-		return 0;
-
-	if (forWriting && !yaffs_CheckpointSpaceOk(dev))
-		return 0;
-
-	if (!dev->checkpointBuffer)
-		dev->checkpointBuffer = YMALLOC_DMA(dev->totalBytesPerChunk);
-	if (!dev->checkpointBuffer)
-		return 0;
-
-
-	dev->checkpointPageSequence = 0;
-	dev->checkpointByteCount = 0;
-	dev->checkpointSum = 0;
-	dev->checkpointXor = 0;
-	dev->checkpointCurrentBlock = -1;
-	dev->checkpointCurrentChunk = -1;
-	dev->checkpointNextBlock = dev->internalStartBlock;
-
-	/* Erase all the blocks in the checkpoint area */
-	if (forWriting) {
-		memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
-		dev->checkpointByteOffset = 0;
-		return yaffs_CheckpointErase(dev);
-	} else {
-		int i;
-		/* Set to a value that will kick off a read */
-		dev->checkpointByteOffset = dev->nDataBytesPerChunk;
-		/* A checkpoint block list of 1 checkpoint block per 16 block is (hopefully)
-		 * going to be way more than we need */
-		dev->blocksInCheckpoint = 0;
-		dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
-        dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
-		if(!dev->checkpointBlockList)
-			return 0;
-
-		for (i = 0; i < dev->checkpointMaxBlocks; i++)
-			dev->checkpointBlockList[i] = -1;
-	}
-
-	return 1;
-}
-
-int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum)
-{
-	__u32 compositeSum;
-	compositeSum =  (dev->checkpointSum << 8) | (dev->checkpointXor & 0xFF);
-	*sum = compositeSum;
-	return 1;
-}
-
-static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
-{
-	int chunk;
-	int realignedChunk;
-
-	yaffs_ExtendedTags tags;
-
-	if (dev->checkpointCurrentBlock < 0) {
-		yaffs_CheckpointFindNextErasedBlock(dev);
-		dev->checkpointCurrentChunk = 0;
-	}
-
-	if (dev->checkpointCurrentBlock < 0)
-		return 0;
-
-	tags.chunkDeleted = 0;
-	tags.objectId = dev->checkpointNextBlock; /* Hint to next place to look */
-	tags.chunkId = dev->checkpointPageSequence + 1;
-	tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
-	tags.byteCount = dev->nDataBytesPerChunk;
-	if (dev->checkpointCurrentChunk == 0) {
-		/* First chunk we write for the block? Set block state to
-		   checkpoint */
-		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointCurrentBlock);
-		bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
-		dev->blocksInCheckpoint++;
-	}
-
-	chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
-
-
-	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
-		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk, tags.objectId, tags.chunkId));
-
-	realignedChunk = chunk - dev->chunkOffset;
-
-	dev->nPageWrites++;
-
-	dev->writeChunkWithTagsToNAND(dev, realignedChunk,
-			dev->checkpointBuffer, &tags);
-	dev->checkpointByteOffset = 0;
-	dev->checkpointPageSequence++;
-	dev->checkpointCurrentChunk++;
-	if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock) {
-		dev->checkpointCurrentChunk = 0;
-		dev->checkpointCurrentBlock = -1;
-	}
-	memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
-
-	return 1;
-}
-
-
-int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes)
-{
-	int i = 0;
-	int ok = 1;
-
-
-	__u8 * dataBytes = (__u8 *)data;
-
-
-
-	if (!dev->checkpointBuffer)
-		return 0;
-
-	if (!dev->checkpointOpenForWrite)
-		return -1;
-
-	while (i < nBytes && ok) {
-		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes;
-		dev->checkpointSum += *dataBytes;
-		dev->checkpointXor ^= *dataBytes;
-
-		dev->checkpointByteOffset++;
-		i++;
-		dataBytes++;
-		dev->checkpointByteCount++;
-
-
-		if (dev->checkpointByteOffset < 0 ||
-		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk)
-			ok = yaffs_CheckpointFlushBuffer(dev);
-	}
-
-	return i;
-}
-
-int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
-{
-	int i = 0;
-	int ok = 1;
-	yaffs_ExtendedTags tags;
-
-
-	int chunk;
-	int realignedChunk;
-
-	__u8 *dataBytes = (__u8 *)data;
-
-	if (!dev->checkpointBuffer)
-		return 0;
-
-	if (dev->checkpointOpenForWrite)
-		return -1;
-
-	while (i < nBytes && ok) {
-
-
-		if (dev->checkpointByteOffset < 0 ||
-			dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
-
-			if (dev->checkpointCurrentBlock < 0) {
-				yaffs_CheckpointFindNextCheckpointBlock(dev);
-				dev->checkpointCurrentChunk = 0;
-			}
-
-			if (dev->checkpointCurrentBlock < 0)
-				ok = 0;
-			else {
-				chunk = dev->checkpointCurrentBlock *
-					dev->nChunksPerBlock +
-					dev->checkpointCurrentChunk;
-
-				realignedChunk = chunk - dev->chunkOffset;
-				
-				dev->nPageReads++;
-
-				/* read in the next chunk */
-				/* printf("read checkpoint page %d\n",dev->checkpointPage); */
-				dev->readChunkWithTagsFromNAND(dev,
-						realignedChunk,
-						dev->checkpointBuffer,
-						&tags);
-
-				if (tags.chunkId != (dev->checkpointPageSequence + 1) ||
-					tags.eccResult > YAFFS_ECC_RESULT_FIXED ||
-					tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
-					ok = 0;
-
-				dev->checkpointByteOffset = 0;
-				dev->checkpointPageSequence++;
-				dev->checkpointCurrentChunk++;
-
-				if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
-					dev->checkpointCurrentBlock = -1;
-			}
-		}
-
-		if (ok) {
-			*dataBytes = dev->checkpointBuffer[dev->checkpointByteOffset];
-			dev->checkpointSum += *dataBytes;
-			dev->checkpointXor ^= *dataBytes;
-			dev->checkpointByteOffset++;
-			i++;
-			dataBytes++;
-			dev->checkpointByteCount++;
-		}
-	}
-
-	return 	i;
-}
-
-int yaffs_CheckpointClose(yaffs_Device *dev)
-{
-
-	if (dev->checkpointOpenForWrite) {
-		if (dev->checkpointByteOffset != 0)
-			yaffs_CheckpointFlushBuffer(dev);
-	} else if(dev->checkpointBlockList){
-		int i;
-		for (i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++) {
-			int blk = dev->checkpointBlockList[i];
-			yaffs_BlockInfo *bi = NULL;
-			if( dev->internalStartBlock <= blk && blk <= dev->internalEndBlock)
-				bi = yaffs_GetBlockInfo(dev, blk);
-			if (bi && bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
-				bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
-			else {
-				/* Todo this looks odd... */
-			}
-		}
-		YFREE(dev->checkpointBlockList);
-		dev->checkpointBlockList = NULL;
-	}
-
-	dev->nFreeChunks -= dev->blocksInCheckpoint * dev->nChunksPerBlock;
-	dev->nErasedBlocks -= dev->blocksInCheckpoint;
-
-
-	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint byte count %d" TENDSTR),
-			dev->checkpointByteCount));
-
-	if (dev->checkpointBuffer) {
-		/* free the buffer */
-		YFREE(dev->checkpointBuffer);
-		dev->checkpointBuffer = NULL;
-		return 1;
-	} else
-		return 0;
-}
-
-int yaffs_CheckpointInvalidateStream(yaffs_Device *dev)
-{
-	/* Erase the checkpoint data */
-
-	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate of %d blocks"TENDSTR),
-		dev->blocksInCheckpoint));
-
-	return yaffs_CheckpointErase(dev);
-}
-
-
-
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_checkptrw.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFS_CHECKPTRW_H__
-#define __YAFFS_CHECKPTRW_H__
-
-#include "yaffs_guts.h"
-
-int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting);
-
-int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes);
-
-int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes);
-
-int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum);
-
-int yaffs_CheckpointClose(yaffs_Device *dev);
-
-int yaffs_CheckpointInvalidateStream(yaffs_Device *dev);
-
-
-#endif
-
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_ecc.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-/*
- * This code implements the ECC algorithm used in SmartMedia.
- *
- * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
- * The two unused bit are set to 1.
- * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
- * blocks are used on a 512-byte NAND page.
- *
- */
-
-/* Table generated by gen-ecc.c
- * Using a table means we do not have to calculate p1..p4 and p1'..p4'
- * for each byte of data. These are instead provided in a table in bits7..2.
- * Bit 0 of each entry indicates whether the entry has an odd or even parity, and therefore
- * this bytes influence on the line parity.
- */
-
-const char *yaffs_ecc_c_version =
-	"$Id$";
-
-#include "yportenv.h"
-
-#include "yaffs_ecc.h"
-
-static const unsigned char column_parity_table[] = {
-	0x00, 0x55, 0x59, 0x0c, 0x65, 0x30, 0x3c, 0x69,
-	0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00,
-	0x95, 0xc0, 0xcc, 0x99, 0xf0, 0xa5, 0xa9, 0xfc,
-	0xfc, 0xa9, 0xa5, 0xf0, 0x99, 0xcc, 0xc0, 0x95,
-	0x99, 0xcc, 0xc0, 0x95, 0xfc, 0xa9, 0xa5, 0xf0,
-	0xf0, 0xa5, 0xa9, 0xfc, 0x95, 0xc0, 0xcc, 0x99,
-	0x0c, 0x59, 0x55, 0x00, 0x69, 0x3c, 0x30, 0x65,
-	0x65, 0x30, 0x3c, 0x69, 0x00, 0x55, 0x59, 0x0c,
-	0xa5, 0xf0, 0xfc, 0xa9, 0xc0, 0x95, 0x99, 0xcc,
-	0xcc, 0x99, 0x95, 0xc0, 0xa9, 0xfc, 0xf0, 0xa5,
-	0x30, 0x65, 0x69, 0x3c, 0x55, 0x00, 0x0c, 0x59,
-	0x59, 0x0c, 0x00, 0x55, 0x3c, 0x69, 0x65, 0x30,
-	0x3c, 0x69, 0x65, 0x30, 0x59, 0x0c, 0x00, 0x55,
-	0x55, 0x00, 0x0c, 0x59, 0x30, 0x65, 0x69, 0x3c,
-	0xa9, 0xfc, 0xf0, 0xa5, 0xcc, 0x99, 0x95, 0xc0,
-	0xc0, 0x95, 0x99, 0xcc, 0xa5, 0xf0, 0xfc, 0xa9,
-	0xa9, 0xfc, 0xf0, 0xa5, 0xcc, 0x99, 0x95, 0xc0,
-	0xc0, 0x95, 0x99, 0xcc, 0xa5, 0xf0, 0xfc, 0xa9,
-	0x3c, 0x69, 0x65, 0x30, 0x59, 0x0c, 0x00, 0x55,
-	0x55, 0x00, 0x0c, 0x59, 0x30, 0x65, 0x69, 0x3c,
-	0x30, 0x65, 0x69, 0x3c, 0x55, 0x00, 0x0c, 0x59,
-	0x59, 0x0c, 0x00, 0x55, 0x3c, 0x69, 0x65, 0x30,
-	0xa5, 0xf0, 0xfc, 0xa9, 0xc0, 0x95, 0x99, 0xcc,
-	0xcc, 0x99, 0x95, 0xc0, 0xa9, 0xfc, 0xf0, 0xa5,
-	0x0c, 0x59, 0x55, 0x00, 0x69, 0x3c, 0x30, 0x65,
-	0x65, 0x30, 0x3c, 0x69, 0x00, 0x55, 0x59, 0x0c,
-	0x99, 0xcc, 0xc0, 0x95, 0xfc, 0xa9, 0xa5, 0xf0,
-	0xf0, 0xa5, 0xa9, 0xfc, 0x95, 0xc0, 0xcc, 0x99,
-	0x95, 0xc0, 0xcc, 0x99, 0xf0, 0xa5, 0xa9, 0xfc,
-	0xfc, 0xa9, 0xa5, 0xf0, 0x99, 0xcc, 0xc0, 0x95,
-	0x00, 0x55, 0x59, 0x0c, 0x65, 0x30, 0x3c, 0x69,
-	0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00,
-};
-
-/* Count the bits in an unsigned char or a U32 */
-
-static int yaffs_CountBits(unsigned char x)
-{
-	int r = 0;
-	while (x) {
-		if (x & 1)
-			r++;
-		x >>= 1;
-	}
-	return r;
-}
-
-static int yaffs_CountBits32(unsigned x)
-{
-	int r = 0;
-	while (x) {
-		if (x & 1)
-			r++;
-		x >>= 1;
-	}
-	return r;
-}
-
-/* Calculate the ECC for a 256-byte block of data */
-void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc)
-{
-	unsigned int i;
-
-	unsigned char col_parity = 0;
-	unsigned char line_parity = 0;
-	unsigned char line_parity_prime = 0;
-	unsigned char t;
-	unsigned char b;
-
-	for (i = 0; i < 256; i++) {
-		b = column_parity_table[*data++];
-		col_parity ^= b;
-
-		if (b & 0x01) {		/* odd number of bits in the byte */
-			line_parity ^= i;
-			line_parity_prime ^= ~i;
-		}
-	}
-
-	ecc[2] = (~col_parity) | 0x03;
-
-	t = 0;
-	if (line_parity & 0x80)
-		t |= 0x80;
-	if (line_parity_prime & 0x80)
-		t |= 0x40;
-	if (line_parity & 0x40)
-		t |= 0x20;
-	if (line_parity_prime & 0x40)
-		t |= 0x10;
-	if (line_parity & 0x20)
-		t |= 0x08;
-	if (line_parity_prime & 0x20)
-		t |= 0x04;
-	if (line_parity & 0x10)
-		t |= 0x02;
-	if (line_parity_prime & 0x10)
-		t |= 0x01;
-	ecc[1] = ~t;
-
-	t = 0;
-	if (line_parity & 0x08)
-		t |= 0x80;
-	if (line_parity_prime & 0x08)
-		t |= 0x40;
-	if (line_parity & 0x04)
-		t |= 0x20;
-	if (line_parity_prime & 0x04)
-		t |= 0x10;
-	if (line_parity & 0x02)
-		t |= 0x08;
-	if (line_parity_prime & 0x02)
-		t |= 0x04;
-	if (line_parity & 0x01)
-		t |= 0x02;
-	if (line_parity_prime & 0x01)
-		t |= 0x01;
-	ecc[0] = ~t;
-
-#ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
-	/* Swap the bytes into the wrong order */
-	t = ecc[0];
-	ecc[0] = ecc[1];
-	ecc[1] = t;
-#endif
-}
-
-
-/* Correct the ECC on a 256 byte block of data */
-
-int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
-		     const unsigned char *test_ecc)
-{
-	unsigned char d0, d1, d2;	/* deltas */
-
-	d0 = read_ecc[0] ^ test_ecc[0];
-	d1 = read_ecc[1] ^ test_ecc[1];
-	d2 = read_ecc[2] ^ test_ecc[2];
-
-	if ((d0 | d1 | d2) == 0)
-		return 0; /* no error */
-
-	if (((d0 ^ (d0 >> 1)) & 0x55) == 0x55 &&
-	    ((d1 ^ (d1 >> 1)) & 0x55) == 0x55 &&
-	    ((d2 ^ (d2 >> 1)) & 0x54) == 0x54) {
-		/* Single bit (recoverable) error in data */
-
-		unsigned byte;
-		unsigned bit;
-
-#ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
-		/* swap the bytes to correct for the wrong order */
-		unsigned char t;
-
-		t = d0;
-		d0 = d1;
-		d1 = t;
-#endif
-
-		bit = byte = 0;
-
-		if (d1 & 0x80)
-			byte |= 0x80;
-		if (d1 & 0x20)
-			byte |= 0x40;
-		if (d1 & 0x08)
-			byte |= 0x20;
-		if (d1 & 0x02)
-			byte |= 0x10;
-		if (d0 & 0x80)
-			byte |= 0x08;
-		if (d0 & 0x20)
-			byte |= 0x04;
-		if (d0 & 0x08)
-			byte |= 0x02;
-		if (d0 & 0x02)
-			byte |= 0x01;
-
-		if (d2 & 0x80)
-			bit |= 0x04;
-		if (d2 & 0x20)
-			bit |= 0x02;
-		if (d2 & 0x08)
-			bit |= 0x01;
-
-		data[byte] ^= (1 << bit);
-
-		return 1; /* Corrected the error */
-	}
-
-	if ((yaffs_CountBits(d0) +
-	     yaffs_CountBits(d1) +
-	     yaffs_CountBits(d2)) ==  1) {
-		/* Reccoverable error in ecc */
-
-		read_ecc[0] = test_ecc[0];
-		read_ecc[1] = test_ecc[1];
-		read_ecc[2] = test_ecc[2];
-
-		return 1; /* Corrected the error */
-	}
-
-	/* Unrecoverable error */
-
-	return -1;
-
-}
-
-
-/*
- * ECCxxxOther does ECC calcs on arbitrary n bytes of data
- */
-void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
-				yaffs_ECCOther *eccOther)
-{
-	unsigned int i;
-
-	unsigned char col_parity = 0;
-	unsigned line_parity = 0;
-	unsigned line_parity_prime = 0;
-	unsigned char b;
-
-	for (i = 0; i < nBytes; i++) {
-		b = column_parity_table[*data++];
-		col_parity ^= b;
-
-		if (b & 0x01)	 {
-			/* odd number of bits in the byte */
-			line_parity ^= i;
-			line_parity_prime ^= ~i;
-		}
-
-	}
-
-	eccOther->colParity = (col_parity >> 2) & 0x3f;
-	eccOther->lineParity = line_parity;
-	eccOther->lineParityPrime = line_parity_prime;
-}
-
-int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
-			yaffs_ECCOther *read_ecc,
-			const yaffs_ECCOther *test_ecc)
-{
-	unsigned char cDelta;	/* column parity delta */
-	unsigned lDelta;	/* line parity delta */
-	unsigned lDeltaPrime;	/* line parity delta */
-	unsigned bit;
-
-	cDelta = read_ecc->colParity ^ test_ecc->colParity;
-	lDelta = read_ecc->lineParity ^ test_ecc->lineParity;
-	lDeltaPrime = read_ecc->lineParityPrime ^ test_ecc->lineParityPrime;
-
-	if ((cDelta | lDelta | lDeltaPrime) == 0)
-		return 0; /* no error */
-
-	if (lDelta == ~lDeltaPrime &&
-	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
-		/* Single bit (recoverable) error in data */
-
-		bit = 0;
-
-		if (cDelta & 0x20)
-			bit |= 0x04;
-		if (cDelta & 0x08)
-			bit |= 0x02;
-		if (cDelta & 0x02)
-			bit |= 0x01;
-
-		if (lDelta >= nBytes)
-			return -1;
-
-		data[lDelta] ^= (1 << bit);
-
-		return 1; /* corrected */
-	}
-
-	if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
-			yaffs_CountBits(cDelta)) == 1) {
-		/* Reccoverable error in ecc */
-
-		*read_ecc = *test_ecc;
-		return 1; /* corrected */
-	}
-
-	/* Unrecoverable error */
-
-	return -1;
-}
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_ecc.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-/*
- * This code implements the ECC algorithm used in SmartMedia.
- *
- * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
- * The two unused bit are set to 1.
- * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
- * blocks are used on a 512-byte NAND page.
- *
- */
-
-#ifndef __YAFFS_ECC_H__
-#define __YAFFS_ECC_H__
-
-typedef struct {
-	unsigned char colParity;
-	unsigned lineParity;
-	unsigned lineParityPrime;
-} yaffs_ECCOther;
-
-void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc);
-int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
-		const unsigned char *test_ecc);
-
-void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
-			yaffs_ECCOther *ecc);
-int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
-			yaffs_ECCOther *read_ecc,
-			const yaffs_ECCOther *test_ecc);
-#endif
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_getblockinfo.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFS_GETBLOCKINFO_H__
-#define __YAFFS_GETBLOCKINFO_H__
-
-#include "yaffs_guts.h"
-
-/* Function to manipulate block info */
-static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
-{
-	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-		T(YAFFS_TRACE_ERROR,
-		  (TSTR
-		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
-		   blk));
-		YBUG();
-	}
-	return &dev->blockInfo[blk - dev->internalStartBlock];
-}
-
-#endif
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_guts.c
+++ /dev/null
@@ -1,7799 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-const char *yaffs_guts_c_version =
-    "$Id$";
-
-#include "yportenv.h"
-
-#include "yaffsinterface.h"
-#include "yaffs_guts.h"
-#include "yaffs_tagsvalidity.h"
-#include "yaffs_getblockinfo.h"
-
-#include "yaffs_tagscompat.h"
-#ifndef CONFIG_YAFFS_USE_OWN_SORT
-#include "yaffs_qsort.h"
-#endif
-#include "yaffs_nand.h"
-
-#include "yaffs_checkptrw.h"
-
-#include "yaffs_nand.h"
-#include "yaffs_packedtags2.h"
-
-
-#define YAFFS_PASSIVE_GC_CHUNKS 2
-
-#include "yaffs_ecc.h"
-
-
-/* Robustification (if it ever comes about...) */
-/* eCos note: I have discussed the existence of robustification hooks
- * with Charles Manning. He put them in as stubs, but then concluded
- * that there was no value in filling them in.
- * - wry, 2009-06-19 */
-static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND);
-static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-		int erasedOk);
-static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-				const __u8 *data,
-				const yaffs_ExtendedTags *tags);
-static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-				const yaffs_ExtendedTags *tags);
-
-/* Other local prototypes */
-static void yaffs_UpdateParent(yaffs_Object *obj);
-static int yaffs_UnlinkObject(yaffs_Object *obj);
-static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
-
-static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList);
-
-static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev,
-					const __u8 *buffer,
-					yaffs_ExtendedTags *tags,
-					int useReserve);
-static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-				int chunkInNAND, int inScan);
-
-static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
-					yaffs_ObjectType type);
-static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-				yaffs_Object *obj);
-static int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name,
-				int force, int isShrink, int shadows);
-static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
-static int yaffs_CheckStructures(void);
-static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
-			int chunkOffset, int *limit);
-static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
-
-static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev, int blockNo);
-
-
-static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-				int chunkInNAND);
-
-static int yaffs_UnlinkWorker(yaffs_Object *obj);
-
-static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
-			int chunkInObject);
-
-static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-				yaffs_BlockInfo **blockUsedPtr);
-
-static void yaffs_VerifyFreeChunks(yaffs_Device *dev);
-
-static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
-
-static void yaffs_VerifyDirectory(yaffs_Object *directory);
-#ifdef YAFFS_PARANOID
-static int yaffs_CheckFileSanity(yaffs_Object *in);
-#else
-#define yaffs_CheckFileSanity(in)
-#endif
-
-static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
-static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
-
-static void yaffs_InvalidateCheckpoint(yaffs_Device *dev);
-
-static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-				yaffs_ExtendedTags *tags);
-
-static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-		unsigned pos);
-static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-					yaffs_FileStructure *fStruct,
-					__u32 chunkId);
-
-/* Function to calculate chunk and offset */
-
-static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut,
-		__u32 *offsetOut)
-{
-	int chunk;
-	__u32 offset;
-
-	chunk  = (__u32)(addr >> dev->chunkShift);
-
-	if (dev->chunkDiv == 1) {
-		/* easy power of 2 case */
-		offset = (__u32)(addr & dev->chunkMask);
-	} else {
-		/* Non power-of-2 case */
-
-		loff_t chunkBase;
-
-		chunk /= dev->chunkDiv;
-
-		chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk;
-		offset = (__u32)(addr - chunkBase);
-	}
-
-	*chunkOut = chunk;
-	*offsetOut = offset;
-}
-
-/* Function to return the number of shifts for a power of 2 greater than or
- * equal to the given number
- * Note we don't try to cater for all possible numbers and this does not have to
- * be hellishly efficient.
- */
-
-static __u32 ShiftsGE(__u32 x)
-{
-	int extraBits;
-	int nShifts;
-
-	nShifts = extraBits = 0;
-
-	while (x > 1) {
-		if (x & 1)
-			extraBits++;
-		x >>= 1;
-		nShifts++;
-	}
-
-	if (extraBits)
-		nShifts++;
-
-	return nShifts;
-}
-
-/* Function to return the number of shifts to get a 1 in bit 0
- */
-
-static __u32 Shifts(__u32 x)
-{
-	int nShifts;
-
-	nShifts =  0;
-
-	if (!x)
-		return 0;
-
-	while (!(x&1)) {
-		x >>= 1;
-		nShifts++;
-	}
-
-	return nShifts;
-}
-
-
-
-/*
- * Temporary buffer manipulations.
- */
-
-static int yaffs_InitialiseTempBuffers(yaffs_Device *dev)
-{
-	int i;
-	__u8 *buf = (__u8 *)1;
-
-	memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer));
-
-	for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
-		dev->tempBuffer[i].line = 0;	/* not in use */
-		dev->tempBuffer[i].buffer = buf =
-		    YMALLOC_DMA(dev->totalBytesPerChunk);
-	}
-
-	return buf ? YAFFS_OK : YAFFS_FAIL;
-}
-
-__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo)
-{
-	int i, j;
-
-	dev->tempInUse++;
-	if (dev->tempInUse > dev->maxTemp)
-		dev->maxTemp = dev->tempInUse;
-
-	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-		if (dev->tempBuffer[i].line == 0) {
-			dev->tempBuffer[i].line = lineNo;
-			if ((i + 1) > dev->maxTemp) {
-				dev->maxTemp = i + 1;
-				for (j = 0; j <= i; j++)
-					dev->tempBuffer[j].maxLine =
-					    dev->tempBuffer[j].line;
-			}
-
-			return dev->tempBuffer[i].buffer;
-		}
-	}
-
-	T(YAFFS_TRACE_BUFFERS,
-	  (TSTR("Out of temp buffers at line %d, other held by lines:"),
-	   lineNo));
-	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
-		T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line));
-
-	T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
-
-	/*
-	 * If we got here then we have to allocate an unmanaged one
-	 * This is not good.
-	 */
-
-	dev->unmanagedTempAllocations++;
-	return YMALLOC(dev->nDataBytesPerChunk);
-
-}
-
-void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer,
-				    int lineNo)
-{
-	int i;
-
-	dev->tempInUse--;
-
-	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-		if (dev->tempBuffer[i].buffer == buffer) {
-			dev->tempBuffer[i].line = 0;
-			return;
-		}
-	}
-
-	if (buffer) {
-		/* assume it is an unmanaged one. */
-		T(YAFFS_TRACE_BUFFERS,
-		  (TSTR("Releasing unmanaged temp buffer in line %d" TENDSTR),
-		   lineNo));
-		YFREE(buffer);
-		dev->unmanagedTempDeallocations++;
-	}
-
-}
-
-/*
- * Determine if we have a managed buffer.
- */
-int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
-{
-	int i;
-
-	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-		if (dev->tempBuffer[i].buffer == buffer)
-			return 1;
-	}
-
-	for (i = 0; i < dev->nShortOpCaches; i++) {
-		if (dev->srCache[i].data == buffer)
-			return 1;
-	}
-
-	if (buffer == dev->checkpointBuffer)
-		return 1;
-
-	T(YAFFS_TRACE_ALWAYS,
-		(TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
-	return 0;
-}
-
-
-
-/*
- * Chunk bitmap manipulations
- */
-
-static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
-{
-	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-		T(YAFFS_TRACE_ERROR,
-			(TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-			blk));
-		YBUG();
-	}
-	return dev->chunkBits +
-		(dev->chunkBitmapStride * (blk - dev->internalStartBlock));
-}
-
-static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
-{
-	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-			chunk < 0 || chunk >= dev->nChunksPerBlock) {
-		T(YAFFS_TRACE_ERROR,
-		(TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
-			blk, chunk));
-		YBUG();
-	}
-}
-
-static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device *dev, int blk)
-{
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
-
-	memset(blkBits, 0, dev->chunkBitmapStride);
-}
-
-static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
-{
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
-
-	yaffs_VerifyChunkBitId(dev, blk, chunk);
-
-	blkBits[chunk / 8] &= ~(1 << (chunk & 7));
-}
-
-static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
-{
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
-
-	yaffs_VerifyChunkBitId(dev, blk, chunk);
-
-	blkBits[chunk / 8] |= (1 << (chunk & 7));
-}
-
-static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
-{
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
-	yaffs_VerifyChunkBitId(dev, blk, chunk);
-
-	return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
-}
-
-static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
-{
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
-	int i;
-	for (i = 0; i < dev->chunkBitmapStride; i++) {
-		if (*blkBits)
-			return 1;
-		blkBits++;
-	}
-	return 0;
-}
-
-static int yaffs_CountChunkBits(yaffs_Device *dev, int blk)
-{
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
-	int i;
-	int n = 0;
-	for (i = 0; i < dev->chunkBitmapStride; i++) {
-		__u8 x = *blkBits;
-		while (x) {
-			if (x & 1)
-				n++;
-			x >>= 1;
-		}
-
-		blkBits++;
-	}
-	return n;
-}
-
-/*
- * Verification code
- */
-
-static int yaffs_SkipVerification(yaffs_Device *dev)
-{
-	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
-}
-
-static int yaffs_SkipFullVerification(yaffs_Device *dev)
-{
-	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_FULL));
-}
-
-static int yaffs_SkipNANDVerification(yaffs_Device *dev)
-{
-	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
-}
-
-static const char *blockStateName[] = {
-"Unknown",
-"Needs scanning",
-"Scanning",
-"Empty",
-"Allocating",
-"Full",
-"Dirty",
-"Checkpoint",
-"Collecting",
-"Dead"
-};
-
-static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
-{
-	int actuallyUsed;
-	int inUse;
-
-	if (yaffs_SkipVerification(dev))
-		return;
-
-	/* Report illegal runtime states */
-	if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
-
-	switch (bi->blockState) {
-	case YAFFS_BLOCK_STATE_UNKNOWN:
-	case YAFFS_BLOCK_STATE_SCANNING:
-	case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
-		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
-		n, blockStateName[bi->blockState]));
-	}
-
-	/* Check pages in use and soft deletions are legal */
-
-	actuallyUsed = bi->pagesInUse - bi->softDeletions;
-
-	if (bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
-	   bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock ||
-	   actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock)
-		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-		n, bi->pagesInUse, bi->softDeletions));
-
-
-	/* Check chunk bitmap legal */
-	inUse = yaffs_CountChunkBits(dev, n);
-	if (inUse != bi->pagesInUse)
-		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-			n, bi->pagesInUse, inUse));
-
-	/* Check that the sequence number is valid.
-	 * Ten million is legal, but is very unlikely
-	 */
-	if (dev->isYaffs2 &&
-	   (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) &&
-	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000))
-		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has suspect sequence number of %d"TENDSTR),
-		n, bi->sequenceNumber));
-}
-
-static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
-		int n)
-{
-	yaffs_VerifyBlock(dev, bi, n);
-
-	/* After collection the block should be in the erased state */
-	/* This will need to change if we do partial gc */
-
-	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
-			bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
-		T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-			n, bi->blockState));
-	}
-}
-
-static void yaffs_VerifyBlocks(yaffs_Device *dev)
-{
-	int i;
-	int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
-	int nIllegalBlockStates = 0;
-
-	if (yaffs_SkipVerification(dev))
-		return;
-
-	memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
-
-	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-		yaffs_VerifyBlock(dev, bi, i);
-
-		if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
-			nBlocksPerState[bi->blockState]++;
-		else
-			nIllegalBlockStates++;
-	}
-
-	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-	T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
-
-	T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
-	if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-		T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
-
-	for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
-		T(YAFFS_TRACE_VERIFY,
-		  (TSTR("%s %d blocks"TENDSTR),
-		  blockStateName[i], nBlocksPerState[i]));
-
-	if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
-		T(YAFFS_TRACE_VERIFY,
-		 (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
-		 dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
-
-	if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
-		T(YAFFS_TRACE_VERIFY,
-		 (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
-		 dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
-
-	if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
-		T(YAFFS_TRACE_VERIFY,
-		 (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
-		 nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
-
-	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-
-}
-
-/*
- * Verify the object header. oh must be valid, but obj and tags may be NULL in which
- * case those tests will not be performed.
- */
-static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
-{
-	if (obj && yaffs_SkipVerification(obj->myDev))
-		return;
-
-	if (!(tags && obj && oh)) {
-		T(YAFFS_TRACE_VERIFY,
-				(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
-				(__u32)tags, (__u32)obj, (__u32)oh));
-		return;
-	}
-
-	if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-			oh->type > YAFFS_OBJECT_TYPE_MAX)
-		T(YAFFS_TRACE_VERIFY,
-			(TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-			tags->objectId, oh->type));
-
-	if (tags->objectId != obj->objectId)
-		T(YAFFS_TRACE_VERIFY,
-			(TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-			tags->objectId, obj->objectId));
-
-
-	/*
-	 * Check that the object's parent ids match if parentCheck requested.
-	 *
-	 * Tests do not apply to the root object.
-	 */
-
-	if (parentCheck && tags->objectId > 1 && !obj->parent)
-		T(YAFFS_TRACE_VERIFY,
-			(TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-			tags->objectId, oh->parentObjectId));
-
-	if (parentCheck && obj->parent &&
-			oh->parentObjectId != obj->parent->objectId &&
-			(oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-			obj->parent->objectId != YAFFS_OBJECTID_DELETED))
-		T(YAFFS_TRACE_VERIFY,
-			(TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-			tags->objectId, oh->parentObjectId, obj->parent->objectId));
-
-	if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
-		T(YAFFS_TRACE_VERIFY,
-			(TSTR("Obj %d header name is NULL"TENDSTR),
-			obj->objectId));
-
-	if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
-		T(YAFFS_TRACE_VERIFY,
-			(TSTR("Obj %d header name is 0xFF"TENDSTR),
-			obj->objectId));
-}
-
-
-
-static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
-					__u32 level, int chunkOffset)
-{
-	int i;
-	yaffs_Device *dev = obj->myDev;
-	int ok = 1;
-
-	if (tn) {
-		if (level > 0) {
-
-			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
-				if (tn->internal[i]) {
-					ok = yaffs_VerifyTnodeWorker(obj,
-							tn->internal[i],
-							level - 1,
-							(chunkOffset<<YAFFS_TNODES_INTERNAL_BITS) + i);
-				}
-			}
-		} else if (level == 0) {
-			yaffs_ExtendedTags tags;
-			__u32 objectId = obj->objectId;
-
-			chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
-
-			for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
-				__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-
-				if (theChunk > 0) {
-					/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
-					yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-					if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
-						T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-							objectId, chunkOffset, theChunk,
-							tags.objectId, tags.chunkId));
-					}
-				}
-				chunkOffset++;
-			}
-		}
-	}
-
-	return ok;
-
-}
-
-
-static void yaffs_VerifyFile(yaffs_Object *obj)
-{
-	int requiredTallness;
-	int actualTallness;
-	__u32 lastChunk;
-	__u32 x;
-	__u32 i;
-	yaffs_Device *dev;
-	yaffs_ExtendedTags tags;
-	yaffs_Tnode *tn;
-	__u32 objectId;
-
-	if (!obj)
-		return;
-
-	if (yaffs_SkipVerification(obj->myDev))
-		return;
-
-	dev = obj->myDev;
-	objectId = obj->objectId;
-
-	/* Check file size is consistent with tnode depth */
-	lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
-	x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
-	requiredTallness = 0;
-	while (x > 0) {
-		x >>= YAFFS_TNODES_INTERNAL_BITS;
-		requiredTallness++;
-	}
-
-	actualTallness = obj->variant.fileVariant.topLevel;
-
-	if (requiredTallness > actualTallness)
-		T(YAFFS_TRACE_VERIFY,
-		(TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR),
-		 obj->objectId, actualTallness, requiredTallness));
-
-
-	/* Check that the chunks in the tnode tree are all correct.
-	 * We do this by scanning through the tnode tree and
-	 * checking the tags for every chunk match.
-	 */
-
-	if (yaffs_SkipNANDVerification(dev))
-		return;
-
-	for (i = 1; i <= lastChunk; i++) {
-		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
-
-		if (tn) {
-			__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-			if (theChunk > 0) {
-				/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
-				yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-				if (tags.objectId != objectId || tags.chunkId != i) {
-					T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-						objectId, i, theChunk,
-						tags.objectId, tags.chunkId));
-				}
-			}
-		}
-	}
-}
-
-
-static void yaffs_VerifyHardLink(yaffs_Object *obj)
-{
-	if (obj && yaffs_SkipVerification(obj->myDev))
-		return;
-
-	/* Verify sane equivalent object */
-}
-
-static void yaffs_VerifySymlink(yaffs_Object *obj)
-{
-	if (obj && yaffs_SkipVerification(obj->myDev))
-		return;
-
-	/* Verify symlink string */
-}
-
-static void yaffs_VerifySpecial(yaffs_Object *obj)
-{
-	if (obj && yaffs_SkipVerification(obj->myDev))
-		return;
-}
-
-static void yaffs_VerifyObject(yaffs_Object *obj)
-{
-	yaffs_Device *dev;
-
-	__u32 chunkMin;
-	__u32 chunkMax;
-
-	__u32 chunkIdOk;
-	__u32 chunkInRange;
-	__u32 chunkShouldNotBeDeleted;
-	__u32 chunkValid;
-
-	if (!obj)
-		return;
-
-	if (obj->beingCreated)
-		return;
-
-	dev = obj->myDev;
-
-	if (yaffs_SkipVerification(dev))
-		return;
-
-	/* Check sane object header chunk */
-
-	chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
-	chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
-
-	chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
-	chunkIdOk = chunkInRange || (obj->hdrChunk == 0);
-	chunkValid = chunkInRange &&
-			yaffs_CheckChunkBit(dev,
-					obj->hdrChunk / dev->nChunksPerBlock,
-					obj->hdrChunk % dev->nChunksPerBlock);
-	chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
-
-	if (!obj->fake &&
-			(!chunkIdOk || chunkShouldNotBeDeleted)) {
-		T(YAFFS_TRACE_VERIFY,
-			(TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-			obj->objectId, obj->hdrChunk,
-			chunkIdOk ? "" : ",out of range",
-			chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
-	}
-
-	if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
-		yaffs_ExtendedTags tags;
-		yaffs_ObjectHeader *oh;
-		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-
-		oh = (yaffs_ObjectHeader *)buffer;
-
-		yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
-				&tags);
-
-		yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
-
-		yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-	}
-
-	/* Verify it has a parent */
-	if (obj && !obj->fake &&
-			(!obj->parent || obj->parent->myDev != dev)) {
-		T(YAFFS_TRACE_VERIFY,
-			(TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-			obj->objectId, obj->parent));
-	}
-
-	/* Verify parent is a directory */
-	if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-		T(YAFFS_TRACE_VERIFY,
-			(TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-			obj->objectId, obj->parent->variantType));
-	}
-
-	switch (obj->variantType) {
-	case YAFFS_OBJECT_TYPE_FILE:
-		yaffs_VerifyFile(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_SYMLINK:
-		yaffs_VerifySymlink(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_DIRECTORY:
-		yaffs_VerifyDirectory(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_HARDLINK:
-		yaffs_VerifyHardLink(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_SPECIAL:
-		yaffs_VerifySpecial(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_UNKNOWN:
-	default:
-		T(YAFFS_TRACE_VERIFY,
-		(TSTR("Obj %d has illegaltype %d"TENDSTR),
-		obj->objectId, obj->variantType));
-		break;
-	}
-}
-
-static void yaffs_VerifyObjects(yaffs_Device *dev)
-{
-	yaffs_Object *obj;
-	int i;
-	struct ylist_head *lh;
-
-	if (yaffs_SkipVerification(dev))
-		return;
-
-	/* Iterate through the objects in each hash entry */
-
-	for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-		ylist_for_each(lh, &dev->objectBucket[i].list) {
-			if (lh) {
-				obj = ylist_entry(lh, yaffs_Object, hashLink);
-				yaffs_VerifyObject(obj);
-			}
-		}
-	}
-}
-
-
-/*
- *  Simple hash function. Needs to have a reasonable spread
- */
-
-static Y_INLINE int yaffs_HashFunction(int n)
-{
-	n = abs(n);
-	return n % YAFFS_NOBJECT_BUCKETS;
-}
-
-/*
- * Access functions to useful fake objects.
- * Note that root might have a presence in NAND if permissions are set.
- */
-
-yaffs_Object *yaffs_Root(yaffs_Device *dev)
-{
-	return dev->rootDir;
-}
-
-yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
-{
-	return dev->lostNFoundDir;
-}
-
-
-/*
- *  Erased NAND checking functions
- */
-
-int yaffs_CheckFF(__u8 *buffer, int nBytes)
-{
-	/* Horrible, slow implementation */
-	while (nBytes--) {
-		if (*buffer != 0xFF)
-			return 0;
-		buffer++;
-	}
-	return 1;
-}
-
-static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-				int chunkInNAND)
-{
-	int retval = YAFFS_OK;
-	__u8 *data = yaffs_GetTempBuffer(dev, __LINE__);
-	yaffs_ExtendedTags tags;
-	int result;
-
-	result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
-
-	if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
-		retval = YAFFS_FAIL;
-
-	if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
-		T(YAFFS_TRACE_NANDACCESS,
-		  (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND));
-		retval = YAFFS_FAIL;
-	}
-
-	yaffs_ReleaseTempBuffer(dev, data, __LINE__);
-
-	return retval;
-
-}
-
-static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
-					const __u8 *data,
-					yaffs_ExtendedTags *tags,
-					int useReserve)
-{
-	int attempts = 0;
-	int writeOk = 0;
-	int chunk;
-
-	yaffs_InvalidateCheckpoint(dev);
-
-	do {
-		yaffs_BlockInfo *bi = 0;
-		int erasedOk = 0;
-
-		chunk = yaffs_AllocateChunk(dev, useReserve, &bi);
-		if (chunk < 0) {
-			/* no space */
-			break;
-		}
-
-		/* First check this chunk is erased, if it needs
-		 * checking.  The checking policy (unless forced
-		 * always on) is as follows:
-		 *
-		 * Check the first page we try to write in a block.
-		 * If the check passes then we don't need to check any
-		 * more.	If the check fails, we check again...
-		 * If the block has been erased, we don't need to check.
-		 *
-		 * However, if the block has been prioritised for gc,
-		 * then we think there might be something odd about
-		 * this block and stop using it.
-		 *
-		 * Rationale: We should only ever see chunks that have
-		 * not been erased if there was a partially written
-		 * chunk due to power loss.  This checking policy should
-		 * catch that case with very few checks and thus save a
-		 * lot of checks that are most likely not needed.
-		 */
-		if (bi->gcPrioritise) {
-			yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
-			/* try another chunk */
-			continue;
-		}
-
-		/* let's give it a try */
-		attempts++;
-
-#ifdef CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED
-		bi->skipErasedCheck = 0;
-#endif
-		if (!bi->skipErasedCheck) {
-			erasedOk = yaffs_CheckChunkErased(dev, chunk);
-			if (erasedOk != YAFFS_OK) {
-				T(YAFFS_TRACE_ERROR,
-				(TSTR("**>> yaffs chunk %d was not erased"
-				TENDSTR), chunk));
-
-				/* try another chunk */
-				continue;
-			}
-			bi->skipErasedCheck = 1;
-		}
-
-		writeOk = yaffs_WriteChunkWithTagsToNAND(dev, chunk,
-				data, tags);
-		if (writeOk != YAFFS_OK) {
-			yaffs_HandleWriteChunkError(dev, chunk, erasedOk);
-			/* try another chunk */
-			continue;
-		}
-
-		/* Copy the data into the robustification buffer */
-		yaffs_HandleWriteChunkOk(dev, chunk, data, tags);
-
-	} while (writeOk != YAFFS_OK &&
-		(yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
-
-	if (!writeOk)
-		chunk = -1;
-
-	if (attempts > 1) {
-		T(YAFFS_TRACE_ERROR,
-			(TSTR("**>> yaffs write required %d attempts" TENDSTR),
-			attempts));
-
-		dev->nRetriedWrites += (attempts - 1);
-	}
-
-	return chunk;
-}
-
-/*
- * Block retiring for handling a broken block.
- */
-
-static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND)
-{
-	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
-
-	yaffs_InvalidateCheckpoint(dev);
-
-	if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) {
-		if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) {
-			T(YAFFS_TRACE_ALWAYS, (TSTR(
-				"yaffs: Failed to mark bad and erase block %d"
-				TENDSTR), blockInNAND));
-		} else {
-			yaffs_ExtendedTags tags;
-			int chunkId = blockInNAND * dev->nChunksPerBlock;
-
-			__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-
-			memset(buffer, 0xff, dev->nDataBytesPerChunk);
-			yaffs_InitialiseTags(&tags);
-			tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK;
-			if (dev->writeChunkWithTagsToNAND(dev, chunkId -
-				dev->chunkOffset, buffer, &tags) != YAFFS_OK)
-				T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
-					TCONT("write bad block marker to block %d")
-					TENDSTR), blockInNAND));
-
-			yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-		}
-	}
-
-	bi->blockState = YAFFS_BLOCK_STATE_DEAD;
-	bi->gcPrioritise = 0;
-	bi->needsRetiring = 0;
-
-	dev->nRetiredBlocks++;
-}
-
-/*
- * Functions for robustisizing TODO
- *
- */
-
-static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-				const __u8 *data,
-				const yaffs_ExtendedTags *tags)
-{
-}
-
-static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-				const yaffs_ExtendedTags *tags)
-{
-}
-
-void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
-{
-	if (!bi->gcPrioritise) {
-		bi->gcPrioritise = 1;
-		dev->hasPendingPrioritisedGCs = 1;
-		bi->chunkErrorStrikes++;
-
-		if (bi->chunkErrorStrikes > 3) {
-			bi->needsRetiring = 1; /* Too many stikes, so retire this */
-			T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
-
-		}
-	}
-}
-
-static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-		int erasedOk)
-{
-	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
-	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
-
-	yaffs_HandleChunkError(dev, bi);
-
-	if (erasedOk) {
-		/* Was an actual write failure, so mark the block for retirement  */
-		bi->needsRetiring = 1;
-		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-		  (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
-	}
-
-	/* Delete the chunk */
-	yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
-}
-
-
-/*---------------- Name handling functions ------------*/
-
-static __u16 yaffs_CalcNameSum(const YCHAR *name)
-{
-	__u16 sum = 0;
-	__u16 i = 1;
-
-	const YUCHAR *bname = (const YUCHAR *) name;
-	if (bname) {
-		while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) {
-
-#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
-			sum += yaffs_toupper(*bname) * i;
-#else
-			sum += (*bname) * i;
-#endif
-			i++;
-			bname++;
-		}
-	}
-	return sum;
-}
-
-static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
-{
-#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-	memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
-	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH)
-		yaffs_strcpy(obj->shortName, name);
-	else
-		obj->shortName[0] = _Y('\0');
-#endif
-	obj->sum = yaffs_CalcNameSum(name);
-}
-
-/*-------------------- TNODES -------------------
-
- * List of spare tnodes
- * The list is hooked together using the first pointer
- * in the tnode.
- */
-
-/* yaffs_CreateTnodes creates a bunch more tnodes and
- * adds them to the tnode free list.
- * Don't use this function directly
- */
-
-static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
-{
-	int i;
-	int tnodeSize;
-	yaffs_Tnode *newTnodes;
-	__u8 *mem;
-	yaffs_Tnode *curr;
-	yaffs_Tnode *next;
-	yaffs_TnodeList *tnl;
-
-	if (nTnodes < 1)
-		return YAFFS_OK;
-
-	/* Calculate the tnode size in bytes for variable width tnode support.
-	 * Must be a multiple of 32-bits  */
-	tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-
-	if (tnodeSize < sizeof(yaffs_Tnode))
-		tnodeSize = sizeof(yaffs_Tnode);
-
-	/* make these things */
-
-	newTnodes = YMALLOC(nTnodes * tnodeSize);
-	mem = (__u8 *)newTnodes;
-
-	if (!newTnodes) {
-		T(YAFFS_TRACE_ERROR,
-			(TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	/* Hook them into the free list */
-#if 0
-	for (i = 0; i < nTnodes - 1; i++) {
-		newTnodes[i].internal[0] = &newTnodes[i + 1];
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-		newTnodes[i].internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-#endif
-	}
-
-	newTnodes[nTnodes - 1].internal[0] = dev->freeTnodes;
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-	newTnodes[nTnodes - 1].internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-#endif
-	dev->freeTnodes = newTnodes;
-#else
-	/* New hookup for wide tnodes */
-	for (i = 0; i < nTnodes - 1; i++) {
-		curr = (yaffs_Tnode *) &mem[i * tnodeSize];
-		next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize];
-		curr->internal[0] = next;
-	}
-
-	curr = (yaffs_Tnode *) &mem[(nTnodes - 1) * tnodeSize];
-	curr->internal[0] = dev->freeTnodes;
-	dev->freeTnodes = (yaffs_Tnode *)mem;
-
-#endif
-
-
-	dev->nFreeTnodes += nTnodes;
-	dev->nTnodesCreated += nTnodes;
-
-	/* Now add this bunch of tnodes to a list for freeing up.
-	 * NB If we can't add this to the management list it isn't fatal
-	 * but it just means we can't free this bunch of tnodes later.
-	 */
-
-	tnl = YMALLOC(sizeof(yaffs_TnodeList));
-	if (!tnl) {
-		T(YAFFS_TRACE_ERROR,
-		  (TSTR
-		   ("yaffs: Could not add tnodes to management list" TENDSTR)));
-		   return YAFFS_FAIL;
-	} else {
-		tnl->tnodes = newTnodes;
-		tnl->next = dev->allocatedTnodeList;
-		dev->allocatedTnodeList = tnl;
-	}
-
-	T(YAFFS_TRACE_ALLOCATE, (TSTR("yaffs: Tnodes added" TENDSTR)));
-
-	return YAFFS_OK;
-}
-
-/* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
-
-static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev)
-{
-	yaffs_Tnode *tn = NULL;
-
-	/* If there are none left make more */
-	if (!dev->freeTnodes)
-		yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES);
-
-	if (dev->freeTnodes) {
-		tn = dev->freeTnodes;
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-		if (tn->internal[YAFFS_NTNODES_INTERNAL] != (void *)1) {
-			/* Hoosterman, this thing looks like it isn't in the list */
-			T(YAFFS_TRACE_ALWAYS,
-			  (TSTR("yaffs: Tnode list bug 1" TENDSTR)));
-		}
-#endif
-		dev->freeTnodes = dev->freeTnodes->internal[0];
-		dev->nFreeTnodes--;
-	}
-
-	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-
-	return tn;
-}
-
-static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
-{
-	yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
-	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-
-	if (tnodeSize < sizeof(yaffs_Tnode))
-		tnodeSize = sizeof(yaffs_Tnode);
-
-	if (tn)
-		memset(tn, 0, tnodeSize);
-
-	return tn;
-}
-
-/* FreeTnode frees up a tnode and puts it back on the free list */
-static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn)
-{
-	if (tn) {
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-		if (tn->internal[YAFFS_NTNODES_INTERNAL] != 0) {
-			/* Hoosterman, this thing looks like it is already in the list */
-			T(YAFFS_TRACE_ALWAYS,
-			  (TSTR("yaffs: Tnode list bug 2" TENDSTR)));
-		}
-		tn->internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-#endif
-		tn->internal[0] = dev->freeTnodes;
-		dev->freeTnodes = tn;
-		dev->nFreeTnodes++;
-	}
-	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-}
-
-static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
-{
-	/* Free the list of allocated tnodes */
-	yaffs_TnodeList *tmp;
-
-	while (dev->allocatedTnodeList) {
-		tmp = dev->allocatedTnodeList->next;
-
-		YFREE(dev->allocatedTnodeList->tnodes);
-		YFREE(dev->allocatedTnodeList);
-		dev->allocatedTnodeList = tmp;
-
-	}
-
-	dev->freeTnodes = NULL;
-	dev->nFreeTnodes = 0;
-}
-
-static void yaffs_InitialiseTnodes(yaffs_Device *dev)
-{
-	dev->allocatedTnodeList = NULL;
-	dev->freeTnodes = NULL;
-	dev->nFreeTnodes = 0;
-	dev->nTnodesCreated = 0;
-}
-
-
-void yaffs_LoadLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos,
-		unsigned val)
-{
-	__u32 *map = (__u32 *)tn;
-	__u32 bitInMap;
-	__u32 bitInWord;
-	__u32 wordInMap;
-	__u32 mask;
-
-	pos &= YAFFS_TNODES_LEVEL0_MASK;
-	val >>= dev->chunkGroupBits;
-
-	bitInMap = pos * dev->tnodeWidth;
-	wordInMap = bitInMap / 32;
-	bitInWord = bitInMap & (32 - 1);
-
-	mask = dev->tnodeMask << bitInWord;
-
-	map[wordInMap] &= ~mask;
-	map[wordInMap] |= (mask & (val << bitInWord));
-
-	if (dev->tnodeWidth > (32 - bitInWord)) {
-		bitInWord = (32 - bitInWord);
-		wordInMap++;;
-		mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
-		map[wordInMap] &= ~mask;
-		map[wordInMap] |= (mask & (val >> bitInWord));
-	}
-}
-
-static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-		unsigned pos)
-{
-	__u32 *map = (__u32 *)tn;
-	__u32 bitInMap;
-	__u32 bitInWord;
-	__u32 wordInMap;
-	__u32 val;
-
-	pos &= YAFFS_TNODES_LEVEL0_MASK;
-
-	bitInMap = pos * dev->tnodeWidth;
-	wordInMap = bitInMap / 32;
-	bitInWord = bitInMap & (32 - 1);
-
-	val = map[wordInMap] >> bitInWord;
-
-	if	(dev->tnodeWidth > (32 - bitInWord)) {
-		bitInWord = (32 - bitInWord);
-		wordInMap++;;
-		val |= (map[wordInMap] << bitInWord);
-	}
-
-	val &= dev->tnodeMask;
-	val <<= dev->chunkGroupBits;
-
-	return val;
-}
-
-/* ------------------- End of individual tnode manipulation -----------------*/
-
-/* ---------Functions to manipulate the look-up tree (made up of tnodes) ------
- * The look up tree is represented by the top tnode and the number of topLevel
- * in the tree. 0 means only the level 0 tnode is in the tree.
- */
-
-/* FindLevel0Tnode finds the level 0 tnode, if one exists. */
-static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-					yaffs_FileStructure *fStruct,
-					__u32 chunkId)
-{
-	yaffs_Tnode *tn = fStruct->top;
-	__u32 i;
-	int requiredTallness;
-	int level = fStruct->topLevel;
-
-	/* Check sane level and chunk Id */
-	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
-		return NULL;
-
-	if (chunkId > YAFFS_MAX_CHUNK_ID)
-		return NULL;
-
-	/* First check we're tall enough (ie enough topLevel) */
-
-	i = chunkId >> YAFFS_TNODES_LEVEL0_BITS;
-	requiredTallness = 0;
-	while (i) {
-		i >>= YAFFS_TNODES_INTERNAL_BITS;
-		requiredTallness++;
-	}
-
-	if (requiredTallness > fStruct->topLevel)
-		return NULL; /* Not tall enough, so we can't find it */
-
-	/* Traverse down to level 0 */
-	while (level > 0 && tn) {
-		tn = tn->internal[(chunkId >>
-			(YAFFS_TNODES_LEVEL0_BITS +
-				(level - 1) *
-				YAFFS_TNODES_INTERNAL_BITS)) &
-			YAFFS_TNODES_INTERNAL_MASK];
-		level--;
-	}
-
-	return tn;
-}
-
-/* AddOrFindLevel0Tnode finds the level 0 tnode if it exists, otherwise first expands the tree.
- * This happens in two steps:
- *  1. If the tree isn't tall enough, then make it taller.
- *  2. Scan down the tree towards the level 0 tnode adding tnodes if required.
- *
- * Used when modifying the tree.
- *
- *  If the tn argument is NULL, then a fresh tnode will be added otherwise the specified tn will
- *  be plugged into the ttree.
- */
-
-static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
-					yaffs_FileStructure *fStruct,
-					__u32 chunkId,
-					yaffs_Tnode *passedTn)
-{
-	int requiredTallness;
-	int i;
-	int l;
-	yaffs_Tnode *tn;
-
-	__u32 x;
-
-
-	/* Check sane level and page Id */
-	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)
-		return NULL;
-
-	if (chunkId > YAFFS_MAX_CHUNK_ID)
-		return NULL;
-
-	/* First check we're tall enough (ie enough topLevel) */
-
-	x = chunkId >> YAFFS_TNODES_LEVEL0_BITS;
-	requiredTallness = 0;
-	while (x) {
-		x >>= YAFFS_TNODES_INTERNAL_BITS;
-		requiredTallness++;
-	}
-
-
-	if (requiredTallness > fStruct->topLevel) {
-		/* Not tall enough, gotta make the tree taller */
-		for (i = fStruct->topLevel; i < requiredTallness; i++) {
-
-			tn = yaffs_GetTnode(dev);
-
-			if (tn) {
-				tn->internal[0] = fStruct->top;
-				fStruct->top = tn;
-				fStruct->topLevel++;
-			} else {
-				T(YAFFS_TRACE_ERROR,
-					(TSTR("yaffs: no more tnodes" TENDSTR)));
-				return NULL;
-			}
-		}
-	}
-
-	/* Traverse down to level 0, adding anything we need */
-
-	l = fStruct->topLevel;
-	tn = fStruct->top;
-
-	if (l > 0) {
-		while (l > 0 && tn) {
-			x = (chunkId >>
-			     (YAFFS_TNODES_LEVEL0_BITS +
-			      (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
-			    YAFFS_TNODES_INTERNAL_MASK;
-
-
-			if ((l > 1) && !tn->internal[x]) {
-				/* Add missing non-level-zero tnode */
-				tn->internal[x] = yaffs_GetTnode(dev);
-				if(!tn->internal[x])
-					return NULL;
-
-			} else if (l == 1) {
-				/* Looking from level 1 at level 0 */
-				if (passedTn) {
-					/* If we already have one, then release it.*/
-					if (tn->internal[x])
-						yaffs_FreeTnode(dev, tn->internal[x]);
-					tn->internal[x] = passedTn;
-
-				} else if (!tn->internal[x]) {
-					/* Don't have one, none passed in */
-					tn->internal[x] = yaffs_GetTnode(dev);
-					if(!tn->internal[x])
-						return NULL;
-				}
-			}
-
-			tn = tn->internal[x];
-			l--;
-		}
-	} else {
-		/* top is level 0 */
-		if (passedTn) {
-			memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-			yaffs_FreeTnode(dev, passedTn);
-		}
-	}
-
-	return tn;
-}
-
-static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk,
-				yaffs_ExtendedTags *tags, int objectId,
-				int chunkInInode)
-{
-	int j;
-
-	for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
-		if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
-				theChunk % dev->nChunksPerBlock)) {
-			
-			if(dev->chunkGroupSize == 1)
-				return theChunk;
-			else {
-				yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
-								tags);
-				if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
-					/* found it; */
-					return theChunk;
-				}
-			}
-		}
-		theChunk++;
-	}
-	return -1;
-}
-
-
-/* DeleteWorker scans backwards through the tnode tree and deletes all the
- * chunks and tnodes in the file
- * Returns 1 if the tree was deleted.
- * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
- */
-
-static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
-			      int chunkOffset, int *limit)
-{
-	int i;
-	int chunkInInode;
-	int theChunk;
-	yaffs_ExtendedTags tags;
-	int foundChunk;
-	yaffs_Device *dev = in->myDev;
-
-	int allDone = 1;
-
-	if (tn) {
-		if (level > 0) {
-			for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
-			     i--) {
-				if (tn->internal[i]) {
-					if (limit && (*limit) < 0) {
-						allDone = 0;
-					} else {
-						allDone =
-							yaffs_DeleteWorker(in,
-								tn->
-								internal
-								[i],
-								level -
-								1,
-								(chunkOffset
-									<<
-									YAFFS_TNODES_INTERNAL_BITS)
-								+ i,
-								limit);
-					}
-					if (allDone) {
-						yaffs_FreeTnode(dev,
-								tn->
-								internal[i]);
-						tn->internal[i] = NULL;
-					}
-				}
-			}
-			return (allDone) ? 1 : 0;
-		} else if (level == 0) {
-			int hitLimit = 0;
-
-			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
-					i--) {
-				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-				if (theChunk) {
-
-					chunkInInode = (chunkOffset <<
-						YAFFS_TNODES_LEVEL0_BITS) + i;
-
-					foundChunk =
-						yaffs_FindChunkInGroup(dev,
-								theChunk,
-								&tags,
-								in->objectId,
-								chunkInInode);
-
-					if (foundChunk > 0) {
-						yaffs_DeleteChunk(dev,
-								  foundChunk, 1,
-								  __LINE__);
-						in->nDataChunks--;
-						if (limit) {
-							*limit = *limit - 1;
-							if (*limit <= 0)
-								hitLimit = 1;
-						}
-
-					}
-
-					yaffs_LoadLevel0Tnode(dev, tn, i, 0);
-				}
-
-			}
-			return (i < 0) ? 1 : 0;
-
-		}
-
-	}
-
-	return 1;
-
-}
-
-static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk)
-{
-	yaffs_BlockInfo *theBlock;
-
-	T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
-
-	theBlock = yaffs_GetBlockInfo(dev, chunk / dev->nChunksPerBlock);
-	if (theBlock) {
-		theBlock->softDeletions++;
-		dev->nFreeChunks++;
-	}
-}
-
-/* SoftDeleteWorker scans backwards through the tnode tree and soft deletes all the chunks in the file.
- * All soft deleting does is increment the block's softdelete count and pulls the chunk out
- * of the tnode.
- * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
- */
-
-static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn,
-				  __u32 level, int chunkOffset)
-{
-	int i;
-	int theChunk;
-	int allDone = 1;
-	yaffs_Device *dev = in->myDev;
-
-	if (tn) {
-		if (level > 0) {
-
-			for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
-			     i--) {
-				if (tn->internal[i]) {
-					allDone =
-					    yaffs_SoftDeleteWorker(in,
-								   tn->
-								   internal[i],
-								   level - 1,
-								   (chunkOffset
-								    <<
-								    YAFFS_TNODES_INTERNAL_BITS)
-								   + i);
-					if (allDone) {
-						yaffs_FreeTnode(dev,
-								tn->
-								internal[i]);
-						tn->internal[i] = NULL;
-					} else {
-						/* Hoosterman... how could this happen? */
-					}
-				}
-			}
-			return (allDone) ? 1 : 0;
-		} else if (level == 0) {
-
-			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
-				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-				if (theChunk) {
-					/* Note this does not find the real chunk, only the chunk group.
-					 * We make an assumption that a chunk group is not larger than
-					 * a block.
-					 */
-					yaffs_SoftDeleteChunk(dev, theChunk);
-					yaffs_LoadLevel0Tnode(dev, tn, i, 0);
-				}
-
-			}
-			return 1;
-
-		}
-
-	}
-
-	return 1;
-
-}
-
-static void yaffs_SoftDeleteFile(yaffs_Object *obj)
-{
-	if (obj->deleted &&
-	    obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
-		if (obj->nDataChunks <= 0) {
-			/* Empty file with no duplicate object headers, just delete it immediately */
-			yaffs_FreeTnode(obj->myDev,
-					obj->variant.fileVariant.top);
-			obj->variant.fileVariant.top = NULL;
-			T(YAFFS_TRACE_TRACING,
-			  (TSTR("yaffs: Deleting empty file %d" TENDSTR),
-			   obj->objectId));
-			yaffs_DoGenericObjectDeletion(obj);
-		} else {
-			yaffs_SoftDeleteWorker(obj,
-					       obj->variant.fileVariant.top,
-					       obj->variant.fileVariant.
-					       topLevel, 0);
-			obj->softDeleted = 1;
-		}
-	}
-}
-
-/* Pruning removes any part of the file structure tree that is beyond the
- * bounds of the file (ie that does not point to chunks).
- *
- * A file should only get pruned when its size is reduced.
- *
- * Before pruning, the chunks must be pulled from the tree and the
- * level 0 tnode entries must be zeroed out.
- * Could also use this for file deletion, but that's probably better handled
- * by a special case.
- */
-
-static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
-				__u32 level, int del0)
-{
-	int i;
-	int hasData;
-
-	if (tn) {
-		hasData = 0;
-
-		for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) {
-			if (tn->internal[i] && level > 0) {
-				tn->internal[i] =
-				    yaffs_PruneWorker(dev, tn->internal[i],
-						      level - 1,
-						      (i == 0) ? del0 : 1);
-			}
-
-			if (tn->internal[i])
-				hasData++;
-		}
-
-		if (hasData == 0 && del0) {
-			/* Free and return NULL */
-
-			yaffs_FreeTnode(dev, tn);
-			tn = NULL;
-		}
-
-	}
-
-	return tn;
-
-}
-
-static int yaffs_PruneFileStructure(yaffs_Device *dev,
-				yaffs_FileStructure *fStruct)
-{
-	int i;
-	int hasData;
-	int done = 0;
-	yaffs_Tnode *tn;
-
-	if (fStruct->topLevel > 0) {
-		fStruct->top =
-		    yaffs_PruneWorker(dev, fStruct->top, fStruct->topLevel, 0);
-
-		/* Now we have a tree with all the non-zero branches NULL but the height
-		 * is the same as it was.
-		 * Let's see if we can trim internal tnodes to shorten the tree.
-		 * We can do this if only the 0th element in the tnode is in use
-		 * (ie all the non-zero are NULL)
-		 */
-
-		while (fStruct->topLevel && !done) {
-			tn = fStruct->top;
-
-			hasData = 0;
-			for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
-				if (tn->internal[i])
-					hasData++;
-			}
-
-			if (!hasData) {
-				fStruct->top = tn->internal[0];
-				fStruct->topLevel--;
-				yaffs_FreeTnode(dev, tn);
-			} else {
-				done = 1;
-			}
-		}
-	}
-
-	return YAFFS_OK;
-}
-
-/*-------------------- End of File Structure functions.-------------------*/
-
-/* yaffs_CreateFreeObjects creates a bunch more objects and
- * adds them to the object free list.
- */
-static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
-{
-	int i;
-	yaffs_Object *newObjects;
-	yaffs_ObjectList *list;
-
-	if (nObjects < 1)
-		return YAFFS_OK;
-
-	/* make these things */
-	newObjects = YMALLOC(nObjects * sizeof(yaffs_Object));
-	list = YMALLOC(sizeof(yaffs_ObjectList));
-
-	if (!newObjects || !list) {
-		if (newObjects)
-			YFREE(newObjects);
-		if (list)
-			YFREE(list);
-		T(YAFFS_TRACE_ALLOCATE,
-		  (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	/* Hook them into the free list */
-	for (i = 0; i < nObjects - 1; i++) {
-		newObjects[i].siblings.next =
-				(struct ylist_head *)(&newObjects[i + 1]);
-	}
-
-	newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
-	dev->freeObjects = newObjects;
-	dev->nFreeObjects += nObjects;
-	dev->nObjectsCreated += nObjects;
-
-	/* Now add this bunch of Objects to a list for freeing up. */
-
-	list->objects = newObjects;
-	list->next = dev->allocatedObjectList;
-	dev->allocatedObjectList = list;
-
-	return YAFFS_OK;
-}
-
-
-/* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
-static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
-{
-	yaffs_Object *tn = NULL;
-
-#ifdef VALGRIND_TEST
-	tn = YMALLOC(sizeof(yaffs_Object));
-#else
-	/* If there are none left make more */
-	if (!dev->freeObjects)
-		yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS);
-
-	if (dev->freeObjects) {
-		tn = dev->freeObjects;
-		dev->freeObjects =
-			(yaffs_Object *) (dev->freeObjects->siblings.next);
-		dev->nFreeObjects--;
-	}
-#endif
-	if (tn) {
-		/* Now sweeten it up... */
-
-		memset(tn, 0, sizeof(yaffs_Object));
-		tn->beingCreated = 1;
-
-		tn->myDev = dev;
-		tn->hdrChunk = 0;
-		tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
-		YINIT_LIST_HEAD(&(tn->hardLinks));
-		YINIT_LIST_HEAD(&(tn->hashLink));
-		YINIT_LIST_HEAD(&tn->siblings);
-
-
-		/* Now make the directory sane */
-		if (dev->rootDir) {
-			tn->parent = dev->rootDir;
-			ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children);
-		}
-
-		/* Add it to the lost and found directory.
-		 * NB Can't put root or lostNFound in lostNFound so
-		 * check if lostNFound exists first
-		 */
-		if (dev->lostNFoundDir)
-			yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
-
-		tn->beingCreated = 0;
-	}
-
-	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-
-	return tn;
-}
-
-static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
-					       __u32 mode)
-{
-
-	yaffs_Object *obj =
-	    yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
-	if (obj) {
-		obj->fake = 1;		/* it is fake so it might have no NAND presence... */
-		obj->renameAllowed = 0;	/* ... and we're not allowed to rename it... */
-		obj->unlinkAllowed = 0;	/* ... or unlink it */
-		obj->deleted = 0;
-		obj->unlinked = 0;
-		obj->yst_mode = mode;
-		obj->myDev = dev;
-		obj->hdrChunk = 0;	/* Not a valid chunk. */
-	}
-
-	return obj;
-
-}
-
-static void yaffs_UnhashObject(yaffs_Object *tn)
-{
-	int bucket;
-	yaffs_Device *dev = tn->myDev;
-
-	/* If it is still linked into the bucket list, free from the list */
-	if (!ylist_empty(&tn->hashLink)) {
-		ylist_del_init(&tn->hashLink);
-		bucket = yaffs_HashFunction(tn->objectId);
-		dev->objectBucket[bucket].count--;
-	}
-}
-
-/*  FreeObject frees up a Object and puts it back on the free list */
-static void yaffs_FreeObject(yaffs_Object *tn)
-{
-	yaffs_Device *dev = tn->myDev;
-
-#ifdef __KERNEL__
-	T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode));
-#endif
-
-	if (tn->parent)
-		YBUG();
-	if (!ylist_empty(&tn->siblings))
-		YBUG();
-
-
-#ifdef __KERNEL__
-	if (tn->myInode) {
-		/* We're still hooked up to a cached inode.
-		 * Don't delete now, but mark for later deletion
-		 */
-		tn->deferedFree = 1;
-		return;
-	}
-#endif
-
-	yaffs_UnhashObject(tn);
-
-#ifdef VALGRIND_TEST
-	YFREE(tn);
-#else
-	/* Link into the free list. */
-	tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
-	dev->freeObjects = tn;
-	dev->nFreeObjects++;
-#endif
-	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-}
-
-#ifdef __KERNEL__
-
-void yaffs_HandleDeferedFree(yaffs_Object *obj)
-{
-	if (obj->deferedFree)
-		yaffs_FreeObject(obj);
-}
-
-#endif
-
-static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
-{
-	/* Free the list of allocated Objects */
-
-	yaffs_ObjectList *tmp;
-
-	while (dev->allocatedObjectList) {
-		tmp = dev->allocatedObjectList->next;
-		YFREE(dev->allocatedObjectList->objects);
-		YFREE(dev->allocatedObjectList);
-
-		dev->allocatedObjectList = tmp;
-	}
-
-	dev->freeObjects = NULL;
-	dev->nFreeObjects = 0;
-}
-
-static void yaffs_InitialiseObjects(yaffs_Device *dev)
-{
-	int i;
-
-	dev->allocatedObjectList = NULL;
-	dev->freeObjects = NULL;
-	dev->nFreeObjects = 0;
-
-	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
-		YINIT_LIST_HEAD(&dev->objectBucket[i].list);
-		dev->objectBucket[i].count = 0;
-	}
-}
-
-static int yaffs_FindNiceObjectBucket(yaffs_Device *dev)
-{
-	static int x;
-	int i;
-	int l = 999;
-	int lowest = 999999;
-
-	/* First let's see if we can find one that's empty. */
-
-	for (i = 0; i < 10 && lowest > 0; i++) {
-		x++;
-		x %= YAFFS_NOBJECT_BUCKETS;
-		if (dev->objectBucket[x].count < lowest) {
-			lowest = dev->objectBucket[x].count;
-			l = x;
-		}
-
-	}
-
-	/* If we didn't find an empty list, then try
-	 * looking a bit further for a short one
-	 */
-
-	for (i = 0; i < 10 && lowest > 3; i++) {
-		x++;
-		x %= YAFFS_NOBJECT_BUCKETS;
-		if (dev->objectBucket[x].count < lowest) {
-			lowest = dev->objectBucket[x].count;
-			l = x;
-		}
-
-	}
-
-	return l;
-}
-
-static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)
-{
-	int bucket = yaffs_FindNiceObjectBucket(dev);
-
-	/* Now find an object value that has not already been taken
-	 * by scanning the list.
-	 */
-
-	int found = 0;
-	struct ylist_head *i;
-
-	__u32 n = (__u32) bucket;
-
-	/* yaffs_CheckObjectHashSanity();  */
-
-	while (!found) {
-		found = 1;
-		n += YAFFS_NOBJECT_BUCKETS;
-		if (1 || dev->objectBucket[bucket].count > 0) {
-			ylist_for_each(i, &dev->objectBucket[bucket].list) {
-				/* If there is already one in the list */
-				if (i && ylist_entry(i, yaffs_Object,
-						hashLink)->objectId == n) {
-					found = 0;
-				}
-			}
-		}
-	}
-
-	return n;
-}
-
-static void yaffs_HashObject(yaffs_Object *in)
-{
-	int bucket = yaffs_HashFunction(in->objectId);
-	yaffs_Device *dev = in->myDev;
-
-	ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
-	dev->objectBucket[bucket].count++;
-}
-
-yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number)
-{
-	int bucket = yaffs_HashFunction(number);
-	struct ylist_head *i;
-	yaffs_Object *in;
-
-	ylist_for_each(i, &dev->objectBucket[bucket].list) {
-		/* Look if it is in the list */
-		if (i) {
-			in = ylist_entry(i, yaffs_Object, hashLink);
-			if (in->objectId == number) {
-#ifdef __KERNEL__
-				/* Don't tell the VFS about this one if it is defered free */
-				if (in->deferedFree)
-					return NULL;
-#endif
-
-				return in;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
-				    yaffs_ObjectType type)
-{
-	yaffs_Object *theObject;
-	yaffs_Tnode *tn = NULL;
-
-	if (number < 0)
-		number = yaffs_CreateNewObjectNumber(dev);
-
-	if (type == YAFFS_OBJECT_TYPE_FILE) {
-		tn = yaffs_GetTnode(dev);
-		if (!tn)
-			return NULL;
-	}
-
-	theObject = yaffs_AllocateEmptyObject(dev);
-	if (!theObject){
-		if(tn)
-			yaffs_FreeTnode(dev,tn);
-		return NULL;
-	}
-
-
-	if (theObject) {
-		theObject->fake = 0;
-		theObject->renameAllowed = 1;
-		theObject->unlinkAllowed = 1;
-		theObject->objectId = number;
-		yaffs_HashObject(theObject);
-		theObject->variantType = type;
-#ifdef CONFIG_YAFFS_WINCE
-		yfsd_WinFileTimeNow(theObject->win_atime);
-		theObject->win_ctime[0] = theObject->win_mtime[0] =
-		    theObject->win_atime[0];
-		theObject->win_ctime[1] = theObject->win_mtime[1] =
-		    theObject->win_atime[1];
-
-#else
-
-		theObject->yst_atime = theObject->yst_mtime =
-		    theObject->yst_ctime = Y_CURRENT_TIME;
-#endif
-		switch (type) {
-		case YAFFS_OBJECT_TYPE_FILE:
-			theObject->variant.fileVariant.fileSize = 0;
-			theObject->variant.fileVariant.scannedFileSize = 0;
-			theObject->variant.fileVariant.shrinkSize = 0xFFFFFFFF;	/* max __u32 */
-			theObject->variant.fileVariant.topLevel = 0;
-			theObject->variant.fileVariant.top = tn;
-			break;
-		case YAFFS_OBJECT_TYPE_DIRECTORY:
-			YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
-					children);
-			break;
-		case YAFFS_OBJECT_TYPE_SYMLINK:
-		case YAFFS_OBJECT_TYPE_HARDLINK:
-		case YAFFS_OBJECT_TYPE_SPECIAL:
-			/* No action required */
-			break;
-		case YAFFS_OBJECT_TYPE_UNKNOWN:
-			/* todo this should not happen */
-			break;
-		}
-	}
-
-	return theObject;
-}
-
-static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
-						      int number,
-						      yaffs_ObjectType type)
-{
-	yaffs_Object *theObject = NULL;
-
-	if (number > 0)
-		theObject = yaffs_FindObjectByNumber(dev, number);
-
-	if (!theObject)
-		theObject = yaffs_CreateNewObject(dev, number, type);
-
-	return theObject;
-
-}
-
-
-static YCHAR *yaffs_CloneString(const YCHAR *str)
-{
-	YCHAR *newStr = NULL;
-
-	if (str && *str) {
-		newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR));
-		if (newStr)
-			yaffs_strcpy(newStr, str);
-	}
-
-	return newStr;
-
-}
-
-/*
- * Mknod (create) a new object.
- * equivalentObject only has meaning for a hard link;
- * aliasString only has meaning for a sumlink.
- * rdev only has meaning for devices (a subset of special objects)
- */
-
-static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
-				       yaffs_Object *parent,
-				       const YCHAR *name,
-				       __u32 mode,
-				       __u32 uid,
-				       __u32 gid,
-				       yaffs_Object *equivalentObject,
-				       const YCHAR *aliasString, __u32 rdev)
-{
-	yaffs_Object *in;
-	YCHAR *str = NULL;
-
-	yaffs_Device *dev = parent->myDev;
-
-	/* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
-	if (yaffs_FindObjectByName(parent, name))
-		return NULL;
-
-	if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
-		str = yaffs_CloneString(aliasString);
-		if (!str)
-			return NULL;
-	}
-
-	in = yaffs_CreateNewObject(dev, -1, type);
-
-	if (!in){
-		if(str)
-			YFREE(str);
-		return NULL;
-	}
-
-
-
-
-	if (in) {
-		in->hdrChunk = 0;
-		in->valid = 1;
-		in->variantType = type;
-
-		in->yst_mode = mode;
-
-#ifdef CONFIG_YAFFS_WINCE
-		yfsd_WinFileTimeNow(in->win_atime);
-		in->win_ctime[0] = in->win_mtime[0] = in->win_atime[0];
-		in->win_ctime[1] = in->win_mtime[1] = in->win_atime[1];
-
-#else
-		in->yst_atime = in->yst_mtime = in->yst_ctime = Y_CURRENT_TIME;
-
-		in->yst_rdev = rdev;
-		in->yst_uid = uid;
-		in->yst_gid = gid;
-#endif
-		in->nDataChunks = 0;
-
-		yaffs_SetObjectName(in, name);
-		in->dirty = 1;
-
-		yaffs_AddObjectToDirectory(parent, in);
-
-		in->myDev = parent->myDev;
-
-		switch (type) {
-		case YAFFS_OBJECT_TYPE_SYMLINK:
-			in->variant.symLinkVariant.alias = str;
-			break;
-		case YAFFS_OBJECT_TYPE_HARDLINK:
-			in->variant.hardLinkVariant.equivalentObject =
-				equivalentObject;
-			in->variant.hardLinkVariant.equivalentObjectId =
-				equivalentObject->objectId;
-			ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
-			break;
-		case YAFFS_OBJECT_TYPE_FILE:
-		case YAFFS_OBJECT_TYPE_DIRECTORY:
-		case YAFFS_OBJECT_TYPE_SPECIAL:
-		case YAFFS_OBJECT_TYPE_UNKNOWN:
-			/* do nothing */
-			break;
-		}
-
-		if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) {
-			/* Could not create the object header, fail the creation */
-			yaffs_DeleteObject(in);
-			in = NULL;
-		}
-
-		yaffs_UpdateParent(parent);
-	}
-
-	return in;
-}
-
-yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-			__u32 mode, __u32 uid, __u32 gid)
-{
-	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
-				uid, gid, NULL, NULL, 0);
-}
-
-yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-				__u32 mode, __u32 uid, __u32 gid)
-{
-	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
-				 mode, uid, gid, NULL, NULL, 0);
-}
-
-yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
-				__u32 mode, __u32 uid, __u32 gid, __u32 rdev)
-{
-	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
-				 uid, gid, NULL, NULL, rdev);
-}
-
-yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
-				__u32 mode, __u32 uid, __u32 gid,
-				const YCHAR *alias)
-{
-	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
-				uid, gid, NULL, alias, 0);
-}
-
-/* yaffs_Link returns the object id of the equivalent object.*/
-yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-			yaffs_Object *equivalentObject)
-{
-	/* Get the real object in case we were fed a hard link as an equivalent object */
-	equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-
-	if (yaffs_MknodObject
-	    (YAFFS_OBJECT_TYPE_HARDLINK, parent, name, 0, 0, 0,
-	     equivalentObject, NULL, 0)) {
-		return equivalentObject;
-	} else {
-		return NULL;
-	}
-
-}
-
-static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir,
-				const YCHAR *newName, int force, int shadows)
-{
-	int unlinkOp;
-	int deleteOp;
-
-	yaffs_Object *existingTarget;
-
-	if (newDir == NULL)
-		newDir = obj->parent;	/* use the old directory */
-
-	if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("tragedy: yaffs_ChangeObjectName: newDir is not a directory"
-		    TENDSTR)));
-		YBUG();
-	}
-
-	/* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
-	if (obj->myDev->isYaffs2)
-		unlinkOp = (newDir == obj->myDev->unlinkedDir);
-	else
-		unlinkOp = (newDir == obj->myDev->unlinkedDir
-			    && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
-
-	deleteOp = (newDir == obj->myDev->deletedDir);
-
-	existingTarget = yaffs_FindObjectByName(newDir, newName);
-
-	/* If the object is a file going into the unlinked directory,
-	 *   then it is OK to just stuff it in since duplicate names are allowed.
-	 *   else only proceed if the new name does not exist and if we're putting
-	 *   it into a directory.
-	 */
-	if ((unlinkOp ||
-	     deleteOp ||
-	     force ||
-	     (shadows > 0) ||
-	     !existingTarget) &&
-	    newDir->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) {
-		yaffs_SetObjectName(obj, newName);
-		obj->dirty = 1;
-
-		yaffs_AddObjectToDirectory(newDir, obj);
-
-		if (unlinkOp)
-			obj->unlinked = 1;
-
-		/* If it is a deletion then we mark it as a shrink for gc purposes. */
-		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows) >= 0)
-			return YAFFS_OK;
-	}
-
-	return YAFFS_FAIL;
-}
-
-int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-		yaffs_Object *newDir, const YCHAR *newName)
-{
-	yaffs_Object *obj = NULL;
-	yaffs_Object *existingTarget = NULL;
-	int force = 0;
-	int result;
-	yaffs_Device *dev;
-
-
-	if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-		YBUG();
-	if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-		YBUG();
-
-	dev = oldDir->myDev;
-
-#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
-	/* Special case for case insemsitive systems (eg. WinCE).
-	 * While look-up is case insensitive, the name isn't.
-	 * Therefore we might want to change x.txt to X.txt
-	*/
-	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0)
-		force = 1;
-#endif
-
-	if(yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
-		/* ENAMETOOLONG */
-		return YAFFS_FAIL;
-
-	obj = yaffs_FindObjectByName(oldDir, oldName);
-
-	if (obj && obj->renameAllowed) {
-
-		/* Now do the handling for an existing target, if there is one */
-
-		existingTarget = yaffs_FindObjectByName(newDir, newName);
-		if (existingTarget &&
-			existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-			!ylist_empty(&existingTarget->variant.directoryVariant.children)) {
-			/* There is a target that is a non-empty directory, so we fail */
-			return YAFFS_FAIL;	/* EEXIST or ENOTEMPTY */
-		} else if (existingTarget && existingTarget != obj) {
-			/* Nuke the target first, using shadowing,
-			 * but only if it isn't the same object.
-			 *
-			 * Note we must disable gc otherwise it can mess up the shadowing.
-			 *
-			 */
-			dev->isDoingGC=1;
-			yaffs_ChangeObjectName(obj, newDir, newName, force,
-						existingTarget->objectId);
-			existingTarget->isShadowed = 1;
-			yaffs_UnlinkObject(existingTarget);
-			dev->isDoingGC=0;
-		}
-
-		result = yaffs_ChangeObjectName(obj, newDir, newName, 1, 0);
-
-		yaffs_UpdateParent(oldDir);
-		if(newDir != oldDir)
-			yaffs_UpdateParent(newDir);
-		
-		return result;
-	}
-	return YAFFS_FAIL;
-}
-
-/*------------------------- Block Management and Page Allocation ----------------*/
-
-static int yaffs_InitialiseBlocks(yaffs_Device *dev)
-{
-	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
-
-	dev->blockInfo = NULL;
-	dev->chunkBits = NULL;
-
-	dev->allocationBlock = -1;	/* force it to get a new one */
-
-	/* If the first allocation strategy fails, thry the alternate one */
-	dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
-	if (!dev->blockInfo) {
-		dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
-		dev->blockInfoAlt = 1;
-	} else
-		dev->blockInfoAlt = 0;
-
-	if (dev->blockInfo) {
-		/* Set up dynamic blockinfo stuff. */
-		dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
-		dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
-		if (!dev->chunkBits) {
-			dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
-			dev->chunkBitsAlt = 1;
-		} else
-			dev->chunkBitsAlt = 0;
-	}
-
-	if (dev->blockInfo && dev->chunkBits) {
-		memset(dev->blockInfo, 0, nBlocks * sizeof(yaffs_BlockInfo));
-		memset(dev->chunkBits, 0, dev->chunkBitmapStride * nBlocks);
-		return YAFFS_OK;
-	}
-
-	return YAFFS_FAIL;
-}
-
-static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
-{
-	if (dev->blockInfoAlt && dev->blockInfo)
-		YFREE_ALT(dev->blockInfo);
-	else if (dev->blockInfo)
-		YFREE(dev->blockInfo);
-
-	dev->blockInfoAlt = 0;
-
-	dev->blockInfo = NULL;
-
-	if (dev->chunkBitsAlt && dev->chunkBits)
-		YFREE_ALT(dev->chunkBits);
-	else if (dev->chunkBits)
-		YFREE(dev->chunkBits);
-	dev->chunkBitsAlt = 0;
-	dev->chunkBits = NULL;
-}
-
-static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev,
-					yaffs_BlockInfo *bi)
-{
-	int i;
-	__u32 seq;
-	yaffs_BlockInfo *b;
-
-	if (!dev->isYaffs2)
-		return 1;	/* disqualification only applies to yaffs2. */
-
-	if (!bi->hasShrinkHeader)
-		return 1;	/* can gc */
-
-	/* Find the oldest dirty sequence number if we don't know it and save it
-	 * so we don't have to keep recomputing it.
-	 */
-	if (!dev->oldestDirtySequence) {
-		seq = dev->sequenceNumber;
-
-		for (i = dev->internalStartBlock; i <= dev->internalEndBlock;
-				i++) {
-			b = yaffs_GetBlockInfo(dev, i);
-			if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
-			    (b->pagesInUse - b->softDeletions) <
-			    dev->nChunksPerBlock && b->sequenceNumber < seq) {
-				seq = b->sequenceNumber;
-			}
-		}
-		dev->oldestDirtySequence = seq;
-	}
-
-	/* Can't do gc of this block if there are any blocks older than this one that have
-	 * discarded pages.
-	 */
-	return (bi->sequenceNumber <= dev->oldestDirtySequence);
-}
-
-/* FindDiretiestBlock is used to select the dirtiest block (or close enough)
- * for garbage collection.
- */
-
-static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
-					int aggressive)
-{
-	int b = dev->currentDirtyChecker;
-
-	int i;
-	int iterations;
-	int dirtiest = -1;
-	int pagesInUse = 0;
-	int prioritised = 0;
-	yaffs_BlockInfo *bi;
-	int pendingPrioritisedExist = 0;
-
-	/* First let's see if we need to grab a prioritised block */
-	if (dev->hasPendingPrioritisedGCs) {
-		for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) {
-
-			bi = yaffs_GetBlockInfo(dev, i);
-			/* yaffs_VerifyBlock(dev,bi,i); */
-
-			if (bi->gcPrioritise) {
-				pendingPrioritisedExist = 1;
-				if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
-					pagesInUse = (bi->pagesInUse - bi->softDeletions);
-					dirtiest = i;
-					prioritised = 1;
-					aggressive = 1; /* Fool the non-aggressive skip logiv below */
-				}
-			}
-		}
-
-		if (!pendingPrioritisedExist) /* None found, so we can clear this */
-			dev->hasPendingPrioritisedGCs = 0;
-	}
-
-	/* If we're doing aggressive GC then we are happy to take a less-dirty block, and
-	 * search harder.
-	 * else (we're doing a leasurely gc), then we only bother to do this if the
-	 * block has only a few pages in use.
-	 */
-
-	dev->nonAggressiveSkip--;
-
-	if (!aggressive && (dev->nonAggressiveSkip > 0))
-		return -1;
-
-	if (!prioritised)
-		pagesInUse =
-			(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
-
-	if (aggressive)
-		iterations =
-		    dev->internalEndBlock - dev->internalStartBlock + 1;
-	else {
-		iterations =
-		    dev->internalEndBlock - dev->internalStartBlock + 1;
-		iterations = iterations / 16;
-		if (iterations > 200)
-			iterations = 200;
-	}
-
-	for (i = 0; i <= iterations && pagesInUse > 0 && !prioritised; i++) {
-		b++;
-		if (b < dev->internalStartBlock || b > dev->internalEndBlock)
-			b = dev->internalStartBlock;
-
-		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
-			T(YAFFS_TRACE_ERROR,
-			  (TSTR("**>> Block %d is not valid" TENDSTR), b));
-			YBUG();
-		}
-
-		bi = yaffs_GetBlockInfo(dev, b);
-
-		if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-			(bi->pagesInUse - bi->softDeletions) < pagesInUse &&
-				yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
-			dirtiest = b;
-			pagesInUse = (bi->pagesInUse - bi->softDeletions);
-		}
-	}
-
-	dev->currentDirtyChecker = b;
-
-	if (dirtiest > 0) {
-		T(YAFFS_TRACE_GC,
-		  (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest,
-		   dev->nChunksPerBlock - pagesInUse, prioritised));
-	}
-
-	dev->oldestDirtySequence = 0;
-
-	if (dirtiest > 0)
-		dev->nonAggressiveSkip = 4;
-
-	return dirtiest;
-}
-
-static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
-{
-	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
-
-	int erasedOk = 0;
-
-	/* If the block is still healthy erase it and mark as clean.
-	 * If the block has had a data failure, then retire it.
-	 */
-
-	T(YAFFS_TRACE_GC | YAFFS_TRACE_ERASE,
-		(TSTR("yaffs_BlockBecameDirty block %d state %d %s"TENDSTR),
-		blockNo, bi->blockState, (bi->needsRetiring) ? "needs retiring" : ""));
-
-	bi->blockState = YAFFS_BLOCK_STATE_DIRTY;
-
-	if (!bi->needsRetiring) {
-		yaffs_InvalidateCheckpoint(dev);
-		erasedOk = yaffs_EraseBlockInNAND(dev, blockNo);
-		if (!erasedOk) {
-			dev->nErasureFailures++;
-			T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-			  (TSTR("**>> Erasure failed %d" TENDSTR), blockNo));
-		}
-	}
-
-	if (erasedOk &&
-	    ((yaffs_traceMask & YAFFS_TRACE_ERASE) || !yaffs_SkipVerification(dev))) {
-		int i;
-		for (i = 0; i < dev->nChunksPerBlock; i++) {
-			if (!yaffs_CheckChunkErased
-			    (dev, blockNo * dev->nChunksPerBlock + i)) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   (">>Block %d erasure supposedly OK, but chunk %d not erased"
-				    TENDSTR), blockNo, i));
-			}
-		}
-	}
-
-	if (erasedOk) {
-		/* Clean it up... */
-		bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
-		dev->nErasedBlocks++;
-		bi->pagesInUse = 0;
-		bi->softDeletions = 0;
-		bi->hasShrinkHeader = 0;
-		bi->skipErasedCheck = 1;  /* This is clean, so no need to check */
-		bi->gcPrioritise = 0;
-		yaffs_ClearChunkBits(dev, blockNo);
-
-		T(YAFFS_TRACE_ERASE,
-		  (TSTR("Erased block %d" TENDSTR), blockNo));
-	} else {
-		dev->nFreeChunks -= dev->nChunksPerBlock;	/* We lost a block of free space */
-
-		yaffs_RetireBlock(dev, blockNo);
-		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-		  (TSTR("**>> Block %d retired" TENDSTR), blockNo));
-	}
-}
-
-static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
-{
-	int i;
-
-	yaffs_BlockInfo *bi;
-
-	if (dev->nErasedBlocks < 1) {
-		/* Hoosterman we've got a problem.
-		 * Can't get space to gc
-		 */
-		T(YAFFS_TRACE_ERROR,
-		  (TSTR("yaffs tragedy: no more erased blocks" TENDSTR)));
-
-		return -1;
-	}
-
-	/* Find an empty block. */
-
-	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-		dev->allocationBlockFinder++;
-		if (dev->allocationBlockFinder < dev->internalStartBlock
-		    || dev->allocationBlockFinder > dev->internalEndBlock) {
-			dev->allocationBlockFinder = dev->internalStartBlock;
-		}
-
-		bi = yaffs_GetBlockInfo(dev, dev->allocationBlockFinder);
-
-		if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
-			bi->blockState = YAFFS_BLOCK_STATE_ALLOCATING;
-			dev->sequenceNumber++;
-			bi->sequenceNumber = dev->sequenceNumber;
-			dev->nErasedBlocks--;
-			T(YAFFS_TRACE_ALLOCATE,
-			  (TSTR("Allocated block %d, seq  %d, %d left" TENDSTR),
-			   dev->allocationBlockFinder, dev->sequenceNumber,
-			   dev->nErasedBlocks));
-			return dev->allocationBlockFinder;
-		}
-	}
-
-	T(YAFFS_TRACE_ALWAYS,
-	  (TSTR
-	   ("yaffs tragedy: no more erased blocks, but there should have been %d"
-	    TENDSTR), dev->nErasedBlocks));
-
-	return -1;
-}
-
-
-
-static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
-{
-	if (!dev->nCheckpointBlocksRequired &&
-	   dev->isYaffs2) {
-		/* Not a valid value so recalculate */
-		int nBytes = 0;
-		int nBlocks;
-		int devBlocks = (dev->endBlock - dev->startBlock + 1);
-		int tnodeSize;
-
-		tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-
-		if (tnodeSize < sizeof(yaffs_Tnode))
-			tnodeSize = sizeof(yaffs_Tnode);
-
-		nBytes += sizeof(yaffs_CheckpointValidity);
-		nBytes += sizeof(yaffs_CheckpointDevice);
-		nBytes += devBlocks * sizeof(yaffs_BlockInfo);
-		nBytes += devBlocks * dev->chunkBitmapStride;
-		nBytes += (sizeof(yaffs_CheckpointObject) + sizeof(__u32)) * (dev->nObjectsCreated - dev->nFreeObjects);
-		nBytes += (tnodeSize + sizeof(__u32)) * (dev->nTnodesCreated - dev->nFreeTnodes);
-		nBytes += sizeof(yaffs_CheckpointValidity);
-		nBytes += sizeof(__u32); /* checksum*/
-
-		/* Round up and add 2 blocks to allow for some bad blocks, so add 3 */
-
-		nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->nChunksPerBlock)) + 3;
-
-		dev->nCheckpointBlocksRequired = nBlocks;
-	}
-
-	return dev->nCheckpointBlocksRequired;
-}
-
-/*
- * Check if there's space to allocate...
- * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
- */
-static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev)
-{
-	int reservedChunks;
-	int reservedBlocks = dev->nReservedBlocks;
-	int checkpointBlocks;
-
-	if (dev->isYaffs2) {
-#ifdef CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE
-#else
-		checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) -
-				    dev->blocksInCheckpoint;
-		if (checkpointBlocks < 0)
-#endif
-			checkpointBlocks = 0;
-	} else {
-		checkpointBlocks = 0;
-	}
-
-	reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
-
-	return (dev->nFreeChunks > reservedChunks);
-}
-
-static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-		yaffs_BlockInfo **blockUsedPtr)
-{
-	int retVal;
-	yaffs_BlockInfo *bi;
-
-	if (dev->allocationBlock < 0) {
-		/* Get next block to allocate off */
-		dev->allocationBlock = yaffs_FindBlockForAllocation(dev);
-		dev->allocationPage = 0;
-	}
-
-	if (!useReserve && !yaffs_CheckSpaceForAllocation(dev)) {
-		/* Not enough space to allocate unless we're allowed to use the reserve. */
-		return -1;
-	}
-
-	if (dev->nErasedBlocks < dev->nReservedBlocks
-			&& dev->allocationPage == 0) {
-		T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
-	}
-
-	/* Next page please.... */
-	if (dev->allocationBlock >= 0) {
-		bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
-
-		retVal = (dev->allocationBlock * dev->nChunksPerBlock) +
-			dev->allocationPage;
-		bi->pagesInUse++;
-		yaffs_SetChunkBit(dev, dev->allocationBlock,
-				dev->allocationPage);
-
-		dev->allocationPage++;
-
-		dev->nFreeChunks--;
-
-		/* If the block is full set the state to full */
-		if (dev->allocationPage >= dev->nChunksPerBlock) {
-			bi->blockState = YAFFS_BLOCK_STATE_FULL;
-			dev->allocationBlock = -1;
-		}
-
-		if (blockUsedPtr)
-			*blockUsedPtr = bi;
-
-		return retVal;
-	}
-
-	T(YAFFS_TRACE_ERROR,
-			(TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
-
-	return -1;
-}
-
-static int yaffs_GetErasedChunks(yaffs_Device *dev)
-{
-	int n;
-
-	n = dev->nErasedBlocks * dev->nChunksPerBlock;
-
-	if (dev->allocationBlock > 0)
-		n += (dev->nChunksPerBlock - dev->allocationPage);
-
-	return n;
-
-}
-
-static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
-		int wholeBlock)
-{
-	int oldChunk;
-	int newChunk;
-	int markNAND;
-	int retVal = YAFFS_OK;
-	int cleanups = 0;
-	int i;
-	int isCheckpointBlock;
-	int matchingChunk;
-	int maxCopies;
-
-	int chunksBefore = yaffs_GetErasedChunks(dev);
-	int chunksAfter;
-
-	yaffs_ExtendedTags tags;
-
-	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, block);
-
-	yaffs_Object *object;
-
-	isCheckpointBlock = (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT);
-
-
-	T(YAFFS_TRACE_TRACING,
-			(TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
-			 block,
-			 bi->pagesInUse,
-			 bi->hasShrinkHeader,
-			 wholeBlock));
-
-	/*yaffs_VerifyFreeChunks(dev); */
-
-	if(bi->blockState == YAFFS_BLOCK_STATE_FULL)
-		bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
-	
-	bi->hasShrinkHeader = 0;	/* clear the flag so that the block can erase */
-
-	/* Take off the number of soft deleted entries because
-	 * they're going to get really deleted during GC.
-	 */
-	if(dev->gcChunk == 0) /* first time through for this block */
-		dev->nFreeChunks -= bi->softDeletions;
-
-	dev->isDoingGC = 1;
-
-	if (isCheckpointBlock ||
-			!yaffs_StillSomeChunkBits(dev, block)) {
-		T(YAFFS_TRACE_TRACING,
-				(TSTR
-				 ("Collecting block %d that has no chunks in use" TENDSTR),
-				 block));
-		yaffs_BlockBecameDirty(dev, block);
-	} else {
-
-		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-
-		yaffs_VerifyBlock(dev, bi, block);
-
-		maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10;
-		oldChunk = block * dev->nChunksPerBlock + dev->gcChunk;
-
-		for (/* init already done */;
-		     retVal == YAFFS_OK &&
-		     dev->gcChunk < dev->nChunksPerBlock &&
-		     (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) &&
-		     maxCopies > 0;
-		     dev->gcChunk++, oldChunk++) {
-			if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) {
-
-				/* This page is in use and might need to be copied off */
-
-				maxCopies--;
-
-				markNAND = 1;
-
-				yaffs_InitialiseTags(&tags);
-
-				yaffs_ReadChunkWithTagsFromNAND(dev, oldChunk,
-								buffer, &tags);
-
-				object =
-				    yaffs_FindObjectByNumber(dev,
-							     tags.objectId);
-
-				T(YAFFS_TRACE_GC_DETAIL,
-				  (TSTR
-				   ("Collecting chunk in block %d, %d %d %d " TENDSTR),
-				   dev->gcChunk, tags.objectId, tags.chunkId,
-				   tags.byteCount));
-
-				if (object && !yaffs_SkipVerification(dev)) {
-					if (tags.chunkId == 0)
-						matchingChunk = object->hdrChunk;
-					else if (object->softDeleted)
-						matchingChunk = oldChunk; /* Defeat the test */
-					else
-						matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL);
-
-					if (oldChunk != matchingChunk)
-						T(YAFFS_TRACE_ERROR,
-						  (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
-						  oldChunk, matchingChunk, tags.objectId, tags.chunkId));
-
-				}
-
-				if (!object) {
-					T(YAFFS_TRACE_ERROR,
-					  (TSTR
-					   ("page %d in gc has no object: %d %d %d "
-					    TENDSTR), oldChunk,
-					    tags.objectId, tags.chunkId, tags.byteCount));
-				}
-
-				if (object &&
-				    object->deleted &&
-				    object->softDeleted &&
-				    tags.chunkId != 0) {
-					/* Data chunk in a soft deleted file, throw it away
-					 * It's a soft deleted data chunk,
-					 * No need to copy this, just forget about it and
-					 * fix up the object.
-					 */
-
-					object->nDataChunks--;
-
-					if (object->nDataChunks <= 0) {
-						/* remeber to clean up the object */
-						dev->gcCleanupList[cleanups] =
-						    tags.objectId;
-						cleanups++;
-					}
-					markNAND = 0;
-				} else if (0) {
-					/* Todo object && object->deleted && object->nDataChunks == 0 */
-					/* Deleted object header with no data chunks.
-					 * Can be discarded and the file deleted.
-					 */
-					object->hdrChunk = 0;
-					yaffs_FreeTnode(object->myDev,
-							object->variant.
-							fileVariant.top);
-					object->variant.fileVariant.top = NULL;
-					yaffs_DoGenericObjectDeletion(object);
-
-				} else if (object) {
-					/* It's either a data chunk in a live file or
-					 * an ObjectHeader, so we're interested in it.
-					 * NB Need to keep the ObjectHeaders of deleted files
-					 * until the whole file has been deleted off
-					 */
-					tags.serialNumber++;
-
-					dev->nGCCopies++;
-
-					if (tags.chunkId == 0) {
-						/* It is an object Id,
-						 * We need to nuke the shrinkheader flags first
-						 * We no longer want the shrinkHeader flag since its work is done
-						 * and if it is left in place it will mess up scanning.
-						 */
-
-						yaffs_ObjectHeader *oh;
-						oh = (yaffs_ObjectHeader *)buffer;
-						oh->isShrink = 0;
-						tags.extraIsShrinkHeader = 0;
-
-						yaffs_VerifyObjectHeader(object, oh, &tags, 1);
-					}
-
-					newChunk =
-					    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &tags, 1);
-
-					if (newChunk < 0) {
-						retVal = YAFFS_FAIL;
-					} else {
-
-						/* Ok, now fix up the Tnodes etc. */
-
-						if (tags.chunkId == 0) {
-							/* It's a header */
-							object->hdrChunk =  newChunk;
-							object->serial =   tags.serialNumber;
-						} else {
-							/* It's a data chunk */
-							yaffs_PutChunkIntoFile
-							    (object,
-							     tags.chunkId,
-							     newChunk, 0);
-						}
-					}
-				}
-
-				if (retVal == YAFFS_OK)
-					yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
-
-			}
-		}
-
-		yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-
-
-		/* Do any required cleanups */
-		for (i = 0; i < cleanups; i++) {
-			/* Time to delete the file too */
-			object =
-			    yaffs_FindObjectByNumber(dev,
-						     dev->gcCleanupList[i]);
-			if (object) {
-				yaffs_FreeTnode(dev,
-						object->variant.fileVariant.
-						top);
-				object->variant.fileVariant.top = NULL;
-				T(YAFFS_TRACE_GC,
-				  (TSTR
-				   ("yaffs: About to finally delete object %d"
-				    TENDSTR), object->objectId));
-				yaffs_DoGenericObjectDeletion(object);
-				object->myDev->nDeletedFiles--;
-			}
-
-		}
-
-	}
-
-	yaffs_VerifyCollectedBlock(dev, bi, block);
-
-	chunksAfter = yaffs_GetErasedChunks(dev);
-	if (chunksBefore >= chunksAfter) {
-		T(YAFFS_TRACE_GC,
-		  (TSTR
-		   ("gc did not increase free chunks before %d after %d"
-		    TENDSTR), chunksBefore, chunksAfter));
-	}
-
-	/* If the gc completed then clear the current gcBlock so that we find another. */
-	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
-		dev->gcBlock = -1;
-		dev->gcChunk = 0;
-	}
-
-	dev->isDoingGC = 0;
-
-	return retVal;
-}
-
-/* New garbage collector
- * If we're very low on erased blocks then we do aggressive garbage collection
- * otherwise we do "leasurely" garbage collection.
- * Aggressive gc looks further (whole array) and will accept less dirty blocks.
- * Passive gc only inspects smaller areas and will only accept more dirty blocks.
- *
- * The idea is to help clear out space in a more spread-out manner.
- * Dunno if it really does anything useful.
- */
-static int yaffs_CheckGarbageCollection(yaffs_Device *dev)
-{
-	int block;
-	int aggressive;
-	int gcOk = YAFFS_OK;
-	int maxTries = 0;
-
-	int checkpointBlockAdjust;
-
-	if (dev->isDoingGC) {
-		/* Bail out so we don't get recursive gc */
-		return YAFFS_OK;
-	}
-
-	/* This loop should pass the first time.
-	 * We'll only see looping here if the erase of the collected block fails.
-	 */
-
-	do {
-		maxTries++;
-
-		checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-		if (checkpointBlockAdjust < 0)
-			checkpointBlockAdjust = 0;
-
-		if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) {
-			/* We need a block soon...*/
-			aggressive = 1;
-		} else {
-			/* We're in no hurry */
-			aggressive = 0;
-		}
-
-		if (dev->gcBlock <= 0) {
-			dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-			dev->gcChunk = 0;
-		}
-
-		block = dev->gcBlock;
-
-		if (block > 0) {
-			dev->garbageCollections++;
-			if (!aggressive)
-				dev->passiveGarbageCollections++;
-
-			T(YAFFS_TRACE_GC,
-			  (TSTR
-			   ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
-			   dev->nErasedBlocks, aggressive));
-
-			gcOk = yaffs_GarbageCollectBlock(dev, block, aggressive);
-		}
-
-		if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
-			T(YAFFS_TRACE_GC,
-			  (TSTR
-			   ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
-			    TENDSTR), dev->nErasedBlocks, maxTries, block));
-		}
-	} while ((dev->nErasedBlocks < dev->nReservedBlocks) &&
-		 (block > 0) &&
-		 (maxTries < 2));
-
-	return aggressive ? gcOk : YAFFS_OK;
-}
-
-/*-------------------------  TAGS --------------------------------*/
-
-static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
-			   int chunkInObject)
-{
-	return (tags->chunkId == chunkInObject &&
-		tags->objectId == objectId && !tags->chunkDeleted) ? 1 : 0;
-
-}
-
-
-/*-------------------- Data file manipulation -----------------*/
-
-static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-				 yaffs_ExtendedTags *tags)
-{
-	/*Get the Tnode, then get the level 0 offset chunk offset */
-	yaffs_Tnode *tn;
-	int theChunk = -1;
-	yaffs_ExtendedTags localTags;
-	int retVal = -1;
-
-	yaffs_Device *dev = in->myDev;
-
-	if (!tags) {
-		/* Passed a NULL, so use our own tags space */
-		tags = &localTags;
-	}
-
-	tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
-
-	if (tn) {
-		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
-
-		retVal =
-		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-					   chunkInInode);
-	}
-	return retVal;
-}
-
-static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode,
-					  yaffs_ExtendedTags *tags)
-{
-	/* Get the Tnode, then get the level 0 offset chunk offset */
-	yaffs_Tnode *tn;
-	int theChunk = -1;
-	yaffs_ExtendedTags localTags;
-
-	yaffs_Device *dev = in->myDev;
-	int retVal = -1;
-
-	if (!tags) {
-		/* Passed a NULL, so use our own tags space */
-		tags = &localTags;
-	}
-
-	tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
-
-	if (tn) {
-
-		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
-
-		retVal =
-		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-					   chunkInInode);
-
-		/* Delete the entry in the filestructure (if found) */
-		if (retVal != -1)
-			yaffs_LoadLevel0Tnode(dev, tn, chunkInInode, 0);
-	}
-
-	return retVal;
-}
-
-#ifdef YAFFS_PARANOID
-
-static int yaffs_CheckFileSanity(yaffs_Object *in)
-{
-	int chunk;
-	int nChunks;
-	int fSize;
-	int failed = 0;
-	int objId;
-	yaffs_Tnode *tn;
-	yaffs_Tags localTags;
-	yaffs_Tags *tags = &localTags;
-	int theChunk;
-	int chunkDeleted;
-
-	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-		return YAFFS_FAIL;
-
-	objId = in->objectId;
-	fSize = in->variant.fileVariant.fileSize;
-	nChunks =
-	    (fSize + in->myDev->nDataBytesPerChunk - 1) / in->myDev->nDataBytesPerChunk;
-
-	for (chunk = 1; chunk <= nChunks; chunk++) {
-		tn = yaffs_FindLevel0Tnode(in->myDev, &in->variant.fileVariant,
-					   chunk);
-
-		if (tn) {
-
-			theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
-
-			if (yaffs_CheckChunkBits
-			    (dev, theChunk / dev->nChunksPerBlock,
-			     theChunk % dev->nChunksPerBlock)) {
-
-				yaffs_ReadChunkTagsFromNAND(in->myDev, theChunk,
-							    tags,
-							    &chunkDeleted);
-				if (yaffs_TagsMatch
-				    (tags, in->objectId, chunk, chunkDeleted)) {
-					/* found it; */
-
-				}
-			} else {
-
-				failed = 1;
-			}
-
-		} else {
-			/* T(("No level 0 found for %d\n", chunk)); */
-		}
-	}
-
-	return failed ? YAFFS_FAIL : YAFFS_OK;
-}
-
-#endif
-
-static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-				  int chunkInNAND, int inScan)
-{
-	/* NB inScan is zero unless scanning.
-	 * For forward scanning, inScan is > 0;
-	 * for backward scanning inScan is < 0
-	 *
-	 * chunkInNAND = 0 is a dummy insert to make sure the tnodes are there.
-	 */
-
-	yaffs_Tnode *tn;
-	yaffs_Device *dev = in->myDev;
-	int existingChunk;
-	yaffs_ExtendedTags existingTags;
-	yaffs_ExtendedTags newTags;
-	unsigned existingSerial, newSerial;
-
-	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
-		/* Just ignore an attempt at putting a chunk into a non-file during scanning
-		 * If it is not during Scanning then something went wrong!
-		 */
-		if (!inScan) {
-			T(YAFFS_TRACE_ERROR,
-			  (TSTR
-			   ("yaffs tragedy:attempt to put data chunk into a non-file"
-			    TENDSTR)));
-			YBUG();
-		}
-
-		yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
-		return YAFFS_OK;
-	}
-
-	tn = yaffs_AddOrFindLevel0Tnode(dev,
-					&in->variant.fileVariant,
-					chunkInInode,
-					NULL);
-	if (!tn)
-		return YAFFS_FAIL;
-	
-	if(!chunkInNAND)
-		/* Dummy insert, bail now */
-		return YAFFS_OK;
-		
-
-	existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
-
-	if (inScan != 0) {
-		/* If we're scanning then we need to test for duplicates
-		 * NB This does not need to be efficient since it should only ever
-		 * happen when the power fails during a write, then only one
-		 * chunk should ever be affected.
-		 *
-		 * Correction for YAFFS2: This could happen quite a lot and we need to think about efficiency! TODO
-		 * Update: For backward scanning we don't need to re-read tags so this is quite cheap.
-		 */
-
-		if (existingChunk > 0) {
-			/* NB Right now existing chunk will not be real chunkId if the device >= 32MB
-			 *    thus we have to do a FindChunkInFile to get the real chunk id.
-			 *
-			 * We have a duplicate now we need to decide which one to use:
-			 *
-			 * Backwards scanning YAFFS2: The old one is what we use, dump the new one.
-			 * Forward scanning YAFFS2: The new one is what we use, dump the old one.
-			 * YAFFS1: Get both sets of tags and compare serial numbers.
-			 */
-
-			if (inScan > 0) {
-				/* Only do this for forward scanning */
-				yaffs_ReadChunkWithTagsFromNAND(dev,
-								chunkInNAND,
-								NULL, &newTags);
-
-				/* Do a proper find */
-				existingChunk =
-				    yaffs_FindChunkInFile(in, chunkInInode,
-							  &existingTags);
-			}
-
-			if (existingChunk <= 0) {
-				/*Hoosterman - how did this happen? */
-
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("yaffs tragedy: existing chunk < 0 in scan"
-				    TENDSTR)));
-
-			}
-
-			/* NB The deleted flags should be false, otherwise the chunks will
-			 * not be loaded during a scan
-			 */
-
-			if (inScan > 0) {
-				newSerial = newTags.serialNumber;
-				existingSerial = existingTags.serialNumber;
-			}
-
-			if ((inScan > 0) &&
-			    (in->myDev->isYaffs2 ||
-			     existingChunk <= 0 ||
-			     ((existingSerial + 1) & 3) == newSerial)) {
-				/* Forward scanning.
-				 * Use new
-				 * Delete the old one and drop through to update the tnode
-				 */
-				yaffs_DeleteChunk(dev, existingChunk, 1,
-						  __LINE__);
-			} else {
-				/* Backward scanning or we want to use the existing one
-				 * Use existing.
-				 * Delete the new one and return early so that the tnode isn't changed
-				 */
-				yaffs_DeleteChunk(dev, chunkInNAND, 1,
-						  __LINE__);
-				return YAFFS_OK;
-			}
-		}
-
-	}
-
-	if (existingChunk == 0)
-		in->nDataChunks++;
-
-	yaffs_LoadLevel0Tnode(dev, tn, chunkInInode, chunkInNAND);
-
-	return YAFFS_OK;
-}
-
-static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode,
-					__u8 *buffer)
-{
-	int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL);
-
-	if (chunkInNAND >= 0)
-		return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND,
-						buffer, NULL);
-	else {
-		T(YAFFS_TRACE_NANDACCESS,
-		  (TSTR("Chunk %d not found zero instead" TENDSTR),
-		   chunkInNAND));
-		/* get sane (zero) data if you read a hole */
-		memset(buffer, 0, in->myDev->nDataBytesPerChunk);
-		return 0;
-	}
-
-}
-
-void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
-{
-	int block;
-	int page;
-	yaffs_ExtendedTags tags;
-	yaffs_BlockInfo *bi;
-
-	if (chunkId <= 0)
-		return;
-
-	dev->nDeletions++;
-	block = chunkId / dev->nChunksPerBlock;
-	page = chunkId % dev->nChunksPerBlock;
-
-
-	if (!yaffs_CheckChunkBit(dev, block, page))
-		T(YAFFS_TRACE_VERIFY,
-			(TSTR("Deleting invalid chunk %d"TENDSTR),
-			 chunkId));
-
-	bi = yaffs_GetBlockInfo(dev, block);
-
-	T(YAFFS_TRACE_DELETION,
-	  (TSTR("line %d delete of chunk %d" TENDSTR), lyn, chunkId));
-
-	if (markNAND &&
-	    bi->blockState != YAFFS_BLOCK_STATE_COLLECTING && !dev->isYaffs2) {
-
-		yaffs_InitialiseTags(&tags);
-
-		tags.chunkDeleted = 1;
-
-		yaffs_WriteChunkWithTagsToNAND(dev, chunkId, NULL, &tags);
-		yaffs_HandleUpdateChunk(dev, chunkId, &tags);
-	} else {
-		dev->nUnmarkedDeletions++;
-	}
-
-	/* Pull out of the management area.
-	 * If the whole block became dirty, this will kick off an erasure.
-	 */
-	if (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING ||
-	    bi->blockState == YAFFS_BLOCK_STATE_FULL ||
-	    bi->blockState == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
-	    bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) {
-		dev->nFreeChunks++;
-
-		yaffs_ClearChunkBit(dev, block, page);
-
-		bi->pagesInUse--;
-
-		if (bi->pagesInUse == 0 &&
-		    !bi->hasShrinkHeader &&
-		    bi->blockState != YAFFS_BLOCK_STATE_ALLOCATING &&
-		    bi->blockState != YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-			yaffs_BlockBecameDirty(dev, block);
-		}
-
-	}
-
-}
-
-static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
-					const __u8 *buffer, int nBytes,
-					int useReserve)
-{
-	/* Find old chunk Need to do this to get serial number
-	 * Write new one and patch into tree.
-	 * Invalidate old tags.
-	 */
-
-	int prevChunkId;
-	yaffs_ExtendedTags prevTags;
-
-	int newChunkId;
-	yaffs_ExtendedTags newTags;
-
-	yaffs_Device *dev = in->myDev;
-
-	yaffs_CheckGarbageCollection(dev);
-
-	/* Get the previous chunk at this location in the file if it exists */
-	prevChunkId = yaffs_FindChunkInFile(in, chunkInInode, &prevTags);
-
-	/* Set up new tags */
-	yaffs_InitialiseTags(&newTags);
-
-	newTags.chunkId = chunkInInode;
-	newTags.objectId = in->objectId;
-	newTags.serialNumber =
-	    (prevChunkId > 0) ? prevTags.serialNumber + 1 : 1;
-	newTags.byteCount = nBytes;
-
-	if (nBytes < 1 || nBytes > dev->totalBytesPerChunk) {
-		T(YAFFS_TRACE_ERROR,
-		(TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
-		YBUG();
-	}
-	
-	/*
-	 * If there isn't already a chunk there then do a dummy
-	 * insert to make sue we have the desired tnode structure.
-	 */
-	if(prevChunkId < 1 &&
-		yaffs_PutChunkIntoFile(in, chunkInInode, 0, 0) != YAFFS_OK)
-		return -1;
-		
-	newChunkId =
-	    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
-					      useReserve);
-
-	if (newChunkId > 0) {
-		yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0);
-
-		if (prevChunkId > 0)
-			yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
-
-		yaffs_CheckFileSanity(in);
-	}
-	return newChunkId;
-
-}
-
-/* UpdateObjectHeader updates the header on NAND for an object.
- * If name is not NULL, then that new name is used.
- */
-int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
-			     int isShrink, int shadows)
-{
-
-	yaffs_BlockInfo *bi;
-
-	yaffs_Device *dev = in->myDev;
-
-	int prevChunkId;
-	int retVal = 0;
-	int result = 0;
-
-	int newChunkId;
-	yaffs_ExtendedTags newTags;
-	yaffs_ExtendedTags oldTags;
-
-	__u8 *buffer = NULL;
-	YCHAR oldName[YAFFS_MAX_NAME_LENGTH + 1];
-
-	yaffs_ObjectHeader *oh = NULL;
-
-	yaffs_strcpy(oldName, _Y("silly old name"));
-
-
-	if (!in->fake ||
-		in == dev->rootDir || /* The rootDir should also be saved */
-		force) {
-
-		yaffs_CheckGarbageCollection(dev);
-		yaffs_CheckObjectDetailsLoaded(in);
-
-		buffer = yaffs_GetTempBuffer(in->myDev, __LINE__);
-		oh = (yaffs_ObjectHeader *) buffer;
-
-		prevChunkId = in->hdrChunk;
-
-		if (prevChunkId > 0) {
-			result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId,
-							buffer, &oldTags);
-
-			yaffs_VerifyObjectHeader(in, oh, &oldTags, 0);
-
-			memcpy(oldName, oh->name, sizeof(oh->name));
-		}
-
-		memset(buffer, 0xFF, dev->nDataBytesPerChunk);
-
-		oh->type = in->variantType;
-		oh->yst_mode = in->yst_mode;
-		oh->shadowsObject = oh->inbandShadowsObject = shadows;
-
-#ifdef CONFIG_YAFFS_WINCE
-		oh->win_atime[0] = in->win_atime[0];
-		oh->win_ctime[0] = in->win_ctime[0];
-		oh->win_mtime[0] = in->win_mtime[0];
-		oh->win_atime[1] = in->win_atime[1];
-		oh->win_ctime[1] = in->win_ctime[1];
-		oh->win_mtime[1] = in->win_mtime[1];
-#else
-		oh->yst_uid = in->yst_uid;
-		oh->yst_gid = in->yst_gid;
-		oh->yst_atime = in->yst_atime;
-		oh->yst_mtime = in->yst_mtime;
-		oh->yst_ctime = in->yst_ctime;
-		oh->yst_rdev = in->yst_rdev;
-#endif
-		if (in->parent)
-			oh->parentObjectId = in->parent->objectId;
-		else
-			oh->parentObjectId = 0;
-
-		if (name && *name) {
-			memset(oh->name, 0, sizeof(oh->name));
-			yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
-		} else if (prevChunkId > 0)
-			memcpy(oh->name, oldName, sizeof(oh->name));
-		else
-			memset(oh->name, 0, sizeof(oh->name));
-
-		oh->isShrink = isShrink;
-
-		switch (in->variantType) {
-		case YAFFS_OBJECT_TYPE_UNKNOWN:
-			/* Should not happen */
-			break;
-		case YAFFS_OBJECT_TYPE_FILE:
-			oh->fileSize =
-			    (oh->parentObjectId == YAFFS_OBJECTID_DELETED
-			     || oh->parentObjectId ==
-			     YAFFS_OBJECTID_UNLINKED) ? 0 : in->variant.
-			    fileVariant.fileSize;
-			break;
-		case YAFFS_OBJECT_TYPE_HARDLINK:
-			oh->equivalentObjectId =
-			    in->variant.hardLinkVariant.equivalentObjectId;
-			break;
-		case YAFFS_OBJECT_TYPE_SPECIAL:
-			/* Do nothing */
-			break;
-		case YAFFS_OBJECT_TYPE_DIRECTORY:
-			/* Do nothing */
-			break;
-		case YAFFS_OBJECT_TYPE_SYMLINK:
-			yaffs_strncpy(oh->alias,
-				      in->variant.symLinkVariant.alias,
-				      YAFFS_MAX_ALIAS_LENGTH);
-			oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0;
-			break;
-		}
-
-		/* Tags */
-		yaffs_InitialiseTags(&newTags);
-		in->serial++;
-		newTags.chunkId = 0;
-		newTags.objectId = in->objectId;
-		newTags.serialNumber = in->serial;
-
-		/* Add extra info for file header */
-
-		newTags.extraHeaderInfoAvailable = 1;
-		newTags.extraParentObjectId = oh->parentObjectId;
-		newTags.extraFileLength = oh->fileSize;
-		newTags.extraIsShrinkHeader = oh->isShrink;
-		newTags.extraEquivalentObjectId = oh->equivalentObjectId;
-		newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
-		newTags.extraObjectType = in->variantType;
-
-		yaffs_VerifyObjectHeader(in, oh, &newTags, 1);
-
-		/* Create new chunk in NAND */
-		newChunkId =
-		    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
-						      (prevChunkId > 0) ? 1 : 0);
-
-		if (newChunkId >= 0) {
-
-			in->hdrChunk = newChunkId;
-
-			if (prevChunkId > 0) {
-				yaffs_DeleteChunk(dev, prevChunkId, 1,
-						  __LINE__);
-			}
-
-			if (!yaffs_ObjectHasCachedWriteData(in))
-				in->dirty = 0;
-
-			/* If this was a shrink, then mark the block that the chunk lives on */
-			if (isShrink) {
-				bi = yaffs_GetBlockInfo(in->myDev,
-					newChunkId / in->myDev->nChunksPerBlock);
-				bi->hasShrinkHeader = 1;
-			}
-
-		}
-
-		retVal = newChunkId;
-
-	}
-
-	if (buffer)
-		yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-
-	return retVal;
-}
-
-/*------------------------ Short Operations Cache ----------------------------------------
- *   In many situations where there is no high level buffering (eg WinCE) a lot of
- *   reads might be short sequential reads, and a lot of writes may be short
- *   sequential writes. eg. scanning/writing a jpeg file.
- *   In these cases, a short read/write cache can provide a huge perfomance benefit
- *   with dumb-as-a-rock code.
- *   In Linux, the page cache provides read buffering aand the short op cache provides write
- *   buffering.
- *
- *   There are a limited number (~10) of cache chunks per device so that we don't
- *   need a very intelligent search.
- */
-
-static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj)
-{
-	yaffs_Device *dev = obj->myDev;
-	int i;
-	yaffs_ChunkCache *cache;
-	int nCaches = obj->myDev->nShortOpCaches;
-
-	for (i = 0; i < nCaches; i++) {
-		cache = &dev->srCache[i];
-		if (cache->object == obj &&
-		    cache->dirty)
-			return 1;
-	}
-
-	return 0;
-}
-
-
-static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
-{
-	yaffs_Device *dev = obj->myDev;
-	int lowest = -99;	/* Stop compiler whining. */
-	int i;
-	yaffs_ChunkCache *cache;
-	int chunkWritten = 0;
-	int nCaches = obj->myDev->nShortOpCaches;
-
-	if (nCaches > 0) {
-		do {
-			cache = NULL;
-
-			/* Find the dirty cache for this object with the lowest chunk id. */
-			for (i = 0; i < nCaches; i++) {
-				if (dev->srCache[i].object == obj &&
-				    dev->srCache[i].dirty) {
-					if (!cache
-					    || dev->srCache[i].chunkId <
-					    lowest) {
-						cache = &dev->srCache[i];
-						lowest = cache->chunkId;
-					}
-				}
-			}
-
-			if (cache && !cache->locked) {
-				/* Write it out and free it up */
-
-				chunkWritten =
-				    yaffs_WriteChunkDataToObject(cache->object,
-								 cache->chunkId,
-								 cache->data,
-								 cache->nBytes,
-								 1);
-				cache->dirty = 0;
-				cache->object = NULL;
-			}
-
-		} while (cache && chunkWritten > 0);
-
-		if (cache) {
-			/* Hoosterman, disk full while writing cache out. */
-			T(YAFFS_TRACE_ERROR,
-			  (TSTR("yaffs tragedy: no space during cache write" TENDSTR)));
-
-		}
-	}
-
-}
-
-/*yaffs_FlushEntireDeviceCache(dev)
- *
- *
- */
-
-void yaffs_FlushEntireDeviceCache(yaffs_Device *dev)
-{
-	yaffs_Object *obj;
-	int nCaches = dev->nShortOpCaches;
-	int i;
-
-	/* Find a dirty object in the cache and flush it...
-	 * until there are no further dirty objects.
-	 */
-	do {
-		obj = NULL;
-		for (i = 0; i < nCaches && !obj; i++) {
-			if (dev->srCache[i].object &&
-			    dev->srCache[i].dirty)
-				obj = dev->srCache[i].object;
-
-		}
-		if (obj)
-			yaffs_FlushFilesChunkCache(obj);
-
-	} while (obj);
-
-}
-
-
-/* Grab us a cache chunk for use.
- * First look for an empty one.
- * Then look for the least recently used non-dirty one.
- * Then look for the least recently used dirty one...., flush and look again.
- */
-static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)
-{
-	int i;
-
-	if (dev->nShortOpCaches > 0) {
-		for (i = 0; i < dev->nShortOpCaches; i++) {
-			if (!dev->srCache[i].object)
-				return &dev->srCache[i];
-		}
-	}
-
-	return NULL;
-}
-
-static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
-{
-	yaffs_ChunkCache *cache;
-	yaffs_Object *theObj;
-	int usage;
-	int i;
-	int pushout;
-
-	if (dev->nShortOpCaches > 0) {
-		/* Try find a non-dirty one... */
-
-		cache = yaffs_GrabChunkCacheWorker(dev);
-
-		if (!cache) {
-			/* They were all dirty, find the last recently used object and flush
-			 * its cache, then  find again.
-			 * NB what's here is not very accurate, we actually flush the object
-			 * the last recently used page.
-			 */
-
-			/* With locking we can't assume we can use entry zero */
-
-			theObj = NULL;
-			usage = -1;
-			cache = NULL;
-			pushout = -1;
-
-			for (i = 0; i < dev->nShortOpCaches; i++) {
-				if (dev->srCache[i].object &&
-				    !dev->srCache[i].locked &&
-				    (dev->srCache[i].lastUse < usage || !cache)) {
-					usage = dev->srCache[i].lastUse;
-					theObj = dev->srCache[i].object;
-					cache = &dev->srCache[i];
-					pushout = i;
-				}
-			}
-
-			if (!cache || cache->dirty) {
-				/* Flush and try again */
-				yaffs_FlushFilesChunkCache(theObj);
-				cache = yaffs_GrabChunkCacheWorker(dev);
-			}
-
-		}
-		return cache;
-	} else
-		return NULL;
-
-}
-
-/* Find a cached chunk */
-static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj,
-					      int chunkId)
-{
-	yaffs_Device *dev = obj->myDev;
-	int i;
-	if (dev->nShortOpCaches > 0) {
-		for (i = 0; i < dev->nShortOpCaches; i++) {
-			if (dev->srCache[i].object == obj &&
-			    dev->srCache[i].chunkId == chunkId) {
-				dev->cacheHits++;
-
-				return &dev->srCache[i];
-			}
-		}
-	}
-	return NULL;
-}
-
-/* Mark the chunk for the least recently used algorithym */
-static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache,
-				int isAWrite)
-{
-
-	if (dev->nShortOpCaches > 0) {
-		if (dev->srLastUse < 0 || dev->srLastUse > 100000000) {
-			/* Reset the cache usages */
-			int i;
-			for (i = 1; i < dev->nShortOpCaches; i++)
-				dev->srCache[i].lastUse = 0;
-
-			dev->srLastUse = 0;
-		}
-
-		dev->srLastUse++;
-
-		cache->lastUse = dev->srLastUse;
-
-		if (isAWrite)
-			cache->dirty = 1;
-	}
-}
-
-/* Invalidate a single cache page.
- * Do this when a whole page gets written,
- * ie the short cache for this page is no longer valid.
- */
-static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)
-{
-	if (object->myDev->nShortOpCaches > 0) {
-		yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId);
-
-		if (cache)
-			cache->object = NULL;
-	}
-}
-
-/* Invalidate all the cache pages associated with this object
- * Do this whenever ther file is deleted or resized.
- */
-static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
-{
-	int i;
-	yaffs_Device *dev = in->myDev;
-
-	if (dev->nShortOpCaches > 0) {
-		/* Invalidate it. */
-		for (i = 0; i < dev->nShortOpCaches; i++) {
-			if (dev->srCache[i].object == in)
-				dev->srCache[i].object = NULL;
-		}
-	}
-}
-
-/*--------------------- Checkpointing --------------------*/
-
-#ifdef CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE
-#else
-static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head)
-{
-	yaffs_CheckpointValidity cp;
-
-	memset(&cp, 0, sizeof(cp));
-
-	cp.structType = sizeof(cp);
-	cp.magic = YAFFS_MAGIC;
-	cp.version = YAFFS_CHECKPOINT_VERSION;
-	cp.head = (head) ? 1 : 0;
-
-	return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ?
-		1 : 0;
-}
-
-static int yaffs_ReadCheckpointValidityMarker(yaffs_Device *dev, int head)
-{
-	yaffs_CheckpointValidity cp;
-	int ok;
-
-	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-
-	if (ok)
-		ok = (cp.structType == sizeof(cp)) &&
-		     (cp.magic == YAFFS_MAGIC) &&
-		     (cp.version == YAFFS_CHECKPOINT_VERSION) &&
-		     (cp.head == ((head) ? 1 : 0));
-	return ok ? 1 : 0;
-}
-
-static void yaffs_DeviceToCheckpointDevice(yaffs_CheckpointDevice *cp,
-					   yaffs_Device *dev)
-{
-	cp->nErasedBlocks = dev->nErasedBlocks;
-	cp->allocationBlock = dev->allocationBlock;
-	cp->allocationPage = dev->allocationPage;
-	cp->nFreeChunks = dev->nFreeChunks;
-
-	cp->nDeletedFiles = dev->nDeletedFiles;
-	cp->nUnlinkedFiles = dev->nUnlinkedFiles;
-	cp->nBackgroundDeletions = dev->nBackgroundDeletions;
-	cp->sequenceNumber = dev->sequenceNumber;
-	cp->oldestDirtySequence = dev->oldestDirtySequence;
-
-}
-
-static void yaffs_CheckpointDeviceToDevice(yaffs_Device *dev,
-					   yaffs_CheckpointDevice *cp)
-{
-	dev->nErasedBlocks = cp->nErasedBlocks;
-	dev->allocationBlock = cp->allocationBlock;
-	dev->allocationPage = cp->allocationPage;
-	dev->nFreeChunks = cp->nFreeChunks;
-
-	dev->nDeletedFiles = cp->nDeletedFiles;
-	dev->nUnlinkedFiles = cp->nUnlinkedFiles;
-	dev->nBackgroundDeletions = cp->nBackgroundDeletions;
-	dev->sequenceNumber = cp->sequenceNumber;
-	dev->oldestDirtySequence = cp->oldestDirtySequence;
-}
-
-
-static int yaffs_WriteCheckpointDevice(yaffs_Device *dev)
-{
-	yaffs_CheckpointDevice cp;
-	__u32 nBytes;
-	__u32 nBlocks = (dev->internalEndBlock - dev->internalStartBlock + 1);
-
-	int ok;
-
-	/* Write device runtime values*/
-	yaffs_DeviceToCheckpointDevice(&cp, dev);
-	cp.structType = sizeof(cp);
-
-	ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
-
-	/* Write block info */
-	if (ok) {
-		nBytes = nBlocks * sizeof(yaffs_BlockInfo);
-		ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes);
-	}
-
-	/* Write chunk bits */
-	if (ok) {
-		nBytes = nBlocks * dev->chunkBitmapStride;
-		ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes);
-	}
-	return	 ok ? 1 : 0;
-
-}
-
-static int yaffs_ReadCheckpointDevice(yaffs_Device *dev)
-{
-	yaffs_CheckpointDevice cp;
-	__u32 nBytes;
-	__u32 nBlocks = (dev->internalEndBlock - dev->internalStartBlock + 1);
-
-	int ok;
-
-	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-	if (!ok)
-		return 0;
-
-	if (cp.structType != sizeof(cp))
-		return 0;
-
-
-	yaffs_CheckpointDeviceToDevice(dev, &cp);
-
-	nBytes = nBlocks * sizeof(yaffs_BlockInfo);
-
-	ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes);
-
-	if (!ok)
-		return 0;
-	nBytes = nBlocks * dev->chunkBitmapStride;
-
-	ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes);
-
-	return ok ? 1 : 0;
-}
-
-static void yaffs_ObjectToCheckpointObject(yaffs_CheckpointObject *cp,
-					   yaffs_Object *obj)
-{
-
-	cp->objectId = obj->objectId;
-	cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
-	cp->hdrChunk = obj->hdrChunk;
-	cp->variantType = obj->variantType;
-	cp->deleted = obj->deleted;
-	cp->softDeleted = obj->softDeleted;
-	cp->unlinked = obj->unlinked;
-	cp->fake = obj->fake;
-	cp->renameAllowed = obj->renameAllowed;
-	cp->unlinkAllowed = obj->unlinkAllowed;
-	cp->serial = obj->serial;
-	cp->nDataChunks = obj->nDataChunks;
-
-	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-		cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
-	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-		cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
-}
-
-static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp)
-{
-
-	yaffs_Object *parent;
-
-	if (obj->variantType != cp->variantType) {
-		T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d "
-			TCONT("chunk %d does not match existing object type %d")
-			TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk,
-			obj->variantType));
-		return 0;
-	}
-
-	obj->objectId = cp->objectId;
-
-	if (cp->parentId)
-		parent = yaffs_FindOrCreateObjectByNumber(
-					obj->myDev,
-					cp->parentId,
-					YAFFS_OBJECT_TYPE_DIRECTORY);
-	else
-		parent = NULL;
-
-	if (parent) {
-		if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-			T(YAFFS_TRACE_ALWAYS, (TSTR("Checkpoint read object %d parent %d type %d"
-				TCONT(" chunk %d Parent type, %d, not directory")
-				TENDSTR),
-				cp->objectId, cp->parentId, cp->variantType,
-				cp->hdrChunk, parent->variantType));
-			return 0;
-		}
-		yaffs_AddObjectToDirectory(parent, obj);
-	}
-
-	obj->hdrChunk = cp->hdrChunk;
-	obj->variantType = cp->variantType;
-	obj->deleted = cp->deleted;
-	obj->softDeleted = cp->softDeleted;
-	obj->unlinked = cp->unlinked;
-	obj->fake = cp->fake;
-	obj->renameAllowed = cp->renameAllowed;
-	obj->unlinkAllowed = cp->unlinkAllowed;
-	obj->serial = cp->serial;
-	obj->nDataChunks = cp->nDataChunks;
-
-	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-		obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
-	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-		obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
-
-	if (obj->hdrChunk > 0)
-		obj->lazyLoaded = 1;
-	return 1;
-}
-
-
-
-static int yaffs_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn,
-					__u32 level, int chunkOffset)
-{
-	int i;
-	yaffs_Device *dev = in->myDev;
-	int ok = 1;
-	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-
-	if (tnodeSize < sizeof(yaffs_Tnode))
-		tnodeSize = sizeof(yaffs_Tnode);
-
-
-	if (tn) {
-		if (level > 0) {
-
-			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
-				if (tn->internal[i]) {
-					ok = yaffs_CheckpointTnodeWorker(in,
-							tn->internal[i],
-							level - 1,
-							(chunkOffset<<YAFFS_TNODES_INTERNAL_BITS) + i);
-				}
-			}
-		} else if (level == 0) {
-			__u32 baseOffset = chunkOffset <<  YAFFS_TNODES_LEVEL0_BITS;
-			ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset));
-			if (ok)
-				ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize);
-		}
-	}
-
-	return ok;
-
-}
-
-static int yaffs_WriteCheckpointTnodes(yaffs_Object *obj)
-{
-	__u32 endMarker = ~0;
-	int ok = 1;
-
-	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-		ok = yaffs_CheckpointTnodeWorker(obj,
-					    obj->variant.fileVariant.top,
-					    obj->variant.fileVariant.topLevel,
-					    0);
-		if (ok)
-			ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) ==
-				sizeof(endMarker));
-	}
-
-	return ok ? 1 : 0;
-}
-
-static int yaffs_ReadCheckpointTnodes(yaffs_Object *obj)
-{
-	__u32 baseChunk;
-	int ok = 1;
-	yaffs_Device *dev = obj->myDev;
-	yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant;
-	yaffs_Tnode *tn;
-	int nread = 0;
-	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-
-	if (tnodeSize < sizeof(yaffs_Tnode))
-		tnodeSize = sizeof(yaffs_Tnode);
-
-	ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
-
-	while (ok && (~baseChunk)) {
-		nread++;
-		/* Read level 0 tnode */
-
-
-		tn = yaffs_GetTnodeRaw(dev);
-		if (tn)
-			ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize);
-		else
-			ok = 0;
-
-		if (tn && ok)
-			ok = yaffs_AddOrFindLevel0Tnode(dev,
-							fileStructPtr,
-							baseChunk,
-							tn) ? 1 : 0;
-
-		if (ok)
-			ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
-
-	}
-
-	T(YAFFS_TRACE_CHECKPOINT, (
-		TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
-		nread, baseChunk, ok));
-
-	return ok ? 1 : 0;
-}
-
-
-static int yaffs_WriteCheckpointObjects(yaffs_Device *dev)
-{
-	yaffs_Object *obj;
-	yaffs_CheckpointObject cp;
-	int i;
-	int ok = 1;
-	struct ylist_head *lh;
-
-
-	/* Iterate through the objects in each hash entry,
-	 * dumping them to the checkpointing stream.
-	 */
-
-	for (i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++) {
-		ylist_for_each(lh, &dev->objectBucket[i].list) {
-			if (lh) {
-				obj = ylist_entry(lh, yaffs_Object, hashLink);
-				if (!obj->deferedFree) {
-					yaffs_ObjectToCheckpointObject(&cp, obj);
-					cp.structType = sizeof(cp);
-
-					T(YAFFS_TRACE_CHECKPOINT, (
-						TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR),
-						cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, (unsigned) obj));
-
-					ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
-
-					if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-						ok = yaffs_WriteCheckpointTnodes(obj);
-				}
-			}
-		}
-	}
-
-	/* Dump end of list */
-	memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject));
-	cp.structType = sizeof(cp);
-
-	if (ok)
-		ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
-
-	return ok ? 1 : 0;
-}
-
-static int yaffs_ReadCheckpointObjects(yaffs_Device *dev)
-{
-	yaffs_Object *obj;
-	yaffs_CheckpointObject cp;
-	int ok = 1;
-	int done = 0;
-	yaffs_Object *hardList = NULL;
-
-	while (ok && !done) {
-		ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-		if (cp.structType != sizeof(cp)) {
-			T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %u ok %d"TENDSTR),
-				cp.structType, (unsigned)(sizeof(cp)), ok));
-			ok = 0;
-		}
-
-		T(YAFFS_TRACE_CHECKPOINT, (TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
-			cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk));
-
-		if (ok && cp.objectId == ~0)
-			done = 1;
-		else if (ok) {
-			obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType);
-			if (obj) {
-				ok = yaffs_CheckpointObjectToObject(obj, &cp);
-				if (!ok)
-					break;
-				if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-					ok = yaffs_ReadCheckpointTnodes(obj);
-				} else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-					obj->hardLinks.next =
-						(struct ylist_head *) hardList;
-					hardList = obj;
-				}
-			} else
-				ok = 0;
-		}
-	}
-
-	if (ok)
-		yaffs_HardlinkFixup(dev, hardList);
-
-	return ok ? 1 : 0;
-}
-
-static int yaffs_WriteCheckpointSum(yaffs_Device *dev)
-{
-	__u32 checkpointSum;
-	int ok;
-
-	yaffs_GetCheckpointSum(dev, &checkpointSum);
-
-	ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum));
-
-	if (!ok)
-		return 0;
-
-	return 1;
-}
-
-static int yaffs_ReadCheckpointSum(yaffs_Device *dev)
-{
-	__u32 checkpointSum0;
-	__u32 checkpointSum1;
-	int ok;
-
-	yaffs_GetCheckpointSum(dev, &checkpointSum0);
-
-	ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1));
-
-	if (!ok)
-		return 0;
-
-	if (checkpointSum0 != checkpointSum1)
-		return 0;
-
-	return 1;
-}
-
-static int yaffs_WriteCheckpointData(yaffs_Device *dev)
-{
-	int ok = 1;
-
-	if (dev->skipCheckpointWrite || !dev->isYaffs2) {
-		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR)));
-		ok = 0;
-	}
-	if (ok)
-		ok = yaffs_CheckpointOpen(dev, 1);
-
-	if (ok) {
-		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-		ok = yaffs_WriteCheckpointValidityMarker(dev, 1);
-	}
-	if (ok) {
-		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR)));
-		ok = yaffs_WriteCheckpointDevice(dev);
-	}
-	if (ok) {
-		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR)));
-		ok = yaffs_WriteCheckpointObjects(dev);
-	}
-	if (ok) {
-		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-		ok = yaffs_WriteCheckpointValidityMarker(dev, 0);
-	}
-
-	if (ok)
-		ok = yaffs_WriteCheckpointSum(dev);
-
-	if (!yaffs_CheckpointClose(dev))
-		ok = 0;
-
-	if (ok)
-		dev->isCheckpointed = 1;
-	else
-		dev->isCheckpointed = 0;
-
-	return dev->isCheckpointed;
-}
-
-static int yaffs_ReadCheckpointData(yaffs_Device *dev)
-{
-	int ok = 1;
-
-	if (dev->skipCheckpointRead || !dev->isYaffs2) {
-		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR)));
-		ok = 0;
-	}
-
-	if (ok)
-		ok = yaffs_CheckpointOpen(dev, 0); /* open for read */
-
-	if (ok) {
-		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-		ok = yaffs_ReadCheckpointValidityMarker(dev, 1);
-	}
-	if (ok) {
-		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR)));
-		ok = yaffs_ReadCheckpointDevice(dev);
-	}
-	if (ok) {
-		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR)));
-		ok = yaffs_ReadCheckpointObjects(dev);
-	}
-	if (ok) {
-		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-		ok = yaffs_ReadCheckpointValidityMarker(dev, 0);
-	}
-
-	if (ok) {
-		ok = yaffs_ReadCheckpointSum(dev);
-		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok));
-	}
-
-	if (!yaffs_CheckpointClose(dev))
-		ok = 0;
-
-	if (ok)
-		dev->isCheckpointed = 1;
-	else
-		dev->isCheckpointed = 0;
-
-	return ok ? 1 : 0;
-
-}
-#endif // !OMIT_YAFFS2_CODE
-
-static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
-{
-	if (dev->isCheckpointed ||
-			dev->blocksInCheckpoint > 0) {
-		dev->isCheckpointed = 0;
-		yaffs_CheckpointInvalidateStream(dev);
-		if (dev->superBlock && dev->markSuperBlockDirty)
-			dev->markSuperBlockDirty(dev->superBlock);
-	}
-}
-
-
-int yaffs_CheckpointSave(yaffs_Device *dev)
-{
-	T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
-
-	yaffs_VerifyObjects(dev);
-	yaffs_VerifyBlocks(dev);
-	yaffs_VerifyFreeChunks(dev);
-
-	if (!dev->isCheckpointed) {
-		yaffs_InvalidateCheckpoint(dev);
-#ifdef CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE
-#else
-		yaffs_WriteCheckpointData(dev);
-#endif
-	}
-
-	T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
-
-	return dev->isCheckpointed;
-}
-
-#ifdef CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE
-#else
-int yaffs_CheckpointRestore(yaffs_Device *dev)
-{
-	int retval;
-	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
-
-	retval = yaffs_ReadCheckpointData(dev);
-
-	if (dev->isCheckpointed) {
-		yaffs_VerifyObjects(dev);
-		yaffs_VerifyBlocks(dev);
-		yaffs_VerifyFreeChunks(dev);
-	}
-
-	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
-
-	return retval;
-}
-#endif
-
-/*--------------------- File read/write ------------------------
- * Read and write have very similar structures.
- * In general the read/write has three parts to it
- * An incomplete chunk to start with (if the read/write is not chunk-aligned)
- * Some complete chunks
- * An incomplete chunk to end off with
- *
- * Curve-balls: the first chunk might also be the last chunk.
- */
-
-int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
-			int nBytes)
-{
-
-	int chunk;
-	__u32 start;
-	int nToCopy;
-	int n = nBytes;
-	int nDone = 0;
-	yaffs_ChunkCache *cache;
-
-	yaffs_Device *dev;
-
-	dev = in->myDev;
-
-	while (n > 0) {
-		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-		/* start = offset % dev->nDataBytesPerChunk; */
-		yaffs_AddrToChunk(dev, offset, &chunk, &start);
-		chunk++;
-
-		/* OK now check for the curveball where the start and end are in
-		 * the same chunk.
-		 */
-		if ((start + n) < dev->nDataBytesPerChunk)
-			nToCopy = n;
-		else
-			nToCopy = dev->nDataBytesPerChunk - start;
-
-		cache = yaffs_FindChunkCache(in, chunk);
-
-		/* If the chunk is already in the cache or it is less than a whole chunk
-		 * or we're using inband tags then use the cache (if there is caching)
-		 * else bypass the cache.
-		 */
-		if (cache || nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
-			if (dev->nShortOpCaches > 0) {
-
-				/* If we can't find the data in the cache, then load it up. */
-
-				if (!cache) {
-					cache = yaffs_GrabChunkCache(in->myDev);
-					cache->object = in;
-					cache->chunkId = chunk;
-					cache->dirty = 0;
-					cache->locked = 0;
-					yaffs_ReadChunkDataFromObject(in, chunk,
-								      cache->
-								      data);
-					cache->nBytes = 0;
-				}
-
-				yaffs_UseChunkCache(dev, cache, 0);
-
-				cache->locked = 1;
-
-
-				memcpy(buffer, &cache->data[start], nToCopy);
-
-				cache->locked = 0;
-			} else {
-				/* Read into the local buffer then copy..*/
-
-				__u8 *localBuffer =
-				    yaffs_GetTempBuffer(dev, __LINE__);
-				yaffs_ReadChunkDataFromObject(in, chunk,
-							      localBuffer);
-
-				memcpy(buffer, &localBuffer[start], nToCopy);
-
-
-				yaffs_ReleaseTempBuffer(dev, localBuffer,
-							__LINE__);
-			}
-
-		} else {
-
-			/* A full chunk. Read directly into the supplied buffer. */
-			yaffs_ReadChunkDataFromObject(in, chunk, buffer);
-
-		}
-
-		n -= nToCopy;
-		offset += nToCopy;
-		buffer += nToCopy;
-		nDone += nToCopy;
-
-	}
-
-	return nDone;
-}
-
-int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-			int nBytes, int writeThrough)
-{
-
-	int chunk;
-	__u32 start;
-	int nToCopy;
-	int n = nBytes;
-	int nDone = 0;
-	int nToWriteBack;
-	int startOfWrite = offset;
-	int chunkWritten = 0;
-	__u32 nBytesRead;
-	__u32 chunkStart;
-
-	yaffs_Device *dev;
-
-	dev = in->myDev;
-
-	while (n > 0 && chunkWritten >= 0) {
-		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-		/* start = offset % dev->nDataBytesPerChunk; */
-		yaffs_AddrToChunk(dev, offset, &chunk, &start);
-
-		if (chunk * dev->nDataBytesPerChunk + start != offset ||
-				start >= dev->nDataBytesPerChunk) {
-			T(YAFFS_TRACE_ERROR, (
-			   TSTR("AddrToChunk of offset %d gives chunk %d start %d"
-			   TENDSTR),
-			   (int)offset, chunk, start));
-		}
-		chunk++;
-
-		/* OK now check for the curveball where the start and end are in
-		 * the same chunk.
-		 */
-
-		if ((start + n) < dev->nDataBytesPerChunk) {
-			nToCopy = n;
-
-			/* Now folks, to calculate how many bytes to write back....
-			 * If we're overwriting and not writing to then end of file then
-			 * we need to write back as much as was there before.
-			 */
-
-			chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
-
-			if (chunkStart > in->variant.fileVariant.fileSize)
-				nBytesRead = 0; /* Past end of file */
-			else
-				nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
-
-			if (nBytesRead > dev->nDataBytesPerChunk)
-				nBytesRead = dev->nDataBytesPerChunk;
-
-			nToWriteBack =
-			    (nBytesRead >
-			     (start + n)) ? nBytesRead : (start + n);
-
-			if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
-				YBUG();
-
-		} else {
-			nToCopy = dev->nDataBytesPerChunk - start;
-			nToWriteBack = dev->nDataBytesPerChunk;
-		}
-
-		if (nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
-			/* An incomplete start or end chunk (or maybe both start and end chunk),
-			 * or we're using inband tags, so we want to use the cache buffers.
-			 */
-			if (dev->nShortOpCaches > 0) {
-				yaffs_ChunkCache *cache;
-				/* If we can't find the data in the cache, then load the cache */
-				cache = yaffs_FindChunkCache(in, chunk);
-
-				if (!cache
-				    && yaffs_CheckSpaceForAllocation(in->
-								     myDev)) {
-					cache = yaffs_GrabChunkCache(in->myDev);
-					cache->object = in;
-					cache->chunkId = chunk;
-					cache->dirty = 0;
-					cache->locked = 0;
-					yaffs_ReadChunkDataFromObject(in, chunk,
-								      cache->
-								      data);
-				} else if (cache &&
-					!cache->dirty &&
-					!yaffs_CheckSpaceForAllocation(in->myDev)) {
-					/* Drop the cache if it was a read cache item and
-					 * no space check has been made for it.
-					 */
-					 cache = NULL;
-				}
-
-				if (cache) {
-					yaffs_UseChunkCache(dev, cache, 1);
-					cache->locked = 1;
-
-
-					memcpy(&cache->data[start], buffer,
-					       nToCopy);
-
-
-					cache->locked = 0;
-					cache->nBytes = nToWriteBack;
-
-					if (writeThrough) {
-						chunkWritten =
-						    yaffs_WriteChunkDataToObject
-						    (cache->object,
-						     cache->chunkId,
-						     cache->data, cache->nBytes,
-						     1);
-						cache->dirty = 0;
-					}
-
-				} else {
-					chunkWritten = -1;	/* fail the write */
-				}
-			} else {
-				/* An incomplete start or end chunk (or maybe both start and end chunk)
-				 * Read into the local buffer then copy, then copy over and write back.
-				 */
-
-				__u8 *localBuffer =
-				    yaffs_GetTempBuffer(dev, __LINE__);
-
-				yaffs_ReadChunkDataFromObject(in, chunk,
-							      localBuffer);
-
-
-
-				memcpy(&localBuffer[start], buffer, nToCopy);
-
-				chunkWritten =
-				    yaffs_WriteChunkDataToObject(in, chunk,
-								 localBuffer,
-								 nToWriteBack,
-								 0);
-
-				yaffs_ReleaseTempBuffer(dev, localBuffer,
-							__LINE__);
-
-			}
-
-		} else {
-			/* A full chunk. Write directly from the supplied buffer. */
-
-
-
-			chunkWritten =
-			    yaffs_WriteChunkDataToObject(in, chunk, buffer,
-							 dev->nDataBytesPerChunk,
-							 0);
-
-			/* Since we've overwritten the cached data, we better invalidate it. */
-			yaffs_InvalidateChunkCache(in, chunk);
-		}
-
-		if (chunkWritten >= 0) {
-			n -= nToCopy;
-			offset += nToCopy;
-			buffer += nToCopy;
-			nDone += nToCopy;
-		}
-
-	}
-
-	/* Update file object */
-
-	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
-		in->variant.fileVariant.fileSize = (startOfWrite + nDone);
-
-	in->dirty = 1;
-
-	return nDone;
-}
-
-
-/* ---------------------- File resizing stuff ------------------ */
-
-static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
-{
-
-	yaffs_Device *dev = in->myDev;
-	int oldFileSize = in->variant.fileVariant.fileSize;
-
-	int lastDel = 1 + (oldFileSize - 1) / dev->nDataBytesPerChunk;
-
-	int startDel = 1 + (newSize + dev->nDataBytesPerChunk - 1) /
-	    dev->nDataBytesPerChunk;
-	int i;
-	int chunkId;
-
-	/* Delete backwards so that we don't end up with holes if
-	 * power is lost part-way through the operation.
-	 */
-	for (i = lastDel; i >= startDel; i--) {
-		/* NB this could be optimised somewhat,
-		 * eg. could retrieve the tags and write them without
-		 * using yaffs_DeleteChunk
-		 */
-
-		chunkId = yaffs_FindAndDeleteChunkInFile(in, i, NULL);
-		if (chunkId > 0) {
-			if (chunkId <
-			    (dev->internalStartBlock * dev->nChunksPerBlock)
-			    || chunkId >=
-			    ((dev->internalEndBlock +
-			      1) * dev->nChunksPerBlock)) {
-				T(YAFFS_TRACE_ALWAYS,
-				  (TSTR("Found daft chunkId %d for %d" TENDSTR),
-				   chunkId, i));
-			} else {
-				in->nDataChunks--;
-				yaffs_DeleteChunk(dev, chunkId, 1, __LINE__);
-			}
-		}
-	}
-
-}
-
-int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
-{
-
-	int oldFileSize = in->variant.fileVariant.fileSize;
-	__u32 newSizeOfPartialChunk;
-	int newFullChunks;
-
-	yaffs_Device *dev = in->myDev;
-
-	yaffs_AddrToChunk(dev, newSize, &newFullChunks, &newSizeOfPartialChunk);
-
-	yaffs_FlushFilesChunkCache(in);
-	yaffs_InvalidateWholeChunkCache(in);
-
-	yaffs_CheckGarbageCollection(dev);
-
-	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-		return YAFFS_FAIL;
-
-	if (newSize == oldFileSize)
-		return YAFFS_OK;
-
-	if (newSize < oldFileSize) {
-
-		yaffs_PruneResizedChunks(in, newSize);
-
-		if (newSizeOfPartialChunk != 0) {
-			int lastChunk = 1 + newFullChunks;
-
-			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
-
-			/* Got to read and rewrite the last chunk with its new size and zero pad */
-			yaffs_ReadChunkDataFromObject(in, lastChunk,
-						      localBuffer);
-
-			memset(localBuffer + newSizeOfPartialChunk, 0,
-			       dev->nDataBytesPerChunk - newSizeOfPartialChunk);
-
-			yaffs_WriteChunkDataToObject(in, lastChunk, localBuffer,
-						     newSizeOfPartialChunk, 1);
-
-			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
-		}
-
-		in->variant.fileVariant.fileSize = newSize;
-
-		yaffs_PruneFileStructure(dev, &in->variant.fileVariant);
-	} else {
-		/* newsSize > oldFileSize */
-		in->variant.fileVariant.fileSize = newSize;
-	}
-
-
-	/* Write a new object header to reflect the resize.
-	 * show we've shrunk the file, if need be
-	 * Do this only if the file is not in the deleted directories
-	 * and is not shadowed.
-	 */
-	if (in->parent &&
-	    !in->isShadowed &&
-	    in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-	    in->parent->objectId != YAFFS_OBJECTID_DELETED)
-		yaffs_UpdateObjectHeader(in, NULL, 0,
-					 (newSize < oldFileSize) ? 1 : 0, 0);
-
-	return YAFFS_OK;
-}
-
-loff_t yaffs_GetFileSize(yaffs_Object *obj)
-{
-	obj = yaffs_GetEquivalentObject(obj);
-
-	switch (obj->variantType) {
-	case YAFFS_OBJECT_TYPE_FILE:
-		return obj->variant.fileVariant.fileSize;
-	case YAFFS_OBJECT_TYPE_SYMLINK:
-		return yaffs_strlen(obj->variant.symLinkVariant.alias);
-	default:
-		return 0;
-	}
-}
-
-
-
-int yaffs_FlushFile(yaffs_Object *in, int updateTime, int dataSync)
-{
-	int retVal;
-	if (in->dirty) {
-		yaffs_FlushFilesChunkCache(in);
-		if(dataSync) /* Only sync data */
-			retVal=YAFFS_OK;
-		else {
-			if (updateTime) {
-#ifdef CONFIG_YAFFS_WINCE
-				yfsd_WinFileTimeNow(in->win_mtime);
-#else
-
-				in->yst_mtime = Y_CURRENT_TIME;
-
-#endif
-			}
-
-			retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
-				0) ? YAFFS_OK : YAFFS_FAIL;
-		}
-	} else {
-		retVal = YAFFS_OK;
-	}
-
-	return retVal;
-
-}
-
-static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
-{
-
-	/* First off, invalidate the file's data in the cache, without flushing. */
-	yaffs_InvalidateWholeChunkCache(in);
-
-	if (in->myDev->isYaffs2 && (in->parent != in->myDev->deletedDir)) {
-		/* Move to the unlinked directory so we have a record that it was deleted. */
-		yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
-
-	}
-
-	yaffs_RemoveObjectFromDirectory(in);
-	yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__);
-	in->hdrChunk = 0;
-
-	yaffs_FreeObject(in);
-	return YAFFS_OK;
-
-}
-
-/* yaffs_DeleteFile deletes the whole file data
- * and the inode associated with the file.
- * It does not delete the links associated with the file.
- */
-static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
-{
-
-	int retVal;
-	int immediateDeletion = 0;
-
-#ifdef __KERNEL__
-	if (!in->myInode)
-		immediateDeletion = 1;
-#else
-	if (in->inUse <= 0)
-		immediateDeletion = 1;
-#endif
-
-	if (immediateDeletion) {
-		retVal =
-		    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
-					   _Y("deleted"), 0, 0);
-		T(YAFFS_TRACE_TRACING,
-		  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-		   in->objectId));
-		in->deleted = 1;
-		in->myDev->nDeletedFiles++;
-		if (1 || in->myDev->isYaffs2)
-			yaffs_ResizeFile(in, 0);
-		yaffs_SoftDeleteFile(in);
-	} else {
-		retVal =
-		    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
-					   _Y("unlinked"), 0, 0);
-	}
-
-
-	return retVal;
-}
-
-int yaffs_DeleteFile(yaffs_Object *in)
-{
-	int retVal = YAFFS_OK;
-	int deleted = in->deleted;
-
-	yaffs_ResizeFile(in, 0);
-
-	if (in->nDataChunks > 0) {
-		/* Use soft deletion if there is data in the file.
-		 * That won't be the case if it has been resized to zero.
-		 */
-		if (!in->unlinked)
-			retVal = yaffs_UnlinkFileIfNeeded(in);
-
-		if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
-			in->deleted = 1;
-			deleted = 1;
-			in->myDev->nDeletedFiles++;
-			yaffs_SoftDeleteFile(in);
-		}
-		return deleted ? YAFFS_OK : YAFFS_FAIL;
-	} else {
-		/* The file has no data chunks so we toss it immediately */
-		yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
-		in->variant.fileVariant.top = NULL;
-		yaffs_DoGenericObjectDeletion(in);
-
-		return YAFFS_OK;
-	}
-}
-
-static int yaffs_IsNonEmptyDirectory(yaffs_Object *obj)
-{
-	return (obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) &&
-		!(ylist_empty(&obj->variant.directoryVariant.children));
-}
-
-static int yaffs_DeleteDirectory(yaffs_Object *obj)
-{
-	/* First check that the directory is empty. */
-	if (yaffs_IsNonEmptyDirectory(obj))
-		return YAFFS_FAIL;
-
-	return yaffs_DoGenericObjectDeletion(obj);
-}
-
-static int yaffs_DeleteSymLink(yaffs_Object *in)
-{
-	YFREE(in->variant.symLinkVariant.alias);
-
-	return yaffs_DoGenericObjectDeletion(in);
-}
-
-static int yaffs_DeleteHardLink(yaffs_Object *in)
-{
-	/* remove this hardlink from the list assocaited with the equivalent
-	 * object
-	 */
-	ylist_del_init(&in->hardLinks);
-	return yaffs_DoGenericObjectDeletion(in);
-}
-
-int yaffs_DeleteObject(yaffs_Object *obj)
-{
-int retVal = -1;
-	switch (obj->variantType) {
-	case YAFFS_OBJECT_TYPE_FILE:
-		retVal = yaffs_DeleteFile(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_DIRECTORY:
-		return yaffs_DeleteDirectory(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_SYMLINK:
-		retVal = yaffs_DeleteSymLink(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_HARDLINK:
-		retVal = yaffs_DeleteHardLink(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_SPECIAL:
-		retVal = yaffs_DoGenericObjectDeletion(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_UNKNOWN:
-		retVal = 0;
-		break;		/* should not happen. */
-	}
-
-	return retVal;
-}
-
-static int yaffs_UnlinkWorker(yaffs_Object *obj)
-{
-
-	int immediateDeletion = 0;
-
-#ifdef __KERNEL__
-	if (!obj->myInode)
-		immediateDeletion = 1;
-#else
-	if (obj->inUse <= 0)
-		immediateDeletion = 1;
-#endif
-
-	if(obj)
-		yaffs_UpdateParent(obj->parent);
-
-	if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-		return yaffs_DeleteHardLink(obj);
-	} else if (!ylist_empty(&obj->hardLinks)) {
-		/* Curve ball: We're unlinking an object that has a hardlink.
-		 *
-		 * This problem arises because we are not strictly following
-		 * The Linux link/inode model.
-		 *
-		 * We can't really delete the object.
-		 * Instead, we do the following:
-		 * - Select a hardlink.
-		 * - Unhook it from the hard links
-		 * - Unhook it from its parent directory (so that the rename can work)
-		 * - Rename the object to the hardlink's name.
-		 * - Delete the hardlink
-		 */
-
-		yaffs_Object *hl;
-		int retVal;
-		YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
-
-		hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
-
-		ylist_del_init(&hl->hardLinks);
-		ylist_del_init(&hl->siblings);
-
-		yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
-
-		retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
-
-		if (retVal == YAFFS_OK)
-			retVal = yaffs_DoGenericObjectDeletion(hl);
-
-		return retVal;
-
-	} else if (immediateDeletion) {
-		switch (obj->variantType) {
-		case YAFFS_OBJECT_TYPE_FILE:
-			return yaffs_DeleteFile(obj);
-			break;
-		case YAFFS_OBJECT_TYPE_DIRECTORY:
-			return yaffs_DeleteDirectory(obj);
-			break;
-		case YAFFS_OBJECT_TYPE_SYMLINK:
-			return yaffs_DeleteSymLink(obj);
-			break;
-		case YAFFS_OBJECT_TYPE_SPECIAL:
-			return yaffs_DoGenericObjectDeletion(obj);
-			break;
-		case YAFFS_OBJECT_TYPE_HARDLINK:
-		case YAFFS_OBJECT_TYPE_UNKNOWN:
-		default:
-			return YAFFS_FAIL;
-		}
-	} else if(yaffs_IsNonEmptyDirectory(obj))
-		return YAFFS_FAIL;
-	else
-		return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
-					   _Y("unlinked"), 0, 0);
-}
-
-
-static int yaffs_UnlinkObject(yaffs_Object *obj)
-{
-
-	if (obj && obj->unlinkAllowed)
-		return yaffs_UnlinkWorker(obj);
-
-	return YAFFS_FAIL;
-
-}
-int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
-{
-	yaffs_Object *obj;
-
-	obj = yaffs_FindObjectByName(dir, name);
-	return yaffs_UnlinkObject(obj);
-}
-
-/*----------------------- Initialisation Scanning ---------------------- */
-
-#ifdef CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE
-#else
-static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
-				int backwardScanning)
-{
-	yaffs_Object *obj;
-
-	if (!backwardScanning) {
-		/* Handle YAFFS1 forward scanning case
-		 * For YAFFS1 we always do the deletion
-		 */
-
-	} else {
-		/* Handle YAFFS2 case (backward scanning)
-		 * If the shadowed object exists then ignore.
-		 */
-		obj = yaffs_FindObjectByNumber(dev, objId);
-		if(obj)
-			return;
-	}
-
-	/* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
-	 * We put it in unlinked dir to be cleaned up after the scanning
-	 */
-	obj =
-	    yaffs_FindOrCreateObjectByNumber(dev, objId,
-					     YAFFS_OBJECT_TYPE_FILE);
-	if (!obj)
-		return;
-	obj->isShadowed = 1;
-	yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
-	obj->variant.fileVariant.shrinkSize = 0;
-	obj->valid = 1;		/* So that we don't read any other info for this file */
-
-}
-#endif
-
-typedef struct {
-	int seq;
-	int block;
-} yaffs_BlockIndex;
-
-
-static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList)
-{
-	yaffs_Object *hl;
-	yaffs_Object *in;
-
-	while (hardList) {
-		hl = hardList;
-		hardList = (yaffs_Object *) (hardList->hardLinks.next);
-
-		in = yaffs_FindObjectByNumber(dev,
-					      hl->variant.hardLinkVariant.
-					      equivalentObjectId);
-
-		if (in) {
-			/* Add the hardlink pointers */
-			hl->variant.hardLinkVariant.equivalentObject = in;
-			ylist_add(&hl->hardLinks, &in->hardLinks);
-		} else {
-			/* Todo Need to report/handle this better.
-			 * Got a problem... hardlink to a non-existant object
-			 */
-			hl->variant.hardLinkVariant.equivalentObject = NULL;
-			YINIT_LIST_HEAD(&hl->hardLinks);
-
-		}
-	}
-}
-
-
-
-
-
-#ifdef CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE
-#else
-static int ybicmp(const void *a, const void *b)
-{
-	register int aseq = ((yaffs_BlockIndex *)a)->seq;
-	register int bseq = ((yaffs_BlockIndex *)b)->seq;
-	register int ablock = ((yaffs_BlockIndex *)a)->block;
-	register int bblock = ((yaffs_BlockIndex *)b)->block;
-	if (aseq == bseq)
-		return ablock - bblock;
-	else
-		return aseq - bseq;
-}
-#endif
-
-struct yaffs_ShadowFixerStruct {
-	int objectId;
-	int shadowedId;
-	struct yaffs_ShadowFixerStruct *next;
-};
-
-
-static void yaffs_StripDeletedObjects(yaffs_Device *dev)
-{
-	/*
-	*  Sort out state of unlinked and deleted objects after scanning.
-	*/
-	struct ylist_head *i;
-	struct ylist_head *n;
-	yaffs_Object *l;
-
-	/* Soft delete all the unlinked files */
-	ylist_for_each_safe(i, n,
-		&dev->unlinkedDir->variant.directoryVariant.children) {
-		if (i) {
-			l = ylist_entry(i, yaffs_Object, siblings);
-			yaffs_DeleteObject(l);
-		}
-	}
-
-	ylist_for_each_safe(i, n,
-		&dev->deletedDir->variant.directoryVariant.children) {
-		if (i) {
-			l = ylist_entry(i, yaffs_Object, siblings);
-			yaffs_DeleteObject(l);
-		}
-	}
-
-}
-
-/*
- * This code iterates through all the objects making sure that they are rooted.
- * Any unrooted objects are re-rooted in lost+found.
- * An object needs to be in one of:
- * - Directly under deleted, unlinked
- * - Directly or indirectly under root.
- *
- * Note:
- *  This code assumes that we don't ever change the current relationships between
- *  directories:
- *   rootDir->parent == unlinkedDir->parent == deletedDir->parent == NULL
- *   lostNfound->parent == rootDir
- *
- * This fixes the problem where directories might have inadvertently been deleted
- * leaving the object "hanging" without being rooted in the directory tree.
- */
- 
-static int yaffs_HasNULLParent(yaffs_Device *dev, yaffs_Object *obj)
-{
-	return (obj == dev->deletedDir ||
-		obj == dev->unlinkedDir||
-		obj == dev->rootDir);
-}
-
-static void yaffs_FixHangingObjects(yaffs_Device *dev)
-{
-	yaffs_Object *obj;
-	yaffs_Object *parent;
-	int i;
-	struct ylist_head *lh;
-	struct ylist_head *n;
-	int depthLimit;
-	int hanging;
-
-
-	/* Iterate through the objects in each hash entry,
-	 * looking at each object.
-	 * Make sure it is rooted.
-	 */
-
-	for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-		ylist_for_each_safe(lh, n, &dev->objectBucket[i].list) {
-			if (lh) {
-				obj = ylist_entry(lh, yaffs_Object, hashLink);
-				parent= obj->parent;
-				
-				if(yaffs_HasNULLParent(dev,obj)){
-					/* These directories are not hanging */
-					hanging = 0;
-				}
-				else if(!parent || parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-					hanging = 1;
-				else if(yaffs_HasNULLParent(dev,parent))
-					hanging = 0;
-				else {
-					/*
-					 * Need to follow the parent chain to see if it is hanging.
-					 */
-					hanging = 0;
-					depthLimit=100;
-
-					while(parent != dev->rootDir &&
-						parent->parent &&
-						parent->parent->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-						depthLimit > 0){
-						parent = parent->parent;
-						depthLimit--;
-					}
-					if(parent != dev->rootDir)
-						hanging = 1;
-				}
-				if(hanging){
-					T(YAFFS_TRACE_SCAN,
-					  (TSTR("Hanging object %d moved to lost and found" TENDSTR),
-					  	obj->objectId));
-					yaffs_AddObjectToDirectory(dev->lostNFoundDir,obj);
-				}
-			}
-		}
-	}
-}
-
-
-/*
- * Delete directory contents for cleaning up lost and found.
- */
-static void yaffs_DeleteDirectoryContents(yaffs_Object *dir)
-{
-	yaffs_Object *obj;
-	struct ylist_head *lh;
-	struct ylist_head *n;
-
-	if(dir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-		YBUG();
-	
-	ylist_for_each_safe(lh, n, &dir->variant.directoryVariant.children) {
-		if (lh) {
-			obj = ylist_entry(lh, yaffs_Object, siblings);
-			if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
-				yaffs_DeleteDirectoryContents(obj);
-
-			T(YAFFS_TRACE_SCAN,
-				(TSTR("Deleting lost_found object %d" TENDSTR),
-				obj->objectId));
-
-			/* Need to use UnlinkObject since Delete would not handle
-			 * hardlinked objects correctly.
-			 */
-			yaffs_UnlinkObject(obj); 
-		}
-	}
-			
-}
-
-static void yaffs_EmptyLostAndFound(yaffs_Device *dev)
-{
-	yaffs_DeleteDirectoryContents(dev->lostNFoundDir);
-}
-
-#ifndef CONFIG_YAFFS_NO_YAFFS1
-static int yaffs_Scan(yaffs_Device *dev)
-{
-	yaffs_ExtendedTags tags;
-	int blk;
-	int blockIterator;
-	int startIterator;
-	int endIterator;
-	int result;
-
-	int chunk;
-	int c;
-	int deleted;
-	yaffs_BlockState state;
-	yaffs_Object *hardList = NULL;
-	yaffs_BlockInfo *bi;
-	__u32 sequenceNumber;
-	yaffs_ObjectHeader *oh;
-	yaffs_Object *in;
-	yaffs_Object *parent;
-
-	int alloc_failed = 0;
-
-	struct yaffs_ShadowFixerStruct *shadowFixerList = NULL;
-
-
-	__u8 *chunkData;
-
-
-
-	T(YAFFS_TRACE_SCAN,
-	  (TSTR("yaffs_Scan starts  intstartblk %d intendblk %d..." TENDSTR),
-	   dev->internalStartBlock, dev->internalEndBlock));
-
-	chunkData = yaffs_GetTempBuffer(dev, __LINE__);
-
-	dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
-
-	/* Scan all the blocks to determine their state */
-	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
-		bi = yaffs_GetBlockInfo(dev, blk);
-		yaffs_ClearChunkBits(dev, blk);
-		bi->pagesInUse = 0;
-		bi->softDeletions = 0;
-
-		yaffs_QueryInitialBlockState(dev, blk, &state, &sequenceNumber);
-
-		bi->blockState = state;
-		bi->sequenceNumber = sequenceNumber;
-
-		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-
-		T(YAFFS_TRACE_SCAN_DEBUG,
-		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
-		   state, sequenceNumber));
-
-		if (state == YAFFS_BLOCK_STATE_DEAD) {
-			T(YAFFS_TRACE_BAD_BLOCKS,
-			  (TSTR("block %d is bad" TENDSTR), blk));
-		} else if (state == YAFFS_BLOCK_STATE_EMPTY) {
-			T(YAFFS_TRACE_SCAN_DEBUG,
-			  (TSTR("Block empty " TENDSTR)));
-			dev->nErasedBlocks++;
-			dev->nFreeChunks += dev->nChunksPerBlock;
-		}
-	}
-
-	startIterator = dev->internalStartBlock;
-	endIterator = dev->internalEndBlock;
-
-	/* For each block.... */
-	for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
-	     blockIterator++) {
-
-		YYIELD();
-
-		YYIELD();
-
-		blk = blockIterator;
-
-		bi = yaffs_GetBlockInfo(dev, blk);
-		state = bi->blockState;
-
-		deleted = 0;
-
-		/* For each chunk in each block that needs scanning....*/
-		for (c = 0; !alloc_failed && c < dev->nChunksPerBlock &&
-		     state == YAFFS_BLOCK_STATE_NEEDS_SCANNING; c++) {
-			/* Read the tags and decide what to do */
-			chunk = blk * dev->nChunksPerBlock + c;
-
-			result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL,
-							&tags);
-
-			/* Let's have a good look at this chunk... */
-
-			if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED || tags.chunkDeleted) {
-				/* YAFFS1 only...
-				 * A deleted chunk
-				 */
-				deleted++;
-				dev->nFreeChunks++;
-				/*T((" %d %d deleted\n",blk,c)); */
-			} else if (!tags.chunkUsed) {
-				/* An unassigned chunk in the block
-				 * This means that either the block is empty or
-				 * this is the one being allocated from
-				 */
-
-				if (c == 0) {
-					/* We're looking at the first chunk in the block so the block is unused */
-					state = YAFFS_BLOCK_STATE_EMPTY;
-					dev->nErasedBlocks++;
-				} else {
-					/* this is the block being allocated from */
-					T(YAFFS_TRACE_SCAN,
-					  (TSTR
-					   (" Allocating from %d %d" TENDSTR),
-					   blk, c));
-					state = YAFFS_BLOCK_STATE_ALLOCATING;
-					dev->allocationBlock = blk;
-					dev->allocationPage = c;
-					dev->allocationBlockFinder = blk;
-					/* Set it to here to encourage the allocator to go forth from here. */
-
-				}
-
-				dev->nFreeChunks += (dev->nChunksPerBlock - c);
-			} else if (tags.chunkId > 0) {
-				/* chunkId > 0 so it is a data chunk... */
-				unsigned int endpos;
-
-				yaffs_SetChunkBit(dev, blk, c);
-				bi->pagesInUse++;
-
-				in = yaffs_FindOrCreateObjectByNumber(dev,
-								      tags.
-								      objectId,
-								      YAFFS_OBJECT_TYPE_FILE);
-				/* PutChunkIntoFile checks for a clash (two data chunks with
-				 * the same chunkId).
-				 */
-
-				if (!in)
-					alloc_failed = 1;
-
-				if (in) {
-					if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1))
-						alloc_failed = 1;
-				}
-
-				endpos =
-				    (tags.chunkId - 1) * dev->nDataBytesPerChunk +
-				    tags.byteCount;
-				if (in &&
-				    in->variantType == YAFFS_OBJECT_TYPE_FILE
-				    && in->variant.fileVariant.scannedFileSize <
-				    endpos) {
-					in->variant.fileVariant.
-					    scannedFileSize = endpos;
-					if (!dev->useHeaderFileSize) {
-						in->variant.fileVariant.
-						    fileSize =
-						    in->variant.fileVariant.
-						    scannedFileSize;
-					}
-
-				}
-				/* T((" %d %d data %d %d\n",blk,c,tags.objectId,tags.chunkId));   */
-			} else {
-				/* chunkId == 0, so it is an ObjectHeader.
-				 * Thus, we read in the object header and make the object
-				 */
-				yaffs_SetChunkBit(dev, blk, c);
-				bi->pagesInUse++;
-
-				result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk,
-								chunkData,
-								NULL);
-
-				oh = (yaffs_ObjectHeader *) chunkData;
-
-				in = yaffs_FindObjectByNumber(dev,
-							      tags.objectId);
-				if (in && in->variantType != oh->type) {
-					/* This should not happen, but somehow
-					 * Wev'e ended up with an objectId that has been reused but not yet
-					 * deleted, and worse still it has changed type. Delete the old object.
-					 */
-
-					yaffs_DeleteObject(in);
-
-					in = 0;
-				}
-
-				in = yaffs_FindOrCreateObjectByNumber(dev,
-								      tags.
-								      objectId,
-								      oh->type);
-
-				if (!in)
-					alloc_failed = 1;
-
-				if (in && oh->shadowsObject > 0) {
-
-					struct yaffs_ShadowFixerStruct *fixer;
-					fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct));
-					if (fixer) {
-						fixer->next = shadowFixerList;
-						shadowFixerList = fixer;
-						fixer->objectId = tags.objectId;
-						fixer->shadowedId = oh->shadowsObject;
-					}
-
-				}
-
-				if (in && in->valid) {
-					/* We have already filled this one. We have a duplicate and need to resolve it. */
-
-					unsigned existingSerial = in->serial;
-					unsigned newSerial = tags.serialNumber;
-
-					if (((existingSerial + 1) & 3) == newSerial) {
-						/* Use new one - destroy the exisiting one */
-						yaffs_DeleteChunk(dev,
-								  in->hdrChunk,
-								  1, __LINE__);
-						in->valid = 0;
-					} else {
-						/* Use existing - destroy this one. */
-						yaffs_DeleteChunk(dev, chunk, 1,
-								  __LINE__);
-					}
-				}
-
-				if (in && !in->valid &&
-				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
-				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND)) {
-					/* We only load some info, don't fiddle with directory structure */
-					in->valid = 1;
-					in->variantType = oh->type;
-
-					in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-					in->win_atime[0] = oh->win_atime[0];
-					in->win_ctime[0] = oh->win_ctime[0];
-					in->win_mtime[0] = oh->win_mtime[0];
-					in->win_atime[1] = oh->win_atime[1];
-					in->win_ctime[1] = oh->win_ctime[1];
-					in->win_mtime[1] = oh->win_mtime[1];
-#else
-					in->yst_uid = oh->yst_uid;
-					in->yst_gid = oh->yst_gid;
-					in->yst_atime = oh->yst_atime;
-					in->yst_mtime = oh->yst_mtime;
-					in->yst_ctime = oh->yst_ctime;
-					in->yst_rdev = oh->yst_rdev;
-#endif
-					in->hdrChunk = chunk;
-					in->serial = tags.serialNumber;
-
-				} else if (in && !in->valid) {
-					/* we need to load this info */
-
-					in->valid = 1;
-					in->variantType = oh->type;
-
-					in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-					in->win_atime[0] = oh->win_atime[0];
-					in->win_ctime[0] = oh->win_ctime[0];
-					in->win_mtime[0] = oh->win_mtime[0];
-					in->win_atime[1] = oh->win_atime[1];
-					in->win_ctime[1] = oh->win_ctime[1];
-					in->win_mtime[1] = oh->win_mtime[1];
-#else
-					in->yst_uid = oh->yst_uid;
-					in->yst_gid = oh->yst_gid;
-					in->yst_atime = oh->yst_atime;
-					in->yst_mtime = oh->yst_mtime;
-					in->yst_ctime = oh->yst_ctime;
-					in->yst_rdev = oh->yst_rdev;
-#endif
-					in->hdrChunk = chunk;
-					in->serial = tags.serialNumber;
-
-					yaffs_SetObjectName(in, oh->name);
-					in->dirty = 0;
-
-					/* directory stuff...
-					 * hook up to parent
-					 */
-
-					parent =
-					    yaffs_FindOrCreateObjectByNumber
-					    (dev, oh->parentObjectId,
-					     YAFFS_OBJECT_TYPE_DIRECTORY);
-					if (!parent)
-						alloc_failed = 1;
-					if (parent && parent->variantType ==
-					    YAFFS_OBJECT_TYPE_UNKNOWN) {
-						/* Set up as a directory */
-						parent->variantType =
-							YAFFS_OBJECT_TYPE_DIRECTORY;
-						YINIT_LIST_HEAD(&parent->variant.
-								directoryVariant.
-								children);
-					} else if (!parent || parent->variantType !=
-						   YAFFS_OBJECT_TYPE_DIRECTORY) {
-						/* Hoosterman, another problem....
-						 * We're trying to use a non-directory as a directory
-						 */
-
-						T(YAFFS_TRACE_ERROR,
-						  (TSTR
-						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
-						    TENDSTR)));
-						parent = dev->lostNFoundDir;
-					}
-
-					yaffs_AddObjectToDirectory(parent, in);
-
-					if (0 && (parent == dev->deletedDir ||
-						  parent == dev->unlinkedDir)) {
-						in->deleted = 1;	/* If it is unlinked at start up then it wants deleting */
-						dev->nDeletedFiles++;
-					}
-					/* Note re hardlinks.
-					 * Since we might scan a hardlink before its equivalent object is scanned
-					 * we put them all in a list.
-					 * After scanning is complete, we should have all the objects, so we run through this
-					 * list and fix up all the chains.
-					 */
-
-					switch (in->variantType) {
-					case YAFFS_OBJECT_TYPE_UNKNOWN:
-						/* Todo got a problem */
-						break;
-					case YAFFS_OBJECT_TYPE_FILE:
-						if (dev->useHeaderFileSize)
-
-							in->variant.fileVariant.
-							    fileSize =
-							    oh->fileSize;
-
-						break;
-					case YAFFS_OBJECT_TYPE_HARDLINK:
-						in->variant.hardLinkVariant.
-							equivalentObjectId =
-							oh->equivalentObjectId;
-						in->hardLinks.next =
-							(struct ylist_head *)
-							hardList;
-						hardList = in;
-						break;
-					case YAFFS_OBJECT_TYPE_DIRECTORY:
-						/* Do nothing */
-						break;
-					case YAFFS_OBJECT_TYPE_SPECIAL:
-						/* Do nothing */
-						break;
-					case YAFFS_OBJECT_TYPE_SYMLINK:
-						in->variant.symLinkVariant.alias =
-						    yaffs_CloneString(oh->alias);
-						if (!in->variant.symLinkVariant.alias)
-							alloc_failed = 1;
-						break;
-					}
-
-/*
-					if (parent == dev->deletedDir) {
-						yaffs_DestroyObject(in);
-						bi->hasShrinkHeader = 1;
-					}
-*/
-				}
-			}
-		}
-
-		if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-			/* If we got this far while scanning, then the block is fully allocated.*/
-			state = YAFFS_BLOCK_STATE_FULL;
-		}
-
-		bi->blockState = state;
-
-		/* Now let's see if it was dirty */
-		if (bi->pagesInUse == 0 &&
-		    !bi->hasShrinkHeader &&
-		    bi->blockState == YAFFS_BLOCK_STATE_FULL) {
-			yaffs_BlockBecameDirty(dev, blk);
-		}
-
-	}
-
-
-	/* Ok, we've done all the scanning.
-	 * Fix up the hard link chains.
-	 * We should now have scanned all the objects, now it's time to add these
-	 * hardlinks.
-	 */
-
-	yaffs_HardlinkFixup(dev, hardList);
-
-	/* Fix up any shadowed objects */
-	{
-		struct yaffs_ShadowFixerStruct *fixer;
-		yaffs_Object *obj;
-
-		while (shadowFixerList) {
-			fixer = shadowFixerList;
-			shadowFixerList = fixer->next;
-			/* Complete the rename transaction by deleting the shadowed object
-			 * then setting the object header to unshadowed.
-			 */
-			obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId);
-			if (obj)
-				yaffs_DeleteObject(obj);
-
-			obj = yaffs_FindObjectByNumber(dev, fixer->objectId);
-
-			if (obj)
-				yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
-
-			YFREE(fixer);
-		}
-	}
-
-	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-
-	if (alloc_failed) {
-        T(YAFFS_TRACE_ERROR, (TSTR("malloc failed in yaffs_ScanBackwards" TENDSTR)));
-		return YAFFS_FAIL;
-    }
-
-	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
-
-
-	return YAFFS_OK;
-}
-#endif //CONFIG_YAFFS_NO_YAFFS1
-
-
-static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in)
-{
-	__u8 *chunkData;
-	yaffs_ObjectHeader *oh;
-	yaffs_Device *dev;
-	yaffs_ExtendedTags tags;
-	int result;
-	int alloc_failed = 0;
-
-	if (!in)
-		return;
-
-	dev = in->myDev;
-
-#if 0
-	T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
-		in->objectId,
-		in->lazyLoaded ? "not yet" : "already"));
-#endif
-
-	if (in->lazyLoaded && in->hdrChunk > 0) {
-		in->lazyLoaded = 0;
-		chunkData = yaffs_GetTempBuffer(dev, __LINE__);
-
-		result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
-		oh = (yaffs_ObjectHeader *) chunkData;
-
-		in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-		in->win_atime[0] = oh->win_atime[0];
-		in->win_ctime[0] = oh->win_ctime[0];
-		in->win_mtime[0] = oh->win_mtime[0];
-		in->win_atime[1] = oh->win_atime[1];
-		in->win_ctime[1] = oh->win_ctime[1];
-		in->win_mtime[1] = oh->win_mtime[1];
-#else
-		in->yst_uid = oh->yst_uid;
-		in->yst_gid = oh->yst_gid;
-		in->yst_atime = oh->yst_atime;
-		in->yst_mtime = oh->yst_mtime;
-		in->yst_ctime = oh->yst_ctime;
-		in->yst_rdev = oh->yst_rdev;
-
-#endif
-		yaffs_SetObjectName(in, oh->name);
-
-		if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-			in->variant.symLinkVariant.alias =
-						    yaffs_CloneString(oh->alias);
-			if (!in->variant.symLinkVariant.alias)
-				alloc_failed = 1; /* Not returned to caller */
-		}
-
-		yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-	}
-}
-
-#ifdef CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE
-#else
-static int yaffs_ScanBackwards(yaffs_Device *dev)
-{
-	yaffs_ExtendedTags tags;
-	int blk;
-	int blockIterator;
-	int startIterator;
-	int endIterator;
-	int nBlocksToScan = 0;
-
-	int chunk;
-	int result;
-	int c;
-	int deleted;
-	yaffs_BlockState state;
-	yaffs_Object *hardList = NULL;
-	yaffs_BlockInfo *bi;
-	__u32 sequenceNumber;
-	yaffs_ObjectHeader *oh;
-	yaffs_Object *in;
-	yaffs_Object *parent;
-	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
-	int itsUnlinked;
-	__u8 *chunkData;
-
-	int fileSize;
-	int isShrink;
-	int foundChunksInBlock;
-	int equivalentObjectId;
-	int alloc_failed = 0;
-
-
-	yaffs_BlockIndex *blockIndex = NULL;
-	int altBlockIndex = 0;
-
-	if (!dev->isYaffs2) {
-		T(YAFFS_TRACE_SCAN,
-		  (TSTR("yaffs_ScanBackwards is only for YAFFS2!" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	T(YAFFS_TRACE_SCAN,
-	  (TSTR
-	   ("yaffs_ScanBackwards starts  intstartblk %d intendblk %d..."
-	    TENDSTR), dev->internalStartBlock, dev->internalEndBlock));
-
-
-	dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
-
-	blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
-
-	if (!blockIndex) {
-		blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
-		altBlockIndex = 1;
-	}
-
-	if (!blockIndex) {
-		T(YAFFS_TRACE_SCAN,
-		  (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	dev->blocksInCheckpoint = 0;
-
-	chunkData = yaffs_GetTempBuffer(dev, __LINE__);
-
-	/* Scan all the blocks to determine their state */
-	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
-		bi = yaffs_GetBlockInfo(dev, blk);
-		yaffs_ClearChunkBits(dev, blk);
-		bi->pagesInUse = 0;
-		bi->softDeletions = 0;
-
-		yaffs_QueryInitialBlockState(dev, blk, &state, &sequenceNumber);
-
-		bi->blockState = state;
-		bi->sequenceNumber = sequenceNumber;
-
-		if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
-			bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-
-		T(YAFFS_TRACE_SCAN_DEBUG,
-		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
-		   state, sequenceNumber));
-
-
-		if (state == YAFFS_BLOCK_STATE_CHECKPOINT) {
-			dev->blocksInCheckpoint++;
-
-		} else if (state == YAFFS_BLOCK_STATE_DEAD) {
-			T(YAFFS_TRACE_BAD_BLOCKS,
-			  (TSTR("block %d is bad" TENDSTR), blk));
-		} else if (state == YAFFS_BLOCK_STATE_EMPTY) {
-			T(YAFFS_TRACE_SCAN_DEBUG,
-			  (TSTR("Block empty " TENDSTR)));
-			dev->nErasedBlocks++;
-			dev->nFreeChunks += dev->nChunksPerBlock;
-		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-
-			/* Determine the highest sequence number */
-			if (sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
-
-				blockIndex[nBlocksToScan].seq = sequenceNumber;
-				blockIndex[nBlocksToScan].block = blk;
-
-				nBlocksToScan++;
-
-				if (sequenceNumber >= dev->sequenceNumber)
-					dev->sequenceNumber = sequenceNumber;
-			} else {
-				/* TODO: Nasty sequence number! */
-				T(YAFFS_TRACE_SCAN,
-				  (TSTR
-				   ("Block scanning block %d has bad sequence number %d"
-				    TENDSTR), blk, sequenceNumber));
-
-			}
-		}
-	}
-
-	T(YAFFS_TRACE_SCAN,
-	(TSTR("%d blocks to be sorted..." TENDSTR), nBlocksToScan));
-
-
-
-	YYIELD();
-
-	/* Sort the blocks */
-#ifndef CONFIG_YAFFS_USE_OWN_SORT
-	{
-		/* Use qsort now. */
-		yaffs_qsort(blockIndex, nBlocksToScan, sizeof(yaffs_BlockIndex), ybicmp);
-	}
-#else
-	{
-		/* Dungy old bubble sort... */
-
-		yaffs_BlockIndex temp;
-		int i;
-		int j;
-
-		for (i = 0; i < nBlocksToScan; i++)
-			for (j = i + 1; j < nBlocksToScan; j++)
-				if (blockIndex[i].seq > blockIndex[j].seq) {
-					temp = blockIndex[j];
-					blockIndex[j] = blockIndex[i];
-					blockIndex[i] = temp;
-				}
-	}
-#endif
-
-	YYIELD();
-
-	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
-
-	/* Now scan the blocks looking at the data. */
-	startIterator = 0;
-	endIterator = nBlocksToScan - 1;
-	T(YAFFS_TRACE_SCAN_DEBUG,
-	  (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
-
-	/* For each block.... backwards */
-	for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
-			blockIterator--) {
-		/* Cooperative multitasking! This loop can run for so
-		   long that watchdog timers expire. */
-		YYIELD();
-
-		/* get the block to scan in the correct order */
-		blk = blockIndex[blockIterator].block;
-
-		bi = yaffs_GetBlockInfo(dev, blk);
-
-
-		state = bi->blockState;
-
-		deleted = 0;
-
-		/* For each chunk in each block that needs scanning.... */
-		foundChunksInBlock = 0;
-		for (c = dev->nChunksPerBlock - 1;
-		     !alloc_failed && c >= 0 &&
-		     (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
-		      state == YAFFS_BLOCK_STATE_ALLOCATING); c--) {
-			/* Scan backwards...
-			 * Read the tags and decide what to do
-			 */
-
-			chunk = blk * dev->nChunksPerBlock + c;
-
-			result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL,
-							&tags);
-
-			/* Let's have a good look at this chunk... */
-
-			if (!tags.chunkUsed) {
-				/* An unassigned chunk in the block.
-				 * If there are used chunks after this one, then
-				 * it is a chunk that was skipped due to failing the erased
-				 * check. Just skip it so that it can be deleted.
-				 * But, more typically, We get here when this is an unallocated
-				 * chunk and his means that either the block is empty or
-				 * this is the one being allocated from
-				 */
-
-				if (foundChunksInBlock) {
-					/* This is a chunk that was skipped due to failing the erased check */
-				} else if (c == 0) {
-					/* We're looking at the first chunk in the block so the block is unused */
-					state = YAFFS_BLOCK_STATE_EMPTY;
-					dev->nErasedBlocks++;
-				} else {
-					if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
-					    state == YAFFS_BLOCK_STATE_ALLOCATING) {
-						if (dev->sequenceNumber == bi->sequenceNumber) {
-							/* this is the block being allocated from */
-
-							T(YAFFS_TRACE_SCAN,
-							  (TSTR
-							   (" Allocating from %d %d"
-							    TENDSTR), blk, c));
-
-							state = YAFFS_BLOCK_STATE_ALLOCATING;
-							dev->allocationBlock = blk;
-							dev->allocationPage = c;
-							dev->allocationBlockFinder = blk;
-						} else {
-							/* This is a partially written block that is not
-							 * the current allocation block. This block must have
-							 * had a write failure, so set up for retirement.
-							 */
-
-							 /* bi->needsRetiring = 1; ??? TODO */
-							 bi->gcPrioritise = 1;
-
-							 T(YAFFS_TRACE_ALWAYS,
-							 (TSTR("Partially written block %d detected" TENDSTR),
-							 blk));
-						}
-					}
-				}
-
-				dev->nFreeChunks++;
-
-			} else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED) {
-				T(YAFFS_TRACE_SCAN,
-				  (TSTR(" Unfixed ECC in chunk(%d:%d), chunk ignored"TENDSTR),
-				  blk, c));
-
-				  dev->nFreeChunks++;
-
-			} else if (tags.chunkId > 0) {
-				/* chunkId > 0 so it is a data chunk... */
-				unsigned int endpos;
-				__u32 chunkBase =
-				    (tags.chunkId - 1) * dev->nDataBytesPerChunk;
-
-				foundChunksInBlock = 1;
-
-
-				yaffs_SetChunkBit(dev, blk, c);
-				bi->pagesInUse++;
-
-				in = yaffs_FindOrCreateObjectByNumber(dev,
-								      tags.
-								      objectId,
-								      YAFFS_OBJECT_TYPE_FILE);
-				if (!in) {
-					/* Out of memory */
-					alloc_failed = 1;
-				}
-
-				if (in &&
-				    in->variantType == YAFFS_OBJECT_TYPE_FILE
-				    && chunkBase <
-				    in->variant.fileVariant.shrinkSize) {
-					/* This has not been invalidated by a resize */
-					if (!yaffs_PutChunkIntoFile(in, tags.chunkId,
-							       chunk, -1)) {
-						alloc_failed = 1;
-					}
-
-					/* File size is calculated by looking at the data chunks if we have not
-					 * seen an object header yet. Stop this practice once we find an object header.
-					 */
-					endpos =
-					    (tags.chunkId -
-					     1) * dev->nDataBytesPerChunk +
-					    tags.byteCount;
-
-					if (!in->valid &&	/* have not got an object header yet */
-					    in->variant.fileVariant.
-					    scannedFileSize < endpos) {
-						in->variant.fileVariant.
-						    scannedFileSize = endpos;
-						in->variant.fileVariant.
-						    fileSize =
-						    in->variant.fileVariant.
-						    scannedFileSize;
-					}
-
-				} else if (in) {
-					/* This chunk has been invalidated by a resize, so delete */
-					yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
-
-				}
-			} else {
-				/* chunkId == 0, so it is an ObjectHeader.
-				 * Thus, we read in the object header and make the object
-				 */
-				foundChunksInBlock = 1;
-
-				yaffs_SetChunkBit(dev, blk, c);
-				bi->pagesInUse++;
-
-				oh = NULL;
-				in = NULL;
-
-				if (tags.extraHeaderInfoAvailable) {
-					in = yaffs_FindOrCreateObjectByNumber
-					    (dev, tags.objectId,
-					     tags.extraObjectType);
-					if (!in)
-						alloc_failed = 1;
-				}
-
-				if (!in ||
-				    (!in->valid && dev->disableLazyLoad) ||
-				    tags.extraShadows ||
-				    (!in->valid &&
-				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
-				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))) {
-
-					/* If we don't have  valid info then we need to read the chunk
-					 * TODO In future we can probably defer reading the chunk and
-					 * living with invalid data until needed.
-					 */
-
-					result = yaffs_ReadChunkWithTagsFromNAND(dev,
-									chunk,
-									chunkData,
-									NULL);
-
-					oh = (yaffs_ObjectHeader *) chunkData;
-
-					if (dev->inbandTags) {
-						/* Fix up the header if they got corrupted by inband tags */
-						oh->shadowsObject = oh->inbandShadowsObject;
-						oh->isShrink = oh->inbandIsShrink;
-					}
-
-					if (!in) {
-						in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type);
-						if (!in)
-							alloc_failed = 1;
-					}
-
-				}
-
-				if (!in) {
-					/* TODO Hoosterman we have a problem! */
-					T(YAFFS_TRACE_ERROR,
-					  (TSTR
-					   ("yaffs tragedy: Could not make object for object  %d at chunk %d during scan"
-					    TENDSTR), tags.objectId, chunk));
-					continue;
-				}
-
-				if (in->valid) {
-					/* We have already filled this one.
-					 * We have a duplicate that will be discarded, but
-					 * we first have to suck out resize info if it is a file.
-					 */
-
-					if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
-					     ((oh &&
-					       oh->type == YAFFS_OBJECT_TYPE_FILE) ||
-					      (tags.extraHeaderInfoAvailable  &&
-					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) {
-						__u32 thisSize =
-						    (oh) ? oh->fileSize : tags.
-						    extraFileLength;
-						__u32 parentObjectId =
-						    (oh) ? oh->
-						    parentObjectId : tags.
-						    extraParentObjectId;
-
-
-						isShrink =
-						    (oh) ? oh->isShrink : tags.
-						    extraIsShrinkHeader;
-
-						/* If it is deleted (unlinked at start also means deleted)
-						 * we treat the file size as being zeroed at this point.
-						 */
-						if (parentObjectId ==
-						    YAFFS_OBJECTID_DELETED
-						    || parentObjectId ==
-						    YAFFS_OBJECTID_UNLINKED) {
-							thisSize = 0;
-							isShrink = 1;
-						}
-
-						if (isShrink &&
-						    in->variant.fileVariant.
-						    shrinkSize > thisSize) {
-							in->variant.fileVariant.
-							    shrinkSize =
-							    thisSize;
-						}
-
-						if (isShrink)
-							bi->hasShrinkHeader = 1;
-
-					}
-					/* Use existing - destroy this one. */
-					yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
-
-				}
-
-				if (!in->valid && in->variantType !=
-				    (oh ? oh->type : tags.extraObjectType))
-					T(YAFFS_TRACE_ERROR, (
-						TSTR("yaffs tragedy: Bad object type, "
-					    TCONT("%d != %d, for object %d at chunk ")
-					    TCONT("%d during scan")
-						TENDSTR), oh ?
-					    oh->type : tags.extraObjectType,
-					    in->variantType, tags.objectId,
-					    chunk));
-
-				if (!in->valid &&
-				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
-				     tags.objectId ==
-				     YAFFS_OBJECTID_LOSTNFOUND)) {
-					/* We only load some info, don't fiddle with directory structure */
-					in->valid = 1;
-
-					if (oh) {
-						in->variantType = oh->type;
-
-						in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-						in->win_atime[0] = oh->win_atime[0];
-						in->win_ctime[0] = oh->win_ctime[0];
-						in->win_mtime[0] = oh->win_mtime[0];
-						in->win_atime[1] = oh->win_atime[1];
-						in->win_ctime[1] = oh->win_ctime[1];
-						in->win_mtime[1] = oh->win_mtime[1];
-#else
-						in->yst_uid = oh->yst_uid;
-						in->yst_gid = oh->yst_gid;
-						in->yst_atime = oh->yst_atime;
-						in->yst_mtime = oh->yst_mtime;
-						in->yst_ctime = oh->yst_ctime;
-						in->yst_rdev = oh->yst_rdev;
-
-#endif
-					} else {
-						in->variantType = tags.extraObjectType;
-						in->lazyLoaded = 1;
-					}
-
-					in->hdrChunk = chunk;
-
-				} else if (!in->valid) {
-					/* we need to load this info */
-
-					in->valid = 1;
-					in->hdrChunk = chunk;
-
-					if (oh) {
-						in->variantType = oh->type;
-
-						in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-						in->win_atime[0] = oh->win_atime[0];
-						in->win_ctime[0] = oh->win_ctime[0];
-						in->win_mtime[0] = oh->win_mtime[0];
-						in->win_atime[1] = oh->win_atime[1];
-						in->win_ctime[1] = oh->win_ctime[1];
-						in->win_mtime[1] = oh->win_mtime[1];
-#else
-						in->yst_uid = oh->yst_uid;
-						in->yst_gid = oh->yst_gid;
-						in->yst_atime = oh->yst_atime;
-						in->yst_mtime = oh->yst_mtime;
-						in->yst_ctime = oh->yst_ctime;
-						in->yst_rdev = oh->yst_rdev;
-#endif
-
-						if (oh->shadowsObject > 0)
-							yaffs_HandleShadowedObject(dev,
-									   oh->
-									   shadowsObject,
-									   1);
-
-
-						yaffs_SetObjectName(in, oh->name);
-						parent =
-						    yaffs_FindOrCreateObjectByNumber
-							(dev, oh->parentObjectId,
-							 YAFFS_OBJECT_TYPE_DIRECTORY);
-
-						 fileSize = oh->fileSize;
-						 isShrink = oh->isShrink;
-						 equivalentObjectId = oh->equivalentObjectId;
-
-					} else {
-						in->variantType = tags.extraObjectType;
-						parent =
-						    yaffs_FindOrCreateObjectByNumber
-							(dev, tags.extraParentObjectId,
-							 YAFFS_OBJECT_TYPE_DIRECTORY);
-						 fileSize = tags.extraFileLength;
-						 isShrink = tags.extraIsShrinkHeader;
-						 equivalentObjectId = tags.extraEquivalentObjectId;
-						in->lazyLoaded = 1;
-
-					}
-					in->dirty = 0;
-
-					if (!parent)
-						alloc_failed = 1;
-
-					/* directory stuff...
-					 * hook up to parent
-					 */
-
-					if (parent && parent->variantType ==
-					    YAFFS_OBJECT_TYPE_UNKNOWN) {
-						/* Set up as a directory */
-						parent->variantType =
-							YAFFS_OBJECT_TYPE_DIRECTORY;
-						YINIT_LIST_HEAD(&parent->variant.
-							directoryVariant.
-							children);
-					} else if (!parent || parent->variantType !=
-						   YAFFS_OBJECT_TYPE_DIRECTORY) {
-						/* Hoosterman, another problem....
-						 * We're trying to use a non-directory as a directory
-						 */
-
-						T(YAFFS_TRACE_ERROR,
-						  (TSTR
-						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
-						    TENDSTR)));
-						parent = dev->lostNFoundDir;
-					}
-
-					yaffs_AddObjectToDirectory(parent, in);
-
-					itsUnlinked = (parent == dev->deletedDir) ||
-						      (parent == dev->unlinkedDir);
-
-					if (isShrink) {
-						/* Mark the block as having a shrinkHeader */
-						bi->hasShrinkHeader = 1;
-					}
-
-					/* Note re hardlinks.
-					 * Since we might scan a hardlink before its equivalent object is scanned
-					 * we put them all in a list.
-					 * After scanning is complete, we should have all the objects, so we run
-					 * through this list and fix up all the chains.
-					 */
-
-					switch (in->variantType) {
-					case YAFFS_OBJECT_TYPE_UNKNOWN:
-						/* Todo got a problem */
-						break;
-					case YAFFS_OBJECT_TYPE_FILE:
-
-						if (in->variant.fileVariant.
-						    scannedFileSize < fileSize) {
-							/* This covers the case where the file size is greater
-							 * than where the data is
-							 * This will happen if the file is resized to be larger
-							 * than its current data extents.
-							 */
-							in->variant.fileVariant.fileSize = fileSize;
-							in->variant.fileVariant.scannedFileSize =
-							    in->variant.fileVariant.fileSize;
-						}
-
-						if (isShrink &&
-						    in->variant.fileVariant.shrinkSize > fileSize) {
-							in->variant.fileVariant.shrinkSize = fileSize;
-						}
-
-						break;
-					case YAFFS_OBJECT_TYPE_HARDLINK:
-						if (!itsUnlinked) {
-							in->variant.hardLinkVariant.equivalentObjectId =
-								equivalentObjectId;
-							in->hardLinks.next =
-								(struct ylist_head *) hardList;
-							hardList = in;
-						}
-						break;
-					case YAFFS_OBJECT_TYPE_DIRECTORY:
-						/* Do nothing */
-						break;
-					case YAFFS_OBJECT_TYPE_SPECIAL:
-						/* Do nothing */
-						break;
-					case YAFFS_OBJECT_TYPE_SYMLINK:
-						if (oh) {
-							in->variant.symLinkVariant.alias =
-								yaffs_CloneString(oh->alias);
-							if (!in->variant.symLinkVariant.alias)
-								alloc_failed = 1;
-						}
-						break;
-					}
-
-				}
-
-			}
-
-		} /* End of scanning for each chunk */
-
-		if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-			/* If we got this far while scanning, then the block is fully allocated. */
-			state = YAFFS_BLOCK_STATE_FULL;
-		}
-
-		bi->blockState = state;
-
-		/* Now let's see if it was dirty */
-		if (bi->pagesInUse == 0 &&
-		    !bi->hasShrinkHeader &&
-		    bi->blockState == YAFFS_BLOCK_STATE_FULL) {
-			yaffs_BlockBecameDirty(dev, blk);
-		}
-
-	}
-
-	if (altBlockIndex)
-		YFREE_ALT(blockIndex);
-	else
-		YFREE(blockIndex);
-
-	/* Ok, we've done all the scanning.
-	 * Fix up the hard link chains.
-	 * We should now have scanned all the objects, now it's time to add these
-	 * hardlinks.
-	 */
-	yaffs_HardlinkFixup(dev, hardList);
-
-
-	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-
-	if (alloc_failed) {
-        T(YAFFS_TRACE_ERROR, (TSTR("malloc failed in yaffs_ScanBackwards" TENDSTR)));
-		return YAFFS_FAIL;
-    }
-
-	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
-
-	return YAFFS_OK;
-}
-#endif // !CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE
-
-/*------------------------------  Directory Functions ----------------------------- */
-
-static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
-{
-	struct ylist_head *lh;
-	yaffs_Object *listObj;
-
-	int count = 0;
-
-	if (!obj) {
-		T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
-		YBUG();
-		return;
-	}
-
-	if (yaffs_SkipVerification(obj->myDev))
-		return;
-
-	if (!obj->parent) {
-		T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
-		YBUG();
-		return;
-	}
-
-	if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-		T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
-		YBUG();
-	}
-
-	/* Iterate through the objects in each hash entry */
-
-	ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
-		if (lh) {
-			listObj = ylist_entry(lh, yaffs_Object, siblings);
-			yaffs_VerifyObject(listObj);
-			if (obj == listObj)
-				count++;
-		}
-	 }
-
-	if (count != 1) {
-		T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
-		YBUG();
-	}
-}
-
-static void yaffs_VerifyDirectory(yaffs_Object *directory)
-{
-	struct ylist_head *lh;
-	yaffs_Object *listObj;
-
-	if (!directory) {
-		YBUG();
-		return;
-	}
-
-	if (yaffs_SkipFullVerification(directory->myDev))
-		return;
-
-	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-		T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
-		YBUG();
-	}
-
-	/* Iterate through the objects in each hash entry */
-
-	ylist_for_each(lh, &directory->variant.directoryVariant.children) {
-		if (lh) {
-			listObj = ylist_entry(lh, yaffs_Object, siblings);
-			if (listObj->parent != directory) {
-				T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
-				YBUG();
-			}
-			yaffs_VerifyObjectInDirectory(listObj);
-		}
-	}
-}
-
-/*
- *yaffs_UpdateParent() handles fixing a directories mtime and ctime when a new
- * link (ie. name) is created or deleted in the directory.
- *
- * ie.
- *   create dir/a : update dir's mtime/ctime
- *   rm dir/a:   update dir's mtime/ctime
- *   modify dir/a: don't update dir's mtimme/ctime
- */
- 
-static void yaffs_UpdateParent(yaffs_Object *obj)
-{
-	if(!obj)
-		return;
-
-	obj->dirty = 1;
-	obj->yst_mtime = obj->yst_ctime = Y_CURRENT_TIME;
-
-	yaffs_UpdateObjectHeader(obj,NULL,0,0,0);
-}
-
-static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
-{
-	yaffs_Device *dev = obj->myDev;
-	yaffs_Object *parent;
-
-	yaffs_VerifyObjectInDirectory(obj);
-	parent = obj->parent;
-
-	yaffs_VerifyDirectory(parent);
-
-	if (dev && dev->removeObjectCallback)
-		dev->removeObjectCallback(obj);
-
-
-	ylist_del_init(&obj->siblings);
-	obj->parent = NULL;
-	
-	yaffs_VerifyDirectory(parent);
-}
-
-static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-					yaffs_Object *obj)
-{
-	if (!directory) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("tragedy: Trying to add an object to a null pointer directory"
-		    TENDSTR)));
-		YBUG();
-		return;
-	}
-	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("tragedy: Trying to add an object to a non-directory"
-		    TENDSTR)));
-		YBUG();
-	}
-
-	if (obj->siblings.prev == NULL) {
-		/* Not initialised */
-		YBUG();
-	}
-
-
-	yaffs_VerifyDirectory(directory);
-
-	yaffs_RemoveObjectFromDirectory(obj);
-
-
-	/* Now add it */
-	ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
-	obj->parent = directory;
-
-	if (directory == obj->myDev->unlinkedDir
-			|| directory == obj->myDev->deletedDir) {
-		obj->unlinked = 1;
-		obj->myDev->nUnlinkedFiles++;
-		obj->renameAllowed = 0;
-	}
-
-	yaffs_VerifyDirectory(directory);
-	yaffs_VerifyObjectInDirectory(obj);
-}
-
-yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
-				     const YCHAR *name)
-{
-	int sum;
-
-	struct ylist_head *i;
-	YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
-
-	yaffs_Object *l;
-
-	if (!name)
-		return NULL;
-
-	if (!directory) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
-		    TENDSTR)));
-		YBUG();
-		return NULL;
-	}
-	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
-		YBUG();
-	}
-
-	sum = yaffs_CalcNameSum(name);
-
-	ylist_for_each(i, &directory->variant.directoryVariant.children) {
-		if (i) {
-			l = ylist_entry(i, yaffs_Object, siblings);
-
-			if (l->parent != directory)
-				YBUG();
-
-			yaffs_CheckObjectDetailsLoaded(l);
-
-			/* Special case for lost-n-found */
-			if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
-				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0)
-					return l;
-			} else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) {
-				/* LostnFound chunk called Objxxx
-				 * Do a real check
-				 */
-				yaffs_GetObjectName(l, buffer,
-						    YAFFS_MAX_NAME_LENGTH + 1);
-				if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
-					return l;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-
-#if 0
-int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
-					int (*fn) (yaffs_Object *))
-{
-	struct ylist_head *i;
-	yaffs_Object *l;
-
-	if (!theDir) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
-		    TENDSTR)));
-		YBUG();
-		return YAFFS_FAIL;
-	}
-	if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
-		YBUG();
-		return YAFFS_FAIL;
-	}
-
-	ylist_for_each(i, &theDir->variant.directoryVariant.children) {
-		if (i) {
-			l = ylist_entry(i, yaffs_Object, siblings);
-			if (l && !fn(l))
-				return YAFFS_FAIL;
-		}
-	}
-
-	return YAFFS_OK;
-
-}
-#endif
-
-/* GetEquivalentObject dereferences any hard links to get to the
- * actual object.
- */
-
-yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)
-{
-	if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-		/* We want the object id of the equivalent object, not this one */
-		obj = obj->variant.hardLinkVariant.equivalentObject;
-		yaffs_CheckObjectDetailsLoaded(obj);
-	}
-	return obj;
-}
-
-int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize)
-{
-	memset(name, 0, buffSize * sizeof(YCHAR));
-
-	yaffs_CheckObjectDetailsLoaded(obj);
-
-	if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
-		yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
-	} else if (obj->hdrChunk <= 0) {
-		YCHAR locName[20];
-		YCHAR numString[20];
-		YCHAR *x = &numString[19];
-		unsigned v = obj->objectId;
-		numString[19] = 0;
-		while (v > 0) {
-			x--;
-			*x = '0' + (v % 10);
-			v /= 10;
-		}
-		/* make up a name */
-		yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
-		yaffs_strcat(locName, x);
-		yaffs_strncpy(name, locName, buffSize - 1);
-
-	}
-#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-	else if (obj->shortName[0])
-		yaffs_strcpy(name, obj->shortName);
-#endif
-	else {
-		int result;
-		__u8 *buffer = yaffs_GetTempBuffer(obj->myDev, __LINE__);
-
-		yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *) buffer;
-
-		memset(buffer, 0, obj->myDev->nDataBytesPerChunk);
-
-		if (obj->hdrChunk > 0) {
-			result = yaffs_ReadChunkWithTagsFromNAND(obj->myDev,
-							obj->hdrChunk, buffer,
-							NULL);
-		}
-		yaffs_strncpy(name, oh->name, buffSize - 1);
-
-		yaffs_ReleaseTempBuffer(obj->myDev, buffer, __LINE__);
-	}
-
-	return yaffs_strlen(name);
-}
-
-int yaffs_GetObjectFileLength(yaffs_Object *obj)
-{
-	/* Dereference any hard linking */
-	obj = yaffs_GetEquivalentObject(obj);
-
-	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-		return obj->variant.fileVariant.fileSize;
-	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
-		return yaffs_strlen(obj->variant.symLinkVariant.alias);
-	else {
-		/* Only a directory should drop through to here */
-		return obj->myDev->nDataBytesPerChunk;
-	}
-}
-
-int yaffs_GetObjectLinkCount(yaffs_Object *obj)
-{
-	int count = 0;
-	struct ylist_head *i;
-
-	if (!obj->unlinked)
-		count++;		/* the object itself */
-
-	ylist_for_each(i, &obj->hardLinks)
-		count++;		/* add the hard links; */
-
-	return count;
-}
-
-int yaffs_GetObjectInode(yaffs_Object *obj)
-{
-	obj = yaffs_GetEquivalentObject(obj);
-
-	return obj->objectId;
-}
-
-unsigned yaffs_GetObjectType(yaffs_Object *obj)
-{
-	obj = yaffs_GetEquivalentObject(obj);
-
-	switch (obj->variantType) {
-	case YAFFS_OBJECT_TYPE_FILE:
-		return DT_REG;
-		break;
-	case YAFFS_OBJECT_TYPE_DIRECTORY:
-		return DT_DIR;
-		break;
-	case YAFFS_OBJECT_TYPE_SYMLINK:
-		return DT_LNK;
-		break;
-	case YAFFS_OBJECT_TYPE_HARDLINK:
-		return DT_REG;
-		break;
-	case YAFFS_OBJECT_TYPE_SPECIAL:
-		if (S_ISFIFO(obj->yst_mode))
-			return DT_FIFO;
-		if (S_ISCHR(obj->yst_mode))
-			return DT_CHR;
-		if (S_ISBLK(obj->yst_mode))
-			return DT_BLK;
-		if (S_ISSOCK(obj->yst_mode))
-			return DT_SOCK;
-	default:
-		return DT_REG;
-		break;
-	}
-}
-
-YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj)
-{
-	obj = yaffs_GetEquivalentObject(obj);
-	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
-		return yaffs_CloneString(obj->variant.symLinkVariant.alias);
-	else
-		return yaffs_CloneString(_Y(""));
-}
-
-#ifndef CONFIG_YAFFS_WINCE
-
-int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
-{
-	unsigned int valid = attr->ia_valid;
-
-	if (valid & ATTR_MODE)
-		obj->yst_mode = attr->ia_mode;
-	if (valid & ATTR_UID)
-		obj->yst_uid = attr->ia_uid;
-	if (valid & ATTR_GID)
-		obj->yst_gid = attr->ia_gid;
-
-	if (valid & ATTR_ATIME)
-		obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
-	if (valid & ATTR_CTIME)
-		obj->yst_ctime = Y_TIME_CONVERT(attr->ia_ctime);
-	if (valid & ATTR_MTIME)
-		obj->yst_mtime = Y_TIME_CONVERT(attr->ia_mtime);
-
-	if (valid & ATTR_SIZE)
-		yaffs_ResizeFile(obj, attr->ia_size);
-
-	yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
-
-	return YAFFS_OK;
-
-}
-int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
-{
-	unsigned int valid = 0;
-
-	attr->ia_mode = obj->yst_mode;
-	valid |= ATTR_MODE;
-	attr->ia_uid = obj->yst_uid;
-	valid |= ATTR_UID;
-	attr->ia_gid = obj->yst_gid;
-	valid |= ATTR_GID;
-
-	Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;
-	valid |= ATTR_ATIME;
-	Y_TIME_CONVERT(attr->ia_ctime) = obj->yst_ctime;
-	valid |= ATTR_CTIME;
-	Y_TIME_CONVERT(attr->ia_mtime) = obj->yst_mtime;
-	valid |= ATTR_MTIME;
-
-	attr->ia_size = yaffs_GetFileSize(obj);
-	valid |= ATTR_SIZE;
-
-	attr->ia_valid = valid;
-
-	return YAFFS_OK;
-}
-
-#endif
-
-#if 0
-int yaffs_DumpObject(yaffs_Object *obj)
-{
-	YCHAR name[257];
-
-	yaffs_GetObjectName(obj, name, YAFFS_MAX_NAME_LENGTH + 1);
-
-	T(YAFFS_TRACE_ALWAYS,
-	  (TSTR
-	   ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d"
-	    " chunk %d type %d size %d\n"
-	    TENDSTR), obj->objectId, yaffs_GetObjectInode(obj), name,
-	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdrChunk,
-	   yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));
-
-	return YAFFS_OK;
-}
-#endif
-
-/*---------------------------- Initialisation code -------------------------------------- */
-
-static int yaffs_CheckDevFunctions(const yaffs_Device *dev)
-{
-
-	/* Common functions, gotta have */
-	if (!dev->eraseBlockInNAND || !dev->initialiseNAND)
-		return 0;
-
-#ifdef CONFIG_YAFFS_YAFFS2
-
-	/* Can use the "with tags" style interface for yaffs1 or yaffs2 */
-	if (dev->writeChunkWithTagsToNAND &&
-	    dev->readChunkWithTagsFromNAND &&
-	    !dev->writeChunkToNAND &&
-	    !dev->readChunkFromNAND &&
-	    dev->markNANDBlockBad && dev->queryNANDBlock)
-		return 1;
-#endif
-
-	/* Can use the "spare" style interface for yaffs1 */
-	if (!dev->isYaffs2 &&
-	    !dev->writeChunkWithTagsToNAND &&
-	    !dev->readChunkWithTagsFromNAND &&
-	    dev->writeChunkToNAND &&
-	    dev->readChunkFromNAND &&
-	    !dev->markNANDBlockBad && !dev->queryNANDBlock)
-		return 1;
-
-	return 0;		/* bad */
-}
-
-
-static int yaffs_CreateInitialDirectories(yaffs_Device *dev)
-{
-	/* Initialise the unlinked, deleted, root and lost and found directories */
-
-	dev->lostNFoundDir = dev->rootDir =  NULL;
-	dev->unlinkedDir = dev->deletedDir = NULL;
-
-	dev->unlinkedDir =
-	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_UNLINKED, S_IFDIR);
-
-	dev->deletedDir =
-	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_DELETED, S_IFDIR);
-
-	dev->rootDir =
-	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_ROOT,
-				      YAFFS_ROOT_MODE | S_IFDIR);
-	dev->lostNFoundDir =
-	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND,
-				      YAFFS_LOSTNFOUND_MODE | S_IFDIR);
-
-	if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) {
-		yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
-		return YAFFS_OK;
-	}
-
-	return YAFFS_FAIL;
-}
-
-int yaffs_GutsInitialise(yaffs_Device *dev)
-{
-	int init_failed = 0;
-	unsigned x;
-	int bits;
-
-	T(YAFFS_TRACE_TRACING, (TSTR("yaffs: yaffs_GutsInitialise()" TENDSTR)));
-
-	/* Check stuff that must be set */
-
-	if (!dev) {
-		T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Need a device" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	dev->internalStartBlock = dev->startBlock;
-	dev->internalEndBlock = dev->endBlock;
-	dev->blockOffset = 0;
-	dev->chunkOffset = 0;
-	dev->nFreeChunks = 0;
-
-	dev->gcBlock = -1;
-
-	if (dev->startBlock == 0) {
-		dev->internalStartBlock = dev->startBlock + 1;
-		dev->internalEndBlock = dev->endBlock + 1;
-		dev->blockOffset = 1;
-		dev->chunkOffset = dev->nChunksPerBlock;
-	}
-
-	/* Check geometry parameters. */
-
-	if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) ||
-	    (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) ||
-	    (dev->inbandTags && !dev->isYaffs2) ||
-	     dev->nChunksPerBlock < 2 ||
-	     dev->nReservedBlocks < 2 ||
-	     dev->internalStartBlock <= 0 ||
-	     dev->internalEndBlock <= 0 ||
-	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)) {	/* otherwise it is too small */
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d "
-		    TENDSTR), dev->totalBytesPerChunk, dev->isYaffs2 ? "2" : "", dev->inbandTags));
-		return YAFFS_FAIL;
-	}
-
-	if (yaffs_InitialiseNAND(dev) != YAFFS_OK) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR("yaffs: InitialiseNAND failed" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	/* Sort out space for inband tags, if required */
-	if (dev->inbandTags)
-		dev->nDataBytesPerChunk = dev->totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart);
-	else
-		dev->nDataBytesPerChunk = dev->totalBytesPerChunk;
-
-	/* Got the right mix of functions? */
-	if (!yaffs_CheckDevFunctions(dev)) {
-		/* Function missing */
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("yaffs: device function(s) missing or wrong\n" TENDSTR)));
-
-		return YAFFS_FAIL;
-	}
-
-	/* This is really a compilation check. */
-	if (!yaffs_CheckStructures()) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR("yaffs_CheckStructures failed\n" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	if (dev->isMounted) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR("yaffs: device already mounted\n" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	/* Finished with most checks. One or two more checks happen later on too. */
-
-	dev->isMounted = 1;
-
-	/* OK now calculate a few things for the device */
-
-	/*
-	 *  Calculate all the chunk size manipulation numbers:
-	 */
-	x = dev->nDataBytesPerChunk;
-	/* We always use dev->chunkShift and dev->chunkDiv */
-	dev->chunkShift = Shifts(x);
-	x >>= dev->chunkShift;
-	dev->chunkDiv = x;
-	/* We only use chunk mask if chunkDiv is 1 */
-	dev->chunkMask = (1<<dev->chunkShift) - 1;
-
-	/*
-	 * Calculate chunkGroupBits.
-	 * We need to find the next power of 2 > than internalEndBlock
-	 */
-
-	x = dev->nChunksPerBlock * (dev->internalEndBlock + 1);
-
-	bits = ShiftsGE(x);
-
-	/* Set up tnode width if wide tnodes are enabled. */
-	if (!dev->wideTnodesDisabled) {
-		/* bits must be even so that we end up with 32-bit words */
-		if (bits & 1)
-			bits++;
-		if (bits < 16)
-			dev->tnodeWidth = 16;
-		else
-			dev->tnodeWidth = bits;
-	} else
-		dev->tnodeWidth = 16;
-
-	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-
-	/* Level0 Tnodes are 16 bits or wider (if wide tnodes are enabled),
-	 * so if the bitwidth of the
-	 * chunk range we're using is greater than 16 we need
-	 * to figure out chunk shift and chunkGroupSize
-	 */
-
-	if (bits <= dev->tnodeWidth)
-		dev->chunkGroupBits = 0;
-	else
-		dev->chunkGroupBits = bits - dev->tnodeWidth;
-
-
-	dev->chunkGroupSize = 1 << dev->chunkGroupBits;
-
-	if (dev->nChunksPerBlock < dev->chunkGroupSize) {
-		/* We have a problem because the soft delete won't work if
-		 * the chunk group size > chunks per block.
-		 * This can be remedied by using larger "virtual blocks".
-		 */
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR("yaffs: chunk group too large\n" TENDSTR)));
-
-		return YAFFS_FAIL;
-	}
-
-	/* OK, we've finished verifying the device, lets continue with initialisation */
-
-	/* More device initialisation */
-	dev->garbageCollections = 0;
-	dev->passiveGarbageCollections = 0;
-	dev->currentDirtyChecker = 0;
-	dev->bufferedBlock = -1;
-	dev->doingBufferedBlockRewrite = 0;
-	dev->nDeletedFiles = 0;
-	dev->nBackgroundDeletions = 0;
-	dev->nUnlinkedFiles = 0;
-	dev->eccFixed = 0;
-	dev->eccUnfixed = 0;
-	dev->tagsEccFixed = 0;
-	dev->tagsEccUnfixed = 0;
-	dev->nErasureFailures = 0;
-	dev->nErasedBlocks = 0;
-	dev->isDoingGC = 0;
-	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
-
-	/* Initialise temporary buffers and caches. */
-	if (!yaffs_InitialiseTempBuffers(dev))
-		init_failed = 1;
-
-	dev->srCache = NULL;
-	dev->gcCleanupList = NULL;
-
-
-	if (!init_failed &&
-	    dev->nShortOpCaches > 0) {
-		int i;
-		void *buf;
-		int srCacheBytes = dev->nShortOpCaches * sizeof(yaffs_ChunkCache);
-
-		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES)
-			dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES;
-
-		dev->srCache =  YMALLOC(srCacheBytes);
-
-		buf = (__u8 *) dev->srCache;
-
-		if (dev->srCache)
-			memset(dev->srCache, 0, srCacheBytes);
-
-		for (i = 0; i < dev->nShortOpCaches && buf; i++) {
-			dev->srCache[i].object = NULL;
-			dev->srCache[i].lastUse = 0;
-			dev->srCache[i].dirty = 0;
-			dev->srCache[i].data = buf = YMALLOC_DMA(dev->totalBytesPerChunk);
-		}
-		if (!buf)
-			init_failed = 1;
-
-		dev->srLastUse = 0;
-	}
-
-	dev->cacheHits = 0;
-
-	if (!init_failed) {
-		dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
-		if (!dev->gcCleanupList)
-			init_failed = 1;
-	}
-
-	if (dev->isYaffs2)
-		dev->useHeaderFileSize = 1;
-
-	if (!init_failed && !yaffs_InitialiseBlocks(dev))
-		init_failed = 1;
-
-	yaffs_InitialiseTnodes(dev);
-	yaffs_InitialiseObjects(dev);
-
-	if (!init_failed && !yaffs_CreateInitialDirectories(dev))
-		init_failed = 1;
-
-
-	if (!init_failed) {
-		/* Now scan the flash. */
-		if (dev->isYaffs2) {
-#ifdef CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE
-            init_failed = 1;
-#else
-			if (yaffs_CheckpointRestore(dev)) {
-				yaffs_CheckObjectDetailsLoaded(dev->rootDir);
-				T(YAFFS_TRACE_ALWAYS,
-				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
-			} else {
-
-				/* Clean up the mess caused by an aborted checkpoint load
-				 * and scan backwards.
-				 */
-				yaffs_DeinitialiseBlocks(dev);
-				yaffs_DeinitialiseTnodes(dev);
-				yaffs_DeinitialiseObjects(dev);
-
-
-				dev->nErasedBlocks = 0;
-				dev->nFreeChunks = 0;
-				dev->allocationBlock = -1;
-				dev->allocationPage = -1;
-				dev->nDeletedFiles = 0;
-				dev->nUnlinkedFiles = 0;
-				dev->nBackgroundDeletions = 0;
-				dev->oldestDirtySequence = 0;
-
-				if (!init_failed && !yaffs_InitialiseBlocks(dev))
-					init_failed = 1;
-
-				yaffs_InitialiseTnodes(dev);
-				yaffs_InitialiseObjects(dev);
-
-				if (!init_failed && !yaffs_CreateInitialDirectories(dev))
-					init_failed = 1;
-
-				if (!init_failed && !yaffs_ScanBackwards(dev))
-					init_failed = 1;
-			}
-#endif // !CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE
-        } else /* !dev->isYaffs2 */ {
-#ifdef CONFIG_YAFFS_NO_YAFFS1
-            init_failed = 1;
-#else
-            if (!yaffs_Scan(dev))
-                init_failed = 1;
-#endif
-        }
-
-        yaffs_StripDeletedObjects(dev);
-		yaffs_FixHangingObjects(dev);
-		if(dev->emptyLostAndFound)
-			yaffs_EmptyLostAndFound(dev);
-	}
-
-	if (init_failed) {
-		/* Clean up the mess */
-		T(YAFFS_TRACE_TRACING,
-		  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-
-		yaffs_Deinitialise(dev);
-		return YAFFS_FAIL;
-	}
-
-	/* Zero out stats */
-	dev->nPageReads = 0;
-	dev->nPageWrites = 0;
-	dev->nBlockErasures = 0;
-	dev->nGCCopies = 0;
-	dev->nRetriedWrites = 0;
-
-	dev->nRetiredBlocks = 0;
-
-	yaffs_VerifyFreeChunks(dev);
-	yaffs_VerifyBlocks(dev);
-
-	/* Clean up any aborted checkpoint data */
-	if(!dev->isCheckpointed && dev->blocksInCheckpoint > 0)
-		yaffs_InvalidateCheckpoint(dev);
-
-	T(YAFFS_TRACE_TRACING,
-	  (TSTR("yaffs: yaffs_GutsInitialise() done.\n" TENDSTR)));
-	return YAFFS_OK;
-
-}
-
-void yaffs_Deinitialise(yaffs_Device *dev)
-{
-	if (dev->isMounted) {
-		int i;
-
-		yaffs_DeinitialiseBlocks(dev);
-		yaffs_DeinitialiseTnodes(dev);
-		yaffs_DeinitialiseObjects(dev);
-		if (dev->nShortOpCaches > 0 &&
-		    dev->srCache) {
-
-			for (i = 0; i < dev->nShortOpCaches; i++) {
-				if (dev->srCache[i].data)
-					YFREE(dev->srCache[i].data);
-				dev->srCache[i].data = NULL;
-			}
-
-			YFREE(dev->srCache);
-			dev->srCache = NULL;
-		}
-
-		YFREE(dev->gcCleanupList);
-
-		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
-			YFREE(dev->tempBuffer[i].buffer);
-
-		dev->isMounted = 0;
-
-		if (dev->deinitialiseNAND)
-			dev->deinitialiseNAND(dev);
-	}
-}
-
-static int yaffs_CountFreeChunks(yaffs_Device *dev)
-{
-	int nFree;
-	int b;
-
-	yaffs_BlockInfo *blk;
-
-	for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock;
-			b++) {
-		blk = yaffs_GetBlockInfo(dev, b);
-
-		switch (blk->blockState) {
-		case YAFFS_BLOCK_STATE_EMPTY:
-		case YAFFS_BLOCK_STATE_ALLOCATING:
-		case YAFFS_BLOCK_STATE_COLLECTING:
-		case YAFFS_BLOCK_STATE_FULL:
-			nFree +=
-			    (dev->nChunksPerBlock - blk->pagesInUse +
-			     blk->softDeletions);
-			break;
-		default:
-			break;
-		}
-	}
-
-	return nFree;
-}
-
-int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
-{
-	/* This is what we report to the outside world */
-
-	int nFree;
-	int nDirtyCacheChunks;
-	int blocksForCheckpoint;
-	int i;
-
-#if 1
-	nFree = dev->nFreeChunks;
-#else
-	nFree = yaffs_CountFreeChunks(dev);
-#endif
-
-	nFree += dev->nDeletedFiles;
-
-	/* Now count the number of dirty chunks in the cache and subtract those */
-
-	for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
-		if (dev->srCache[i].dirty)
-			nDirtyCacheChunks++;
-	}
-
-	nFree -= nDirtyCacheChunks;
-
-	nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock);
-
-	/* Now we figure out how much to reserve for the checkpoint and report that... */
-	blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-	if (blocksForCheckpoint < 0)
-		blocksForCheckpoint = 0;
-
-	nFree -= (blocksForCheckpoint * dev->nChunksPerBlock);
-
-	if (nFree < 0)
-		nFree = 0;
-
-	return nFree;
-
-}
-
-static int yaffs_freeVerificationFailures;
-
-static void yaffs_VerifyFreeChunks(yaffs_Device *dev)
-{
-	int counted;
-	int difference;
-
-	if (yaffs_SkipVerification(dev))
-		return;
-
-	counted = yaffs_CountFreeChunks(dev);
-
-	difference = dev->nFreeChunks - counted;
-
-	if (difference) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR("Freechunks verification failure %d %d %d" TENDSTR),
-		   dev->nFreeChunks, counted, difference));
-		yaffs_freeVerificationFailures++;
-	}
-}
-
-/*---------------------------------------- YAFFS test code ----------------------*/
-
-#define yaffs_CheckStruct(structure, syze, name) \
-	do { \
-		if (sizeof(structure) != syze) { \
-			T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %u\n" TENDSTR),\
-				name, syze, (unsigned)sizeof(structure))); \
-			return YAFFS_FAIL; \
-		} \
-	} while (0)
-
-static int yaffs_CheckStructures(void)
-{
-/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags"); */
-/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */
-/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */
-#ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
-	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
-#endif
-#ifndef CONFIG_YAFFS_WINCE
-	yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
-#endif
-	return YAFFS_OK;
-	(void) yaffs_DeleteWorker;
-	(void) yaffs_VerifyTnodeWorker;
-}
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_guts.h
+++ /dev/null
@@ -1,915 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFS_GUTS_H__
-#define __YAFFS_GUTS_H__
-
-#include "devextras.h"
-#include "yportenv.h"
-
-#define YAFFS_OK	1
-#define YAFFS_FAIL  0
-
-/* Give us a  Y=0x59,
- * Give us an A=0x41,
- * Give us an FF=0xFF
- * Give us an S=0x53
- * And what have we got...
- */
-#define YAFFS_MAGIC			0x5941FF53
-
-#define YAFFS_NTNODES_LEVEL0	  	16
-#define YAFFS_TNODES_LEVEL0_BITS	4
-#define YAFFS_TNODES_LEVEL0_MASK	0xf
-
-#define YAFFS_NTNODES_INTERNAL 		(YAFFS_NTNODES_LEVEL0 / 2)
-#define YAFFS_TNODES_INTERNAL_BITS 	(YAFFS_TNODES_LEVEL0_BITS - 1)
-#define YAFFS_TNODES_INTERNAL_MASK	0x7
-#define YAFFS_TNODES_MAX_LEVEL		6
-
-#ifndef CONFIG_YAFFS_NO_YAFFS1
-#define YAFFS_BYTES_PER_SPARE		16
-#define YAFFS_BYTES_PER_CHUNK		512
-#define YAFFS_CHUNK_SIZE_SHIFT		9
-#define YAFFS_CHUNKS_PER_BLOCK		32
-#define YAFFS_BYTES_PER_BLOCK		(YAFFS_CHUNKS_PER_BLOCK*YAFFS_BYTES_PER_CHUNK)
-#endif
-
-#define YAFFS_MIN_YAFFS2_CHUNK_SIZE 	1024
-#define YAFFS_MIN_YAFFS2_SPARE_SIZE	32
-
-#define YAFFS_MAX_CHUNK_ID		0x000FFFFF
-
-#define YAFFS_UNUSED_OBJECT_ID		0x0003FFFF
-
-#define YAFFS_ALLOCATION_NOBJECTS	100
-#define YAFFS_ALLOCATION_NTNODES	100
-#define YAFFS_ALLOCATION_NLINKS		100
-
-#define YAFFS_NOBJECT_BUCKETS		256
-
-
-#define YAFFS_OBJECT_SPACE		0x40000
-
-#define YAFFS_CHECKPOINT_VERSION 	3
-
-#ifdef CONFIG_YAFFS_UNICODE
-#define YAFFS_MAX_NAME_LENGTH		127
-#define YAFFS_MAX_ALIAS_LENGTH		79
-#else
-#define YAFFS_MAX_NAME_LENGTH		255
-#define YAFFS_MAX_ALIAS_LENGTH		159
-#endif
-
-#define YAFFS_SHORT_NAME_LENGTH		15
-
-/* Some special object ids for pseudo objects */
-#define YAFFS_OBJECTID_ROOT		1
-#define YAFFS_OBJECTID_LOSTNFOUND	2
-#define YAFFS_OBJECTID_UNLINKED		3
-#define YAFFS_OBJECTID_DELETED		4
-
-/* Sseudo object ids for checkpointing */
-#define YAFFS_OBJECTID_SB_HEADER	0x10
-#define YAFFS_OBJECTID_CHECKPOINT_DATA	0x20
-#define YAFFS_SEQUENCE_CHECKPOINT_DATA  0x21
-
-/* */
-
-#define YAFFS_MAX_SHORT_OP_CACHES	20
-
-#define YAFFS_N_TEMP_BUFFERS		CYGNUM_FS_YAFFS_TEMP_BUFFERS
-
-/* We limit the number attempts at sucessfully saving a chunk of data.
- * Small-page devices have 32 pages per block; large-page devices have 64.
- * Default to something in the order of 5 to 10 blocks worth of chunks.
- */
-#define YAFFS_WR_ATTEMPTS		(5*64)
-
-/* Sequence numbers are used in YAFFS2 to determine block allocation order.
- * The range is limited slightly to help distinguish bad numbers from good.
- * This also allows us to perhaps in the future use special numbers for
- * special purposes.
- * EFFFFF00 allows the allocation of 8 blocks per second (~1Mbytes) for 15 years,
- * and is a larger number than the lifetime of a 2GB device.
- */
-#define YAFFS_LOWEST_SEQUENCE_NUMBER	0x00001000
-#define YAFFS_HIGHEST_SEQUENCE_NUMBER	0xEFFFFF00
-
-/* Special sequence number for bad block that failed to be marked bad */
-#define YAFFS_SEQUENCE_BAD_BLOCK	0xFFFF0000
-
-/* ChunkCache is used for short read/write operations.*/
-typedef struct {
-	struct yaffs_ObjectStruct *object;
-	int chunkId;
-	int lastUse;
-	int dirty;
-	int nBytes;		/* Only valid if the cache is dirty */
-	int locked;		/* Can't push out or flush while locked. */
-#ifdef CONFIG_YAFFS_YAFFS2
-	__u8 *data;
-#else
-	__u8 data[YAFFS_BYTES_PER_CHUNK];
-#endif
-} yaffs_ChunkCache;
-
-
-
-/* Tags structures in RAM
- * NB This uses bitfield. Bitfields should not straddle a u32 boundary otherwise
- * the structure size will get blown out.
- */
-
-#ifndef CONFIG_YAFFS_NO_YAFFS1
-typedef struct {
-	unsigned chunkId:20;
-	unsigned serialNumber:2;
-	unsigned byteCountLSB:10;
-	unsigned objectId:18;
-	unsigned ecc:12;
-	unsigned byteCountMSB:2;
-} yaffs_Tags;
-
-typedef union {
-	yaffs_Tags asTags;
-	__u8 asBytes[8];
-} yaffs_TagsUnion;
-
-#endif
-
-/* Stuff used for extended tags in YAFFS2 */
-
-typedef enum {
-	YAFFS_ECC_RESULT_UNKNOWN,
-	YAFFS_ECC_RESULT_NO_ERROR,
-	YAFFS_ECC_RESULT_FIXED,
-	YAFFS_ECC_RESULT_UNFIXED
-} yaffs_ECCResult;
-
-typedef enum {
-	YAFFS_OBJECT_TYPE_UNKNOWN,
-	YAFFS_OBJECT_TYPE_FILE,
-	YAFFS_OBJECT_TYPE_SYMLINK,
-	YAFFS_OBJECT_TYPE_DIRECTORY,
-	YAFFS_OBJECT_TYPE_HARDLINK,
-	YAFFS_OBJECT_TYPE_SPECIAL
-} yaffs_ObjectType;
-
-#define YAFFS_OBJECT_TYPE_MAX YAFFS_OBJECT_TYPE_SPECIAL
-
-typedef struct {
-
-	unsigned validMarker0;
-	unsigned chunkUsed;	/*  Status of the chunk: used or unused */
-	unsigned objectId;	/* If 0 then this is not part of an object (unused) */
-	unsigned chunkId;	/* If 0 then this is a header, else a data chunk */
-	unsigned byteCount;	/* Only valid for data chunks */
-
-	/* The following stuff only has meaning when we read */
-	yaffs_ECCResult eccResult;
-	unsigned blockBad;
-
-	/* YAFFS 1 stuff */
-	unsigned chunkDeleted;	/* The chunk is marked deleted */
-	unsigned serialNumber;	/* Yaffs1 2-bit serial number */
-
-	/* YAFFS2 stuff */
-	unsigned sequenceNumber;	/* The sequence number of this block */
-
-	/* Extra info if this is an object header (YAFFS2 only) */
-
-	unsigned extraHeaderInfoAvailable;	/* There is extra info available if this is not zero */
-	unsigned extraParentObjectId;	/* The parent object */
-	unsigned extraIsShrinkHeader;	/* Is it a shrink header? */
-	unsigned extraShadows;		/* Does this shadow another object? */
-
-	yaffs_ObjectType extraObjectType;	/* What object type? */
-
-	unsigned extraFileLength;		/* Length if it is a file */
-	unsigned extraEquivalentObjectId;	/* Equivalent object Id if it is a hard link */
-
-	unsigned validMarker1;
-
-} yaffs_ExtendedTags;
-
-/* Spare structure for YAFFS1 */
-typedef struct {
-	__u8 tagByte0;
-	__u8 tagByte1;
-	__u8 tagByte2;
-	__u8 tagByte3;
-	__u8 pageStatus;	/* set to 0 to delete the chunk */
-	__u8 blockStatus;
-	__u8 tagByte4;
-	__u8 tagByte5;
-	__u8 ecc1[3];
-	__u8 tagByte6;
-	__u8 tagByte7;
-	__u8 ecc2[3];
-} yaffs_Spare;
-
-/*Special structure for passing through to mtd */
-struct yaffs_NANDSpare {
-	yaffs_Spare spare;
-	int eccres1;
-	int eccres2;
-};
-
-/* Block data in RAM */
-
-typedef enum {
-	YAFFS_BLOCK_STATE_UNKNOWN = 0,
-
-	YAFFS_BLOCK_STATE_SCANNING,
-	YAFFS_BLOCK_STATE_NEEDS_SCANNING,
-	/* The block might have something on it (ie it is allocating or full, perhaps empty)
-	 * but it needs to be scanned to determine its true state.
-	 * This state is only valid during yaffs_Scan.
-	 * NB We tolerate empty because the pre-scanner might be incapable of deciding
-	 * However, if this state is returned on a YAFFS2 device, then we expect a sequence number
-	 */
-
-	YAFFS_BLOCK_STATE_EMPTY,
-	/* This block is empty */
-
-	YAFFS_BLOCK_STATE_ALLOCATING,
-	/* This block is partially allocated.
-	 * At least one page holds valid data.
-	 * This is the one currently being used for page
-	 * allocation. Should never be more than one of these
-	 */
-
-	YAFFS_BLOCK_STATE_FULL,
-	/* All the pages in this block have been allocated.
-	 */
-
-	YAFFS_BLOCK_STATE_DIRTY,
-	/* All pages have been allocated and deleted.
-	 * Erase me, reuse me.
-	 */
-
-	YAFFS_BLOCK_STATE_CHECKPOINT,
-	/* This block is assigned to holding checkpoint data.
-	 */
-
-	YAFFS_BLOCK_STATE_COLLECTING,
-	/* This block is being garbage collected */
-
-	YAFFS_BLOCK_STATE_DEAD
-	/* This block has failed and is not in use */
-} yaffs_BlockState;
-
-#define	YAFFS_NUMBER_OF_BLOCK_STATES (YAFFS_BLOCK_STATE_DEAD + 1)
-
-
-typedef struct {
-
-	int softDeletions:10;	/* number of soft deleted pages */
-	int pagesInUse:10;	/* number of pages in use */
-	unsigned blockState:4;	/* One of the above block states. NB use unsigned because enum is sometimes an int */
-	__u32 needsRetiring:1;	/* Data has failed on this block, need to get valid data off */
-				/* and retire the block. */
-	__u32 skipErasedCheck:1; /* If this is set we can skip the erased check on this block */
-	__u32 gcPrioritise:1; 	/* An ECC check or blank check has failed on this block.
-				   It should be prioritised for GC */
-	__u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
-
-#ifdef CONFIG_YAFFS_YAFFS2
-	__u32 hasShrinkHeader:1; /* This block has at least one shrink object header */
-	__u32 sequenceNumber;	 /* block sequence number for yaffs2 */
-#endif
-
-} yaffs_BlockInfo;
-
-/* -------------------------- Object structure -------------------------------*/
-/* This is the object structure as stored on NAND */
-
-typedef struct {
-	yaffs_ObjectType type;
-
-	/* Apply to everything  */
-	int parentObjectId;
-	__u16 sum__NoLongerUsed;        /* checksum of name. No longer used */
-	YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
-
-	/* The following apply to directories, files, symlinks - not hard links */
-	__u32 yst_mode;         /* protection */
-
-#ifdef CONFIG_YAFFS_WINCE
-	__u32 notForWinCE[5];
-#else
-	__u32 yst_uid;
-	__u32 yst_gid;
-	__u32 yst_atime;
-	__u32 yst_mtime;
-	__u32 yst_ctime;
-#endif
-
-	/* File size  applies to files only */
-	int fileSize;
-
-	/* Equivalent object id applies to hard links only. */
-	int equivalentObjectId;
-
-	/* Alias is for symlinks only. */
-	YCHAR alias[YAFFS_MAX_ALIAS_LENGTH + 1];
-
-	__u32 yst_rdev;		/* device stuff for block and char devices (major/min) */
-
-#ifdef CONFIG_YAFFS_WINCE
-	__u32 win_ctime[2];
-	__u32 win_atime[2];
-	__u32 win_mtime[2];
-#else
-	__u32 roomToGrow[6];
-
-#endif
-	__u32 inbandShadowsObject;
-	__u32 inbandIsShrink;
-
-	__u32 reservedSpace[2];
-	int shadowsObject;	/* This object header shadows the specified object if > 0 */
-
-	/* isShrink applies to object headers written when we shrink the file (ie resize) */
-	__u32 isShrink;
-
-} yaffs_ObjectHeader;
-
-/*--------------------------- Tnode -------------------------- */
-
-union yaffs_Tnode_union {
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-	union yaffs_Tnode_union *internal[YAFFS_NTNODES_INTERNAL + 1];
-#else
-	union yaffs_Tnode_union *internal[YAFFS_NTNODES_INTERNAL];
-#endif
-/*	__u16 level0[YAFFS_NTNODES_LEVEL0]; */
-
-};
-
-typedef union yaffs_Tnode_union yaffs_Tnode;
-
-struct yaffs_TnodeList_struct {
-	struct yaffs_TnodeList_struct *next;
-	yaffs_Tnode *tnodes;
-};
-
-typedef struct yaffs_TnodeList_struct yaffs_TnodeList;
-
-/*------------------------  Object -----------------------------*/
-/* An object can be one of:
- * - a directory (no data, has children links
- * - a regular file (data.... not prunes :->).
- * - a symlink [symbolic link] (the alias).
- * - a hard link
- */
-
-typedef struct {
-	__u32 fileSize;
-	__u32 scannedFileSize;
-	__u32 shrinkSize;
-	int topLevel;
-	yaffs_Tnode *top;
-} yaffs_FileStructure;
-
-typedef struct {
-	struct ylist_head children;     /* list of child links */
-} yaffs_DirectoryStructure;
-
-typedef struct {
-	YCHAR *alias;
-} yaffs_SymLinkStructure;
-
-typedef struct {
-	struct yaffs_ObjectStruct *equivalentObject;
-	__u32 equivalentObjectId;
-} yaffs_HardLinkStructure;
-
-typedef union {
-	yaffs_FileStructure fileVariant;
-	yaffs_DirectoryStructure directoryVariant;
-	yaffs_SymLinkStructure symLinkVariant;
-	yaffs_HardLinkStructure hardLinkVariant;
-} yaffs_ObjectVariant;
-
-
-
-struct yaffs_ObjectStruct {
-	__u8 deleted:1;		/* This should only apply to unlinked files. */
-	__u8 softDeleted:1;	/* it has also been soft deleted */
-	__u8 unlinked:1;	/* An unlinked file. The file should be in the unlinked directory.*/
-	__u8 fake:1;		/* A fake object has no presence on NAND. */
-	__u8 renameAllowed:1;	/* Some objects are not allowed to be renamed. */
-	__u8 unlinkAllowed:1;
-	__u8 dirty:1;		/* the object needs to be written to flash */
-	__u8 valid:1;		/* When the file system is being loaded up, this
-				 * object might be created before the data
-				 * is available (ie. file data records appear before the header).
-				 */
-	__u8 lazyLoaded:1;	/* This object has been lazy loaded and is missing some detail */
-
-	__u8 deferedFree:1;	/* For Linux kernel. Object is removed from NAND, but is
-				 * still in the inode cache. Free of object is defered.
-				 * until the inode is released.
-				 */
-	__u8 beingCreated:1;	/* This object is still being created so skip some checks. */
-	__u8 isShadowed:1;	/* This object is shadowed on the way to being renamed. */
-
-	__u8 serial;		/* serial number of chunk in NAND. Cached here */
-	__u16 sum;		/* sum of the name to speed searching */
-
-	struct yaffs_DeviceStruct *myDev;       /* The device I'm on */
-
-	struct ylist_head hashLink;     /* list of objects in this hash bucket */
-
-	struct ylist_head hardLinks;    /* all the equivalent hard linked objects */
-
-	/* directory structure stuff */
-	/* also used for linking up the free list */
-	struct yaffs_ObjectStruct *parent;
-	struct ylist_head siblings;
-
-	/* Where's my object header in NAND? */
-	int hdrChunk;
-
-	int nDataChunks;	/* Number of data chunks attached to the file. */
-
-	__u32 objectId;		/* the object id value */
-
-	__u32 yst_mode;
-
-#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-	YCHAR shortName[YAFFS_SHORT_NAME_LENGTH + 1];
-#endif
-
-#ifndef __KERNEL__
-	__u32 inUse;
-#endif
-
-#ifdef CONFIG_YAFFS_WINCE
-	__u32 win_ctime[2];
-	__u32 win_mtime[2];
-	__u32 win_atime[2];
-#else
-	__u32 yst_uid;
-	__u32 yst_gid;
-	__u32 yst_atime;
-	__u32 yst_mtime;
-	__u32 yst_ctime;
-#endif
-
-	__u32 yst_rdev;
-
-#ifdef __KERNEL__
-	struct inode *myInode;
-
-#endif
-
-	yaffs_ObjectType variantType;
-
-	yaffs_ObjectVariant variant;
-
-};
-
-typedef struct yaffs_ObjectStruct yaffs_Object;
-
-struct yaffs_ObjectList_struct {
-	yaffs_Object *objects;
-	struct yaffs_ObjectList_struct *next;
-};
-
-typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
-
-typedef struct {
-	struct ylist_head list;
-	int count;
-} yaffs_ObjectBucket;
-
-
-/* yaffs_CheckpointObject holds the definition of an object as dumped
- * by checkpointing.
- */
-
-typedef struct {
-	int structType;
-	__u32 objectId;
-	__u32 parentId;
-	int hdrChunk;
-	yaffs_ObjectType variantType:3;
-	__u8 deleted:1;
-	__u8 softDeleted:1;
-	__u8 unlinked:1;
-	__u8 fake:1;
-	__u8 renameAllowed:1;
-	__u8 unlinkAllowed:1;
-	__u8 serial;
-
-	int nDataChunks;
-	__u32 fileSizeOrEquivalentObjectId;
-} yaffs_CheckpointObject;
-
-/*--------------------- Temporary buffers ----------------
- *
- * These are chunk-sized working buffers. Each device has a few
- */
-
-typedef struct {
-	__u8 *buffer;
-	int line;	/* track from whence this buffer was allocated */
-	int maxLine;
-} yaffs_TempBuffer;
-
-/*----------------- Device ---------------------------------*/
-
-
-struct yaffs_DeviceStruct {
-	struct ylist_head devList;
-	const char *name;
-
-	/* Entry parameters set up way early. Yaffs sets up the rest.*/
-	int nDataBytesPerChunk;	/* Should be a power of 2 >= 512 */
-	int nChunksPerBlock;	/* does not need to be a power of 2 */
-	int spareBytesPerChunk;	/* spare area size */
-	int startBlock;		/* Start block we're allowed to use */
-	int endBlock;		/* End block we're allowed to use */
-	int nReservedBlocks;	/* We want this tuneable so that we can reduce */
-				/* reserved blocks on NOR and RAM. */
-
-
-	/* Stuff used by the shared space checkpointing mechanism */
-	/* If this value is zero, then this mechanism is disabled */
-
-/*	int nCheckpointReservedBlocks; */ /* Blocks to reserve for checkpoint data */
-
-
-	int nShortOpCaches;	/* If <= 0, then short op caching is disabled, else
-				 * the number of short op caches (don't use too many)
-				 */
-
-	int useHeaderFileSize;	/* Flag to determine if we should use file sizes from the header */
-
-	int useNANDECC;		/* Flag to decide whether or not to use NANDECC on data (yaffs1) */
-	int noTagsECC;		/* Flag to decide whether or not to do ECC on packed tags (yaffs2) */ 
-	
-	int disableLazyLoad;	/* Disable lazy loading on this device */
-
-	void *genericDevice;	/* Pointer to device context
-				 * On an mtd this holds the mtd pointer.
-				 */
-	void *superBlock;
-
-	/* NAND access functions (Must be set before calling YAFFS)*/
-
-	int (*writeChunkToNAND) (struct yaffs_DeviceStruct *dev,
-					int chunkInNAND, const __u8 *data,
-					const yaffs_Spare *spare);
-	int (*readChunkFromNAND) (struct yaffs_DeviceStruct *dev,
-					int chunkInNAND, __u8 *data,
-					yaffs_Spare *spare);
-	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct *dev,
-					int blockInNAND);
-	int (*initialiseNAND) (struct yaffs_DeviceStruct *dev);
-	int (*deinitialiseNAND) (struct yaffs_DeviceStruct *dev);
-
-#ifdef CONFIG_YAFFS_YAFFS2
-	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct *dev,
-					 int chunkInNAND, const __u8 *data,
-					 const yaffs_ExtendedTags *tags);
-	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct *dev,
-					  int chunkInNAND, __u8 *data,
-					  yaffs_ExtendedTags *tags);
-	int (*markNANDBlockBad) (struct yaffs_DeviceStruct *dev, int blockNo);
-	int (*queryNANDBlock) (struct yaffs_DeviceStruct *dev, int blockNo,
-			       yaffs_BlockState *state, __u32 *sequenceNumber);
-#endif
-
-	int isYaffs2;
-
-	/* The removeObjectCallback function must be supplied by OS flavours that
-	 * need it. The Linux kernel does not use this, but yaffs direct does use
-	 * it to implement the faster readdir
-	 */
-	void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj);
-
-	/* Callback to mark the superblock dirsty */
-	void (*markSuperBlockDirty)(void *superblock);
-
-	int wideTnodesDisabled; /* Set to disable wide tnodes */
-
-	YCHAR *pathDividers;	/* String of legal path dividers */
-
-
-	/* End of stuff that must be set before initialisation. */
-
-	/* Checkpoint control. Can be set before or after initialisation */
-	__u8 skipCheckpointRead;
-	__u8 skipCheckpointWrite;
-
-	/* Runtime parameters. Set up by YAFFS. */
-
-	__u16 chunkGroupBits;	/* 0 for devices <= 32MB. else log2(nchunks) - 16 */
-	__u16 chunkGroupSize;	/* == 2^^chunkGroupBits */
-
-	/* Stuff to support wide tnodes */
-	__u32 tnodeWidth;
-	__u32 tnodeMask;
-
-	/* Stuff for figuring out file offset to chunk conversions */
-	__u32 chunkShift; /* Shift value */
-	__u32 chunkDiv;   /* Divisor after shifting: 1 for power-of-2 sizes */
-	__u32 chunkMask;  /* Mask to use for power-of-2 case */
-
-	/* Stuff to handle inband tags */
-	int inbandTags;
-	__u32 totalBytesPerChunk;
-
-#ifdef __KERNEL__
-
-	struct semaphore sem;	/* Semaphore for waiting on erasure.*/
-	struct semaphore grossLock;	/* Gross locking semaphore */
-	struct rw_semaphore dirLock; /* Lock the directory structure */
-	__u8 *spareBuffer;	/* For mtdif2 use. Don't know the size of the buffer
-				 * at compile time so we have to allocate it.
-				 */
-	void (*putSuperFunc) (struct super_block *sb);
-#endif
-
-	int isMounted;
-
-	int isCheckpointed;
-
-
-	/* Stuff to support block offsetting to support start block zero */
-	int internalStartBlock;
-	int internalEndBlock;
-	int blockOffset;
-	int chunkOffset;
-
-
-	/* Runtime checkpointing stuff */
-	int checkpointPageSequence;   /* running sequence number of checkpoint pages */
-	int checkpointByteCount;
-	int checkpointByteOffset;
-	__u8 *checkpointBuffer;
-	int checkpointOpenForWrite;
-	int blocksInCheckpoint;
-	int checkpointCurrentChunk;
-	int checkpointCurrentBlock;
-	int checkpointNextBlock;
-	int *checkpointBlockList;
-	int checkpointMaxBlocks;
-	__u32 checkpointSum;
-	__u32 checkpointXor;
-
-	int nCheckpointBlocksRequired; /* Number of blocks needed to store current checkpoint set */
-
-	/* Block Info */
-	yaffs_BlockInfo *blockInfo;
-	__u8 *chunkBits;	/* bitmap of chunks in use */
-	unsigned blockInfoAlt:1;	/* was allocated using alternative strategy */
-	unsigned chunkBitsAlt:1;	/* was allocated using alternative strategy */
-	int chunkBitmapStride;	/* Number of bytes of chunkBits per block.
-				 * Must be consistent with nChunksPerBlock.
-				 */
-
-	int nErasedBlocks;
-	int allocationBlock;	/* Current block being allocated off */
-	__u32 allocationPage;
-	int allocationBlockFinder;	/* Used to search for next allocation block */
-
-	/* Runtime state */
-	int nTnodesCreated;
-	yaffs_Tnode *freeTnodes;
-	int nFreeTnodes;
-	yaffs_TnodeList *allocatedTnodeList;
-
-	int isDoingGC;
-	int gcBlock;
-	int gcChunk;
-
-	int nObjectsCreated;
-	yaffs_Object *freeObjects;
-	int nFreeObjects;
-
-	int nHardLinks;
-
-	yaffs_ObjectList *allocatedObjectList;
-
-	yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
-
-	int nFreeChunks;
-
-	int currentDirtyChecker;	/* Used to find current dirtiest block */
-
-	__u32 *gcCleanupList;	/* objects to delete at the end of a GC. */
-	int nonAggressiveSkip;	/* GC state/mode */
-
-	/* Statistcs */
-	int nPageWrites;
-	int nPageReads;
-	int nBlockErasures;
-	int nErasureFailures;
-	int nGCCopies;
-	int garbageCollections;
-	int passiveGarbageCollections;
-	int nRetriedWrites;
-	int nRetiredBlocks;
-	int eccFixed;
-	int eccUnfixed;
-	int tagsEccFixed;
-	int tagsEccUnfixed;
-	int nDeletions;
-	int nUnmarkedDeletions;
-
-	int hasPendingPrioritisedGCs; /* We think this device might have pending prioritised gcs */
-
-	/* Special directories */
-	yaffs_Object *rootDir;
-	yaffs_Object *lostNFoundDir;
-
-	/* Buffer areas for storing data to recover from write failures TODO
-	 *      __u8            bufferedData[YAFFS_CHUNKS_PER_BLOCK][YAFFS_BYTES_PER_CHUNK];
-	 *      yaffs_Spare bufferedSpare[YAFFS_CHUNKS_PER_BLOCK];
-	 */
-
-	int bufferedBlock;	/* Which block is buffered here? */
-	int doingBufferedBlockRewrite;
-
-	yaffs_ChunkCache *srCache;
-	int srLastUse;
-
-	int cacheHits;
-
-	/* Stuff for background deletion and unlinked files.*/
-	yaffs_Object *unlinkedDir;	/* Directory where unlinked and deleted files live. */
-	yaffs_Object *deletedDir;	/* Directory where deleted objects are sent to disappear. */
-	yaffs_Object *unlinkedDeletion;	/* Current file being background deleted.*/
-	int nDeletedFiles;		/* Count of files awaiting deletion;*/
-	int nUnlinkedFiles;		/* Count of unlinked files. */
-	int nBackgroundDeletions;	/* Count of background deletions. */
-
-
-	/* Temporary buffer management */
-	yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
-	int maxTemp;
-	int tempInUse;
-	int unmanagedTempAllocations;
-	int unmanagedTempDeallocations;
-
-	/* yaffs2 runtime stuff */
-	unsigned sequenceNumber;	/* Sequence number of currently allocating block */
-	unsigned oldestDirtySequence;
-	
-	/* Auto empty lost and found directory on mount */
-	int emptyLostAndFound;
-};
-
-typedef struct yaffs_DeviceStruct yaffs_Device;
-
-/* The static layout of block usage etc is stored in the super block header */
-typedef struct {
-	int StructType;
-	int version;
-	int checkpointStartBlock;
-	int checkpointEndBlock;
-	int startBlock;
-	int endBlock;
-	int rfu[100];
-} yaffs_SuperBlockHeader;
-
-/* The CheckpointDevice structure holds the device information that changes at runtime and
- * must be preserved over unmount/mount cycles.
- */
-typedef struct {
-	int structType;
-	int nErasedBlocks;
-	int allocationBlock;	/* Current block being allocated off */
-	__u32 allocationPage;
-	int nFreeChunks;
-
-	int nDeletedFiles;		/* Count of files awaiting deletion;*/
-	int nUnlinkedFiles;		/* Count of unlinked files. */
-	int nBackgroundDeletions;	/* Count of background deletions. */
-
-	/* yaffs2 runtime stuff */
-	unsigned sequenceNumber;	/* Sequence number of currently allocating block */
-	unsigned oldestDirtySequence;
-
-} yaffs_CheckpointDevice;
-
-
-typedef struct {
-	int structType;
-	__u32 magic;
-	__u32 version;
-	__u32 head;
-} yaffs_CheckpointValidity;
-
-
-/*----------------------- YAFFS Functions -----------------------*/
-
-int yaffs_GutsInitialise(yaffs_Device *dev);
-void yaffs_Deinitialise(yaffs_Device *dev);
-
-int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);
-
-int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-		       yaffs_Object *newDir, const YCHAR *newName);
-
-int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name);
-int yaffs_DeleteObject(yaffs_Object *obj);
-
-int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize);
-int yaffs_GetObjectFileLength(yaffs_Object *obj);
-int yaffs_GetObjectInode(yaffs_Object *obj);
-unsigned yaffs_GetObjectType(yaffs_Object *obj);
-int yaffs_GetObjectLinkCount(yaffs_Object *obj);
-
-int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);
-int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);
-
-/* File operations */
-int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, loff_t offset,
-				int nBytes);
-int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, loff_t offset,
-				int nBytes, int writeThrough);
-int yaffs_ResizeFile(yaffs_Object *obj, loff_t newSize);
-
-yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-				__u32 mode, __u32 uid, __u32 gid);
-
-int yaffs_FlushFile(yaffs_Object *obj, int updateTime, int dataSync);
-
-/* Flushing and checkpointing */
-void yaffs_FlushEntireDeviceCache(yaffs_Device *dev);
-
-int yaffs_CheckpointSave(yaffs_Device *dev);
-int yaffs_CheckpointRestore(yaffs_Device *dev);
-
-/* Directory operations */
-yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-				__u32 mode, __u32 uid, __u32 gid);
-yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir, const YCHAR *name);
-int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
-				   int (*fn) (yaffs_Object *));
-
-yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number);
-
-/* Link operations */
-yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-			 yaffs_Object *equivalentObject);
-
-yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);
-
-/* Symlink operations */
-yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
-				 __u32 mode, __u32 uid, __u32 gid,
-				 const YCHAR *alias);
-YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj);
-
-/* Special inodes (fifos, sockets and devices) */
-yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
-				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev);
-
-/* Special directories */
-yaffs_Object *yaffs_Root(yaffs_Device *dev);
-yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);
-
-#ifdef CONFIG_YAFFS_WINCE
-/* CONFIG_YAFFS_WINCE special stuff */
-void yfsd_WinFileTimeNow(__u32 target[2]);
-#endif
-
-#ifdef __KERNEL__
-
-void yaffs_HandleDeferedFree(yaffs_Object *obj);
-#endif
-
-/* Debug dump  */
-int yaffs_DumpObject(yaffs_Object *obj);
-
-void yaffs_GutsTest(yaffs_Device *dev);
-
-/* A few useful functions */
-void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn);
-int yaffs_CheckFF(__u8 *buffer, int nBytes);
-void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
-
-__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo);
-void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo);
-
-#endif
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_nand.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-const char *yaffs_nand_c_version =
-	"$Id$";
-
-#include "yaffs_nand.h"
-#include "yaffs_tagscompat.h"
-#include "yaffs_tagsvalidity.h"
-
-#include "yaffs_getblockinfo.h"
-
-#ifdef CONFIG_YAFFS_NO_YAFFS1
-// Trap to let us compile the source largely unmodified but to elide the
-// YAFFS1 code unless we really need it
-static inline int noyaffs1(void) {
-    T(YAFFS_TRACE_ERROR, (TSTR("YAFFS1 support compiled out" TENDSTR)));
-    YBUG();
-    return YAFFS_FAIL;
-}
-
-static inline
-int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-						int chunkInNAND,
-						const __u8 *data,
-						const yaffs_ExtendedTags *tags)
-{ return noyaffs1(); }
-static inline
-int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
-						int chunkInNAND,
-						__u8 *data,
-						yaffs_ExtendedTags *tags)
-{ return noyaffs1(); }
-static inline
-int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
-					    int blockNo)
-{ return noyaffs1(); }
-static inline
-int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
-					  int blockNo,
-					  yaffs_BlockState *state,
-					  __u32 *sequenceNumber)
-{ return noyaffs1(); }
-#endif
-
-int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-					   __u8 *buffer,
-					   yaffs_ExtendedTags *tags)
-{
-	int result;
-	yaffs_ExtendedTags localTags;
-
-	int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
-
-	dev->nPageReads++;
-
-	/* If there are no tags provided, use local tags to get prioritised gc working */
-	if (!tags)
-		tags = &localTags;
-
-	if (dev->readChunkWithTagsFromNAND)
-		result = dev->readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
-						      tags);
-	else
-		result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
-									realignedChunkInNAND,
-									buffer,
-									tags);
-	if (tags &&
-	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
-
-		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
-		yaffs_HandleChunkError(dev, bi);
-	}
-
-	return result;
-}
-
-int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-						   int chunkInNAND,
-						   const __u8 *buffer,
-						   yaffs_ExtendedTags *tags)
-{
-
-	dev->nPageWrites++;
-
-	chunkInNAND -= dev->chunkOffset;
-
-
-	if (tags) {
-		tags->sequenceNumber = dev->sequenceNumber;
-		tags->chunkUsed = 1;
-		if (!yaffs_ValidateTags(tags)) {
-			T(YAFFS_TRACE_ERROR,
-			  (TSTR("Writing uninitialised tags" TENDSTR)));
-			YBUG();
-		}
-		T(YAFFS_TRACE_WRITE,
-		  (TSTR("Writing chunk %d tags %d %d" TENDSTR), chunkInNAND,
-		   tags->objectId, tags->chunkId));
-	} else {
-		T(YAFFS_TRACE_ERROR, (TSTR("Writing with no tags" TENDSTR)));
-		YBUG();
-	}
-
-	if (dev->writeChunkWithTagsToNAND)
-		return dev->writeChunkWithTagsToNAND(dev, chunkInNAND, buffer,
-						     tags);
-	else
-		return yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(dev,
-								       chunkInNAND,
-								       buffer,
-								       tags);
-}
-
-int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
-{
-	blockNo -= dev->blockOffset;
-
-
-	if (dev->markNANDBlockBad)
-		return dev->markNANDBlockBad(dev, blockNo);
-	else
-		return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
-}
-
-int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-						 int blockNo,
-						 yaffs_BlockState *state,
-						 __u32 *sequenceNumber)
-{
-	blockNo -= dev->blockOffset;
-
-	if (dev->queryNANDBlock)
-		return dev->queryNANDBlock(dev, blockNo, state, sequenceNumber);
-	else
-		return yaffs_TagsCompatabilityQueryNANDBlock(dev, blockNo,
-							     state,
-							     sequenceNumber);
-}
-
-
-int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
-				  int blockInNAND)
-{
-	int result;
-
-	blockInNAND -= dev->blockOffset;
-
-	dev->nBlockErasures++;
-
-	result = dev->eraseBlockInNAND(dev, blockInNAND);
-
-	return result;
-}
-
-int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
-{
-	return dev->initialiseNAND(dev);
-}
-
-
-
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_nand.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFS_NAND_H__
-#define __YAFFS_NAND_H__
-#include "yaffs_guts.h"
-
-
-
-int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-					__u8 *buffer,
-					yaffs_ExtendedTags *tags);
-
-int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-						int chunkInNAND,
-						const __u8 *buffer,
-						yaffs_ExtendedTags *tags);
-
-int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo);
-
-int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-						int blockNo,
-						yaffs_BlockState *state,
-						unsigned *sequenceNumber);
-
-int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
-				  int blockInNAND);
-
-int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev);
-
-#endif
-
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_packedtags1.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include "yaffs_packedtags1.h"
-#include "yportenv.h"
-
-void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
-{
-	pt->chunkId = t->chunkId;
-	pt->serialNumber = t->serialNumber;
-	pt->byteCount = t->byteCount;
-	pt->objectId = t->objectId;
-	pt->ecc = 0;
-	pt->deleted = (t->chunkDeleted) ? 0 : 1;
-	pt->unusedStuff = 0;
-	pt->shouldBeFF = 0xFFFFFFFF;
-
-}
-
-void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
-{
-	static const __u8 allFF[] =
-	    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff };
-
-	if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
-		t->blockBad = 0;
-		if (pt->shouldBeFF != 0xFFFFFFFF)
-			t->blockBad = 1;
-		t->chunkUsed = 1;
-		t->objectId = pt->objectId;
-		t->chunkId = pt->chunkId;
-		t->byteCount = pt->byteCount;
-		t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-		t->chunkDeleted = (pt->deleted) ? 0 : 1;
-		t->serialNumber = pt->serialNumber;
-	} else {
-		memset(t, 0, sizeof(yaffs_ExtendedTags));
-	}
-}
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_packedtags1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-/* This is used to pack YAFFS1 tags, not YAFFS2 tags. */
-
-#ifndef __YAFFS_PACKEDTAGS1_H__
-#define __YAFFS_PACKEDTAGS1_H__
-
-#include "yaffs_guts.h"
-
-typedef struct {
-	unsigned chunkId:20;
-	unsigned serialNumber:2;
-	unsigned byteCount:10;
-	unsigned objectId:18;
-	unsigned ecc:12;
-	unsigned deleted:1;
-	unsigned unusedStuff:1;
-	unsigned shouldBeFF;
-
-} yaffs_PackedTags1;
-
-void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t);
-void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt);
-#endif
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_packedtags2.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include "yaffs_packedtags2.h"
-#include "yportenv.h"
-#include "yaffs_tagsvalidity.h"
-
-#if 0
-// Used in conjunction with RANDOMLY_LOSE mode on the synth nand driver to
-// demonstrate that it is behaving as intended.
-#define COUNT_ECC_TAG_FIXES
-unsigned yaffs_tag_ecc_fixes = 0;
-#endif
-
-/* This code packs a set of extended tags into a binary structure for
- * NAND storage
- */
-
-/* Some of the information is "extra" struff which can be packed in to
- * speed scanning
- * This is defined by having the EXTRA_HEADER_INFO_FLAG set.
- */
-
-/* Extra flags applied to chunkId */
-
-#define EXTRA_HEADER_INFO_FLAG	0x80000000
-#define EXTRA_SHRINK_FLAG	0x40000000
-#define EXTRA_SHADOWS_FLAG	0x20000000
-#define EXTRA_SPARE_FLAGS	0x10000000
-
-#define ALL_EXTRA_FLAGS		0xF0000000
-
-/* Also, the top 4 bits of the object Id are set to the object type. */
-#define EXTRA_OBJECT_TYPE_SHIFT (28)
-#define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
-
-
-static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart *ptt)
-{
-	T(YAFFS_TRACE_MTD,
-	  (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
-	   ptt->objectId, ptt->chunkId, ptt->byteCount,
-	   ptt->sequenceNumber));
-}
-static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 *pt)
-{
-	yaffs_DumpPackedTags2TagsPart(&pt->t);
-}
-
-static void yaffs_DumpTags2(const yaffs_ExtendedTags *t)
-{
-	T(YAFFS_TRACE_MTD,
-	  (TSTR
-	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d"
-	    TENDSTR), t->eccResult, t->blockBad, t->chunkUsed, t->objectId,
-	   t->chunkId, t->byteCount, t->chunkDeleted, t->serialNumber,
-	   t->sequenceNumber));
-
-}
-
-void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt,
-		const yaffs_ExtendedTags *t)
-{
-	ptt->chunkId = t->chunkId;
-	ptt->sequenceNumber = t->sequenceNumber;
-	ptt->byteCount = t->byteCount;
-	ptt->objectId = t->objectId;
-
-	if (t->chunkId == 0 && t->extraHeaderInfoAvailable) {
-		/* Store the extra header info instead */
-		/* We save the parent object in the chunkId */
-		ptt->chunkId = EXTRA_HEADER_INFO_FLAG
-			| t->extraParentObjectId;
-		if (t->extraIsShrinkHeader)
-			ptt->chunkId |= EXTRA_SHRINK_FLAG;
-		if (t->extraShadows)
-			ptt->chunkId |= EXTRA_SHADOWS_FLAG;
-
-		ptt->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-		ptt->objectId |=
-		    (t->extraObjectType << EXTRA_OBJECT_TYPE_SHIFT);
-
-		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-			ptt->byteCount = t->extraEquivalentObjectId;
-		else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE)
-			ptt->byteCount = t->extraFileLength;
-		else
-			ptt->byteCount = 0;
-	}
-
-	yaffs_DumpPackedTags2TagsPart(ptt);
-	yaffs_DumpTags2(t);
-}
-
-
-void yaffs_PackTags2(yaffs_Device *dev, yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t)
-{
-	yaffs_PackTags2TagsPart(&pt->t, t);
-
-	if(!dev->noTagsECC)
-		yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-					sizeof(yaffs_PackedTags2TagsPart),
-					&pt->ecc);
-}
-
-
-void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t,
-		yaffs_PackedTags2TagsPart *ptt)
-{
-
-	memset(t, 0, sizeof(yaffs_ExtendedTags));
-
-	yaffs_InitialiseTags(t);
-
-	if (ptt->sequenceNumber != 0xFFFFFFFF) {
-		t->blockBad = 0;
-		t->chunkUsed = 1;
-		t->objectId = ptt->objectId;
-		t->chunkId = ptt->chunkId;
-		t->byteCount = ptt->byteCount;
-		t->chunkDeleted = 0;
-		t->serialNumber = 0;
-		t->sequenceNumber = ptt->sequenceNumber;
-
-		/* Do extra header info stuff */
-
-		if (ptt->chunkId & EXTRA_HEADER_INFO_FLAG) {
-			t->chunkId = 0;
-			t->byteCount = 0;
-
-			t->extraHeaderInfoAvailable = 1;
-			t->extraParentObjectId =
-			    ptt->chunkId & (~(ALL_EXTRA_FLAGS));
-			t->extraIsShrinkHeader =
-			    (ptt->chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
-			t->extraShadows =
-			    (ptt->chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
-			t->extraObjectType =
-			    ptt->objectId >> EXTRA_OBJECT_TYPE_SHIFT;
-			t->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-
-			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-				t->extraEquivalentObjectId = ptt->byteCount;
-			else
-				t->extraFileLength = ptt->byteCount;
-		}
-	}
-
-	yaffs_DumpPackedTags2TagsPart(ptt);
-	yaffs_DumpTags2(t);
-
-}
-
-void yaffs_UnpackTags2(yaffs_Device *dev, yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt)
-{
-
-	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-
-	if (pt->t.sequenceNumber != 0xFFFFFFFF &&
-	    !dev->noTagsECC){
-		/* Chunk is in use and we need to do ECC */
-		
-		yaffs_ECCOther ecc;
-		int result;
-		yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-					sizeof(yaffs_PackedTags2TagsPart),
-					&ecc);
-		result = yaffs_ECCCorrectOther((unsigned char *)&pt->t,
-						sizeof(yaffs_PackedTags2TagsPart),
-						&pt->ecc, &ecc);
-		switch (result) {
-			case 0:
-				eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-				break;
-			case 1:
-				eccResult = YAFFS_ECC_RESULT_FIXED;
-#ifdef COUNT_ECC_TAG_FIXES
-                ++yaffs_tag_ecc_fixes;
-#endif
-				break;
-			case -1:
-				eccResult = YAFFS_ECC_RESULT_UNFIXED;
-				break;
-			default:
-				eccResult = YAFFS_ECC_RESULT_UNKNOWN;
-		}
-	}
-
-	yaffs_UnpackTags2TagsPart(t, &pt->t);
-
-	t->eccResult = eccResult;
-
-	yaffs_DumpPackedTags2(pt);
-	yaffs_DumpTags2(t);
-}
-
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_packedtags2.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-/* This is used to pack YAFFS2 tags, not YAFFS1tags. */
-
-#ifndef __YAFFS_PACKEDTAGS2_H__
-#define __YAFFS_PACKEDTAGS2_H__
-
-#include "yaffs_guts.h"
-#include "yaffs_ecc.h"
-
-typedef struct {
-	unsigned sequenceNumber;
-	unsigned objectId;
-	unsigned chunkId;
-	unsigned byteCount;
-} yaffs_PackedTags2TagsPart;
-
-typedef struct {
-	yaffs_PackedTags2TagsPart t;
-	yaffs_ECCOther ecc;
-} yaffs_PackedTags2;
-
-/* Full packed tags with ECC, used for oob tags */
-void yaffs_PackTags2(yaffs_Device *dev, yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t);
-void yaffs_UnpackTags2(yaffs_Device *dev, yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt);
-
-/* Only the tags part (no ECC for use with inband tags */
-void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t);
-void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt);
-#endif
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_qsort.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-
-#ifndef __YAFFS_QSORT_H__
-#define __YAFFS_QSORT_H__
-
-extern void yaffs_qsort(void *const base, size_t total_elems, size_t size,
-			int (*cmp)(const void *, const void *));
-
-#endif
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_tagscompat.c
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include "yaffs_guts.h"
-#include "yaffs_tagscompat.h"
-#include "yaffs_ecc.h"
-#include "yaffs_getblockinfo.h"
-
-#ifndef CONFIG_YAFFS_NO_YAFFS1
-static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND);
-#endif // ! NO_YAFFS1, i.e. only when YAFFS1 is needed
-#ifdef NOTYET
-static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND);
-static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-				     const __u8 *data,
-				     const yaffs_Spare *spare);
-static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-				    const yaffs_Spare *spare);
-static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND);
-#endif
-
-static const char yaffs_countBitsTable[256] = {
-	0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
-	1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-	1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-	1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-	3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-	1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-	3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-	3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-	3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-	4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
-};
-
-int yaffs_CountBits(__u8 x)
-{
-	int retVal;
-	retVal = yaffs_countBitsTable[x];
-	return retVal;
-}
-
-/********** Tags ECC calculations  *********/
-
-void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare)
-{ 
-#if 1
-    YBUG(); // Should never get here if configured out..
-#else
-	yaffs_ECCCalculate(data, spare->ecc1);
-	yaffs_ECCCalculate(&data[256], spare->ecc2);
-#endif
-}
-
-#ifndef CONFIG_YAFFS_NO_YAFFS1
-void yaffs_CalcTagsECC(yaffs_Tags *tags)
-{
-	/* Calculate an ecc */
-
-	unsigned char *b = ((yaffs_TagsUnion *) tags)->asBytes;
-	unsigned i, j;
-	unsigned ecc = 0;
-	unsigned bit = 0;
-
-	tags->ecc = 0;
-
-	for (i = 0; i < 8; i++) {
-		for (j = 1; j & 0xff; j <<= 1) {
-			bit++;
-			if (b[i] & j)
-				ecc ^= bit;
-		}
-	}
-
-	tags->ecc = ecc;
-
-}
-
-int yaffs_CheckECCOnTags(yaffs_Tags *tags)
-{
-	unsigned ecc = tags->ecc;
-
-	yaffs_CalcTagsECC(tags);
-
-	ecc ^= tags->ecc;
-
-	if (ecc && ecc <= 64) {
-		/* TODO: Handle the failure better. Retire? */
-		unsigned char *b = ((yaffs_TagsUnion *) tags)->asBytes;
-
-		ecc--;
-
-		b[ecc / 8] ^= (1 << (ecc & 7));
-
-		/* Now recvalc the ecc */
-		yaffs_CalcTagsECC(tags);
-
-		return 1;	/* recovered error */
-	} else if (ecc) {
-		/* Wierd ecc failure value */
-		/* TODO Need to do somethiong here */
-		return -1;	/* unrecovered error */
-	}
-
-	return 0;
-}
-#endif
-
-/********** Tags **********/
-
-#ifndef CONFIG_YAFFS_NO_YAFFS1
-static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr,
-				yaffs_Tags *tagsPtr)
-{
-	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
-
-	yaffs_CalcTagsECC(tagsPtr);
-
-	sparePtr->tagByte0 = tu->asBytes[0];
-	sparePtr->tagByte1 = tu->asBytes[1];
-	sparePtr->tagByte2 = tu->asBytes[2];
-	sparePtr->tagByte3 = tu->asBytes[3];
-	sparePtr->tagByte4 = tu->asBytes[4];
-	sparePtr->tagByte5 = tu->asBytes[5];
-	sparePtr->tagByte6 = tu->asBytes[6];
-	sparePtr->tagByte7 = tu->asBytes[7];
-}
-
-static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,
-				yaffs_Tags *tagsPtr)
-{
-	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
-	int result;
-
-	tu->asBytes[0] = sparePtr->tagByte0;
-	tu->asBytes[1] = sparePtr->tagByte1;
-	tu->asBytes[2] = sparePtr->tagByte2;
-	tu->asBytes[3] = sparePtr->tagByte3;
-	tu->asBytes[4] = sparePtr->tagByte4;
-	tu->asBytes[5] = sparePtr->tagByte5;
-	tu->asBytes[6] = sparePtr->tagByte6;
-	tu->asBytes[7] = sparePtr->tagByte7;
-
-	result = yaffs_CheckECCOnTags(tagsPtr);
-	if (result > 0)
-		dev->tagsEccFixed++;
-	else if (result < 0)
-		dev->tagsEccUnfixed++;
-}
-
-static void yaffs_SpareInitialise(yaffs_Spare *spare)
-{
-	memset(spare, 0xFF, sizeof(yaffs_Spare));
-}
-
-static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,
-				int chunkInNAND, const __u8 *data,
-				yaffs_Spare *spare)
-{
-	if (chunkInNAND < dev->startBlock * dev->nChunksPerBlock) {
-		T(YAFFS_TRACE_ERROR,
-		  (TSTR("**>> yaffs chunk %d is not valid" TENDSTR),
-		   chunkInNAND));
-		return YAFFS_FAIL;
-	}
-
-	return dev->writeChunkToNAND(dev, chunkInNAND, data, spare);
-}
-
-static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
-				   int chunkInNAND,
-				   __u8 *data,
-				   yaffs_Spare *spare,
-				   yaffs_ECCResult *eccResult,
-				   int doErrorCorrection)
-{
-	int retVal;
-	yaffs_Spare localSpare;
-
-	if (!spare && data) {
-		/* If we don't have a real spare, then we use a local one. */
-		/* Need this for the calculation of the ecc */
-		spare = &localSpare;
-	}
-
-	if (!dev->useNANDECC) {
-#if 1
-        YBUG();
-#else
-		retVal = dev->readChunkFromNAND(dev, chunkInNAND, data, spare);
-		if (data && doErrorCorrection) {
-			/* Do ECC correction */
-			/* Todo handle any errors */
-			int eccResult1, eccResult2;
-			__u8 calcEcc[3];
-
-			yaffs_ECCCalculate(data, calcEcc);
-			eccResult1 =
-			    yaffs_ECCCorrect(data, spare->ecc1, calcEcc);
-			yaffs_ECCCalculate(&data[256], calcEcc);
-			eccResult2 =
-			    yaffs_ECCCorrect(&data[256], spare->ecc2, calcEcc);
-
-			if (eccResult1 > 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>yaffs ecc error fix performed on chunk %d:0"
-				    TENDSTR), chunkInNAND));
-				dev->eccFixed++;
-			} else if (eccResult1 < 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>yaffs ecc error unfixed on chunk %d:0"
-				    TENDSTR), chunkInNAND));
-				dev->eccUnfixed++;
-			}
-
-			if (eccResult2 > 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>yaffs ecc error fix performed on chunk %d:1"
-				    TENDSTR), chunkInNAND));
-				dev->eccFixed++;
-			} else if (eccResult2 < 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>yaffs ecc error unfixed on chunk %d:1"
-				    TENDSTR), chunkInNAND));
-				dev->eccUnfixed++;
-			}
-
-			if (eccResult1 || eccResult2) {
-				/* We had a data problem on this page */
-				yaffs_HandleReadDataError(dev, chunkInNAND);
-			}
-
-			if (eccResult1 < 0 || eccResult2 < 0)
-				*eccResult = YAFFS_ECC_RESULT_UNFIXED;
-			else if (eccResult1 > 0 || eccResult2 > 0)
-				*eccResult = YAFFS_ECC_RESULT_FIXED;
-			else
-				*eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-		}
-#endif
-	} else {
-		/* Must allocate enough memory for spare+2*sizeof(int) */
-		/* for ecc results from device. */
-		struct yaffs_NANDSpare nspare;
-
-		memset(&nspare, 0, sizeof(nspare));
-
-		retVal = dev->readChunkFromNAND(dev, chunkInNAND, data,
-					(yaffs_Spare *) &nspare);
-		memcpy(spare, &nspare, sizeof(yaffs_Spare));
-		if (data && doErrorCorrection) {
-			if (nspare.eccres1 > 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>mtd ecc error fix performed on chunk %d:0"
-				    TENDSTR), chunkInNAND));
-			} else if (nspare.eccres1 < 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>mtd ecc error unfixed on chunk %d:0"
-				    TENDSTR), chunkInNAND));
-			}
-
-			if (nspare.eccres2 > 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>mtd ecc error fix performed on chunk %d:1"
-				    TENDSTR), chunkInNAND));
-			} else if (nspare.eccres2 < 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>mtd ecc error unfixed on chunk %d:1"
-				    TENDSTR), chunkInNAND));
-			}
-
-			if (nspare.eccres1 || nspare.eccres2) {
-				/* We had a data problem on this page */
-				yaffs_HandleReadDataError(dev, chunkInNAND);
-			}
-
-			if (nspare.eccres1 < 0 || nspare.eccres2 < 0)
-				*eccResult = YAFFS_ECC_RESULT_UNFIXED;
-			else if (nspare.eccres1 > 0 || nspare.eccres2 > 0)
-				*eccResult = YAFFS_ECC_RESULT_FIXED;
-			else
-				*eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-
-		}
-	}
-	return retVal;
-}
-#endif // ! NO_YAFFS1, i.e. only when YAFFS1 is present
-
-#ifdef NOTYET
-static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-				  int chunkInNAND)
-{
-	static int init;
-	static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
-	static __u8 data[YAFFS_BYTES_PER_CHUNK];
-	/* Might as well always allocate the larger size for */
-	/* dev->useNANDECC == true; */
-	static __u8 spare[sizeof(struct yaffs_NANDSpare)];
-
-	dev->readChunkFromNAND(dev, chunkInNAND, data, (yaffs_Spare *) spare);
-
-	if (!init) {
-		memset(cmpbuf, 0xff, YAFFS_BYTES_PER_CHUNK);
-		init = 1;
-	}
-
-	if (memcmp(cmpbuf, data, YAFFS_BYTES_PER_CHUNK))
-		return YAFFS_FAIL;
-	if (memcmp(cmpbuf, spare, 16))
-		return YAFFS_FAIL;
-
-	return YAFFS_OK;
-
-}
-#endif
-
-/*
- * Functions for robustisizing
- */
-
-#ifndef CONFIG_YAFFS_NO_YAFFS1
-static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND)
-{
-	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
-
-	/* Mark the block for retirement */
-	yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1;
-	T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-	  (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND));
-
-	/* TODO:
-	 * Just do a garbage collection on the affected block
-	 * then retire the block
-	 * NB recursion
-	 */
-}
-#endif // ! NO_YAFFS1, i.e. only when YAFFS1 is needed
-
-#ifdef NOTYET
-static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND)
-{
-}
-
-static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-				     const __u8 *data,
-				     const yaffs_Spare *spare)
-{
-}
-
-static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-				    const yaffs_Spare *spare)
-{
-}
-
-static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND)
-{
-	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
-
-	/* Mark the block for retirement */
-	yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
-	/* Delete the chunk */
-	yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
-}
-
-static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1,
-			       const yaffs_Spare *s0, const yaffs_Spare *s1)
-{
-
-	if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
-	    s0->tagByte0 != s1->tagByte0 ||
-	    s0->tagByte1 != s1->tagByte1 ||
-	    s0->tagByte2 != s1->tagByte2 ||
-	    s0->tagByte3 != s1->tagByte3 ||
-	    s0->tagByte4 != s1->tagByte4 ||
-	    s0->tagByte5 != s1->tagByte5 ||
-	    s0->tagByte6 != s1->tagByte6 ||
-	    s0->tagByte7 != s1->tagByte7 ||
-	    s0->ecc1[0] != s1->ecc1[0] ||
-	    s0->ecc1[1] != s1->ecc1[1] ||
-	    s0->ecc1[2] != s1->ecc1[2] ||
-	    s0->ecc2[0] != s1->ecc2[0] ||
-	    s0->ecc2[1] != s1->ecc2[1] || s0->ecc2[2] != s1->ecc2[2]) {
-		return 0;
-	}
-
-	return 1;
-}
-#endif				/* NOTYET */
-
-#ifndef CONFIG_YAFFS_NO_YAFFS1
-int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-						int chunkInNAND,
-						const __u8 *data,
-						const yaffs_ExtendedTags *eTags)
-{
-	yaffs_Spare spare;
-	yaffs_Tags tags;
-
-	yaffs_SpareInitialise(&spare);
-
-	if (eTags->chunkDeleted)
-		spare.pageStatus = 0;
-	else {
-		tags.objectId = eTags->objectId;
-		tags.chunkId = eTags->chunkId;
-
-		tags.byteCountLSB = eTags->byteCount & 0x3ff;
-
-		if (dev->nDataBytesPerChunk >= 1024)
-			tags.byteCountMSB = (eTags->byteCount >> 10) & 3;
-		else
-			tags.byteCountMSB = 3;
-
-
-		tags.serialNumber = eTags->serialNumber;
-
-		if (!dev->useNANDECC && data)
-			yaffs_CalcECC(data, &spare);
-
-		yaffs_LoadTagsIntoSpare(&spare, &tags);
-
-	}
-
-	return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare);
-}
-
-int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
-						     int chunkInNAND,
-						     __u8 *data,
-						     yaffs_ExtendedTags *eTags)
-{
-
-	yaffs_Spare spare;
-	yaffs_Tags tags;
-	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_UNKNOWN;
-
-	static yaffs_Spare spareFF;
-	static int init;
-
-	if (!init) {
-		memset(&spareFF, 0xFF, sizeof(spareFF));
-		init = 1;
-	}
-
-	if (yaffs_ReadChunkFromNAND
-	    (dev, chunkInNAND, data, &spare, &eccResult, 1)) {
-		/* eTags may be NULL */
-		if (eTags) {
-
-			int deleted =
-			    (yaffs_CountBits(spare.pageStatus) < 7) ? 1 : 0;
-
-			eTags->chunkDeleted = deleted;
-			eTags->eccResult = eccResult;
-			eTags->blockBad = 0;	/* We're reading it */
-			/* therefore it is not a bad block */
-			eTags->chunkUsed =
-			    (memcmp(&spareFF, &spare, sizeof(spareFF)) !=
-			     0) ? 1 : 0;
-
-			if (eTags->chunkUsed) {
-				yaffs_GetTagsFromSpare(dev, &spare, &tags);
-
-				eTags->objectId = tags.objectId;
-				eTags->chunkId = tags.chunkId;
-				eTags->byteCount = tags.byteCountLSB;
-
-				if (dev->nDataBytesPerChunk >= 1024)
-					eTags->byteCount |= (((unsigned) tags.byteCountMSB) << 10);
-
-				eTags->serialNumber = tags.serialNumber;
-			}
-		}
-
-		return YAFFS_OK;
-	} else {
-		return YAFFS_FAIL;
-	}
-}
-
-int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
-					    int blockInNAND)
-{
-
-	yaffs_Spare spare;
-
-	memset(&spare, 0xff, sizeof(yaffs_Spare));
-
-	spare.blockStatus = 'Y';
-
-	yaffs_WriteChunkToNAND(dev, blockInNAND * dev->nChunksPerBlock, NULL,
-			       &spare);
-	yaffs_WriteChunkToNAND(dev, blockInNAND * dev->nChunksPerBlock + 1,
-			       NULL, &spare);
-
-	return YAFFS_OK;
-
-}
-
-int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
-					  int blockNo,
-					  yaffs_BlockState *state,
-					  __u32 *sequenceNumber)
-{
-
-	yaffs_Spare spare0, spare1;
-	static yaffs_Spare spareFF;
-	static int init;
-	yaffs_ECCResult dummy;
-
-	if (!init) {
-		memset(&spareFF, 0xFF, sizeof(spareFF));
-		init = 1;
-	}
-
-	*sequenceNumber = 0;
-
-	yaffs_ReadChunkFromNAND(dev, blockNo * dev->nChunksPerBlock, NULL,
-				&spare0, &dummy, 1);
-	yaffs_ReadChunkFromNAND(dev, blockNo * dev->nChunksPerBlock + 1, NULL,
-				&spare1, &dummy, 1);
-
-	if (yaffs_CountBits(spare0.blockStatus & spare1.blockStatus) < 7)
-		*state = YAFFS_BLOCK_STATE_DEAD;
-	else if (memcmp(&spareFF, &spare0, sizeof(spareFF)) == 0)
-		*state = YAFFS_BLOCK_STATE_EMPTY;
-	else
-		*state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-
-	return YAFFS_OK;
-}
-#endif // ! NO_YAFFS1, i.e. only when YAFFS1 is needed
-
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_tagscompat.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFS_TAGSCOMPAT_H__
-#define __YAFFS_TAGSCOMPAT_H__
-
-#include "yaffs_guts.h"
-
-#ifndef CONFIG_YAFFS_NO_YAFFS1
-int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-						int chunkInNAND,
-						const __u8 *data,
-						const yaffs_ExtendedTags *tags);
-int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
-						int chunkInNAND,
-						__u8 *data,
-						yaffs_ExtendedTags *tags);
-int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
-					    int blockNo);
-int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
-					  int blockNo,
-					  yaffs_BlockState *state,
-					  __u32 *sequenceNumber);
-
-void yaffs_CalcTagsECC(yaffs_Tags *tags);
-int yaffs_CheckECCOnTags(yaffs_Tags *tags);
-#endif
-int yaffs_CountBits(__u8 byte);
-
-#endif
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_tagsvalidity.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include "yaffs_tagsvalidity.h"
-
-void yaffs_InitialiseTags(yaffs_ExtendedTags *tags)
-{
-	memset(tags, 0, sizeof(yaffs_ExtendedTags));
-	tags->validMarker0 = 0xAAAAAAAA;
-	tags->validMarker1 = 0x55555555;
-}
-
-int yaffs_ValidateTags(yaffs_ExtendedTags *tags)
-{
-	return (tags->validMarker0 == 0xAAAAAAAA &&
-		tags->validMarker1 == 0x55555555);
-
-}
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffs_tagsvalidity.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-
-#ifndef __YAFFS_TAGS_VALIDITY_H__
-#define __YAFFS_TAGS_VALIDITY_H__
-
-#include "yaffs_guts.h"
-
-void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-int yaffs_ValidateTags(yaffs_ExtendedTags *tags);
-#endif
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yaffsinterface.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFSINTERFACE_H__
-#define __YAFFSINTERFACE_H__
-
-int yaffs_Initialise(unsigned nBlocks);
-
-#endif
deleted file mode 100644
--- a/packages/fs/yaffs/current/src/yportenv.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-
-#ifndef __YPORTENV_H__
-#define __YPORTENV_H__
-
-#include "ecos-yaffs.h"
-
-/*
- * Define the MTD version in terms of Linux Kernel versions
- * This allows yaffs to be used independantly of the kernel
- * as well as with it.
- */
-
-#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-
-#if defined CONFIG_YAFFS_WINCE
-
-#include "ywinceenv.h"
-
-#elif defined __KERNEL__
-
-#include "moduleconfig.h"
-
-/* Linux kernel */
-
-#include <linux/version.h>
-#define MTD_VERSION_CODE LINUX_VERSION_CODE
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
-#include <linux/config.h>
-#endif
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-
-#define YCHAR char
-#define YUCHAR unsigned char
-#define _Y(x)     x
-#define yaffs_strcat(a, b)     strcat(a, b)
-#define yaffs_strcpy(a, b)     strcpy(a, b)
-#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-#define yaffs_strncmp(a, b, c) strncmp(a, b, c)
-#define yaffs_strlen(s)	       strlen(s)
-#define yaffs_sprintf	       sprintf
-#define yaffs_toupper(a)       toupper(a)
-
-#define Y_INLINE inline
-
-#define YAFFS_LOSTNFOUND_NAME		"lost+found"
-#define YAFFS_LOSTNFOUND_PREFIX		"obj"
-
-/* #define YPRINTF(x) printk x */
-#define YMALLOC(x) kmalloc(x, GFP_NOFS)
-#define YFREE(x)   kfree(x)
-#define YMALLOC_ALT(x) vmalloc(x)
-#define YFREE_ALT(x)   vfree(x)
-#define YMALLOC_DMA(x) YMALLOC(x)
-
-/* KR - added for use in scan so processes aren't blocked indefinitely. */
-#define YYIELD() schedule()
-
-#define YAFFS_ROOT_MODE			0755
-#define YAFFS_LOSTNFOUND_MODE		0700
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-#define Y_CURRENT_TIME CURRENT_TIME.tv_sec
-#define Y_TIME_CONVERT(x) (x).tv_sec
-#else
-#define Y_CURRENT_TIME CURRENT_TIME
-#define Y_TIME_CONVERT(x) (x)
-#endif
-
-#define yaffs_SumCompare(x, y) ((x) == (y))
-#define yaffs_strcmp(a, b) strcmp(a, b)
-
-#define TENDSTR "\n"
-#define TSTR(x) KERN_WARNING x
-#define TCONT(x) x
-#define TOUT(p) printk p
-
-#define yaffs_trace(mask, fmt, args...) \
-	do { if ((mask) & (yaffs_traceMask| YAFFS_TRACE_ALWAYS)) \
-		printk(KERN_WARNING "yaffs: " fmt, ## args); \
-	} while (0)
-
-#define compile_time_assertion(assertion) \
-	({ int x = __builtin_choose_expr(assertion, 0, (void)0); (void) x; })
-
-#elif defined CONFIG_YAFFS_DIRECT
-
-#define MTD_VERSION_CODE MTD_VERSION(2, 6, 22)
-
-/* Direct interface */
-#include "ydirectenv.h"
-
-#elif defined CONFIG_YAFFS_UTIL
-
-/* Stuff for YAFFS utilities */
-
-#include "stdlib.h"
-#include "stdio.h"
-#include "string.h"
-
-#include "devextras.h"
-
-#define YMALLOC(x) malloc(x)
-#define YFREE(x)   free(x)
-#define YMALLOC_ALT(x) malloc(x)
-#define YFREE_ALT(x) free(x)
-
-#define YCHAR char
-#define YUCHAR unsigned char
-#define _Y(x)     x
-#define yaffs_strcat(a, b)     strcat(a, b)
-#define yaffs_strcpy(a, b)     strcpy(a, b)
-#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-#define yaffs_strlen(s)	       strlen(s)
-#define yaffs_sprintf	       sprintf
-#define yaffs_toupper(a)       toupper(a)
-
-#define Y_INLINE inline
-
-/* #define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s)) */
-/* #define YALERT(s) YINFO(s) */
-
-#define TENDSTR "\n"
-#define TSTR(x) x
-#define TOUT(p) printf p
-
-#define YAFFS_LOSTNFOUND_NAME		"lost+found"
-#define YAFFS_LOSTNFOUND_PREFIX		"obj"
-/* #define YPRINTF(x) printf x */
-
-#define YAFFS_ROOT_MODE			0755
-#define YAFFS_LOSTNFOUND_MODE		0700
-
-#define yaffs_SumCompare(x, y) ((x) == (y))
-#define yaffs_strcmp(a, b) strcmp(a, b)
-
-#elif defined CYGPKG_FS_YAFFS
-
-#include "ecos-yport.h"
-
-#else
-/* Should have specified a configuration type */
-#error Unknown configuration
-
-#endif
-
-/* see yaffs_fs.c */
-extern unsigned int yaffs_traceMask;
-extern unsigned int yaffs_wr_attempts;
-
-/*
- * Tracing flags.
- * The flags masked in YAFFS_TRACE_ALWAYS are always traced.
- */
-
-#define YAFFS_TRACE_OS			0x00000002
-#define YAFFS_TRACE_ALLOCATE		0x00000004
-#define YAFFS_TRACE_SCAN		0x00000008
-#define YAFFS_TRACE_BAD_BLOCKS		0x00000010
-#define YAFFS_TRACE_ERASE		0x00000020
-#define YAFFS_TRACE_GC			0x00000040
-#define YAFFS_TRACE_WRITE		0x00000080
-#define YAFFS_TRACE_TRACING		0x00000100
-#define YAFFS_TRACE_DELETION		0x00000200
-#define YAFFS_TRACE_BUFFERS		0x00000400
-#define YAFFS_TRACE_NANDACCESS		0x00000800
-#define YAFFS_TRACE_GC_DETAIL		0x00001000
-#define YAFFS_TRACE_SCAN_DEBUG		0x00002000
-#define YAFFS_TRACE_MTD			0x00004000
-#define YAFFS_TRACE_CHECKPOINT		0x00008000
-
-#define YAFFS_TRACE_VERIFY		0x00010000
-#define YAFFS_TRACE_VERIFY_NAND		0x00020000
-#define YAFFS_TRACE_VERIFY_FULL		0x00040000
-#define YAFFS_TRACE_VERIFY_ALL		0x000F0000
-
-
-#define YAFFS_TRACE_ERROR		0x40000000
-#define YAFFS_TRACE_BUG			0x80000000
-#define YAFFS_TRACE_ALWAYS		0xF0000000
-
-
-#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0)
-
-#ifndef YBUG
-#define YBUG() do {T(YAFFS_TRACE_BUG, (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR), __LINE__)); } while (0)
-#endif
-
-#endif
deleted file mode 100644
--- a/packages/fs/yaffs/current/tests/ar4prng.inl
+++ /dev/null
@@ -1,98 +0,0 @@
-//=============================================================================
-//
-//      ar4prng.inl
-//
-//      Inline providing ARC4-based PRNG
-//
-//=============================================================================
-// ####ECOSGPLCOPYRIGHTBEGIN####                                            
-// -------------------------------------------                              
-// This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 2009 eCosCentric Limited.
-//
-// 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.,    
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-//
-// This exception does not invalidate any other reasons why a work based    
-// on this file might be covered by the GNU General Public License.         
-// -------------------------------------------                              
-// ####ECOSGPLCOPYRIGHTEND####                                              
-//=============================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):   wry
-// Date:        2009-04-06
-//
-//####DESCRIPTIONEND####
-//=============================================================================
-
-#define _SWAP(_a,_b) do { int tmp = (_a); (_a) = (_b); (_b) = tmp; } while(0)
-
-typedef struct {
-    unsigned char S[256];
-    int i,j;
-} ar4ctx;
-
-void ar4prng_init(ar4ctx *c, unsigned char *seed, unsigned seedlen)
-{
-    int i,j=0;
-    for (i=0; i<256; i++) c->S[i] = i;
-    for (i=0; i<256; i++) {
-        j = (j + c->S[i] + seed[i%seedlen]) %256;
-        _SWAP(c->S[i], c->S[j]);
-    }
-    c->i = c->j = 0;
-}
-
-unsigned char ar4prng_next(ar4ctx *c)
-{
-    c->i = (c->i + 1) %256;
-    c->j = (c->j + c->S[c->i]) %256;
-    _SWAP(c->S[c->i], c->S[c->j]);
-    return c->S[(c->S[c->i] + c->S[c->j])%256];
-}
-
-void ar4prng_many(ar4ctx *c, unsigned char *optr, unsigned len)
-{
-    while (len--) *(optr++) = ar4prng_next(c);
-}
-
-#include <cyg/infra/cyg_type.h>
-
-/* If you care about systematic sampling bias, do not naively
- * reduce a u32 mod some limit. */
-cyg_uint32 ar4prng_u32(ar4ctx *c)
-{
-    cyg_uint32 rv = 0;
-    ar4prng_many(c, (void*)&rv, sizeof(rv));
-    return rv;
-}
-
-cyg_int32 ar4prng_s32(ar4ctx *c)
-{
-    cyg_int32 rv = 0;
-    ar4prng_many(c, (void*)&rv, sizeof(rv));
-    return rv;
-}
-
-#undef _SWAP
-
deleted file mode 100644
--- a/packages/fs/yaffs/current/tests/fops.c
+++ /dev/null
@@ -1,777 +0,0 @@
-//=============================================================================
-//
-//      ops.c
-//
-//      Filesystem, file and directory operation tests for YAFFS on eCos
-//
-//=============================================================================
-// ####ECOSGPLCOPYRIGHTBEGIN####                                            
-// -------------------------------------------                              
-// This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 2009 Free Software Foundation, Inc.
-//
-// eCos is free software; you can redistribute it and/or modify it under    
-// the terms of the GNU General Public License as published by the Free     
-// Software Foundation; either version 2 or (at your option) any later      
-// version.                                                                 
-//
-// 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.,    
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-//
-// This exception does not invalidate any other reasons why a work based    
-// on this file might be covered by the GNU General Public License.         
-// -------------------------------------------                              
-// ####ECOSGPLCOPYRIGHTEND####                                              
-//==========================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):   wry
-// Date:        2009-05-11
-// Description: A good (read/write) shakedown of the filesystem ops.
-//              On the SYNTH device, includes a long test which fills up
-//              the filesystem.
-//
-//####DESCRIPTIONEND####
-//=============================================================================
-
-#include <cyg/infra/testcase.h>
-#include <pkgconf/system.h>
-
-#if !defined(CYGPKG_LIBC_TIME) || !defined(CYGPKG_ERROR) || !defined(CYGPKG_LIBC_STDIO)
-
-void cyg_user_start(void)
-{
-    CYG_TEST_NA("Needs CYGPKG_LIBC_TIME, CYGPKG_ERROR and CYGPKG_LIBC_STDIO");
-}
-
-#else
-
-
-#include <cyg/infra/diag.h>
-#include <cyg/fileio/fileio.h>
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
-#include <unistd.h>
-
-#define MUST(what) do { CYG_TEST_CHECK((what), #what); } while(0)
-
-#define MUSTOS(what) do {       \
-    if (0 != what) {            \
-        perror(#what);          \
-        CYG_TEST_FAIL(#what);   \
-        cyg_test_exit();        \
-    }                           \
-} while(0)
-
-#define EXPECT(what,val) do { CYG_TEST_CHECK((what) == (val), #what "==" #val); } while(0)
-
-#ifdef CYGPKG_DEVS_NAND_SYNTH
-#define DEVICE "synth/0"
-#else
-#define DEVICE "onboard/0"
-#endif
-#define MOUNTPOINT "/nand"
-#define FSTYPE "yaffs"
-
-MTAB_ENTRY(my_auto, MOUNTPOINT, FSTYPE, DEVICE, 0/*priv set up by mount*/);
-
-void list_dir_contents(const char *dir) 
-{
-    DIR *d = opendir(dir);
-    if (!d) {
-        diag_printf("opendir %s: %s (%d)\n", dir, strerror(errno), errno);
-        return;
-    }
-    diag_printf("Directory %s contains:\n", dir);
-
-    struct dirent *de;
-    int n = 0;
-    while ((de=readdir(d))) {
-        diag_printf("\t%s\n", de->d_name);
-        ++n;
-    }
-    diag_printf("(ends)\n");
-
-    // Rewind and try again
-    int m = 0;
-    rewinddir(d);
-    while ((de=readdir(d)))
-        ++m;
-    if (n != m)
-        CYG_TEST_FAIL_EXIT("dir reread check failed - rewinddir broken?");
-
-    closedir(d);
-}
-
-#if 0
-void MKDIR(const char *dir)
-{
-    MUSTOS(mkdir(dir,0777));
-}
-#else
-#define MKDIR(d) MUSTOS(mkdir(d,0777))
-#endif
-
-#if 0
-void RMDIR(const char *dir)
-{
-    MUSTOS(rmdir(dir));
-}
-#else
-#define RMDIR(d) MUSTOS(rmdir(d))
-#endif
-
-#define RENAME(d,d2) MUSTOS(rename(d,d2))
-#define UNLINK(p) MUSTOS(unlink(p))
-#define LINK(p1,p2) MUSTOS(link(p1,p2))
-
-void CHDIR(const char *dir)
-{
-    MUSTOS(chdir(dir));
-}
-
-void WANTDIR(const char *d)
-{
-    struct stat st;
-    MUSTOS(stat(d,&st));
-    EXPECT(S_ISDIR(st.st_mode),1);
-}
-
-void DONOTWANT(const char *f)
-{
-    struct stat st;
-    if (stat(f,&st) != -1) {
-        diag_printf("Do not want %s, but it is there\n",f);
-        CYG_TEST_FAIL_EXIT("Unexpected entity present");
-    }
-    EXPECT(errno,ENOENT);
-}
-
-void RM_RF_work(const char *f, int recurse)
-{
-    //diag_printf("chdir %s <r=%d>\n",f,recurse);
-    MUSTOS(chdir(f));
-    DIR *d = opendir(".");
-    if (!d) {
-        diag_printf("opendir %s: %s\n", f, strerror(errno));
-        return;
-    }
-    //diag_printf("opened dir %s\n",f);
-    struct dirent de_stack;
-    struct dirent *de_res;
-    while (0==readdir_r(d, &de_stack, &de_res) && de_res) {
-        struct stat st;
-        if (0==strcmp(de_res->d_name,".")) continue;
-        if (0==strcmp(de_res->d_name,"..")) continue;
-        MUSTOS(stat(de_res->d_name,&st));
-        if (S_ISDIR(st.st_mode)) {
-            RM_RF_work(de_res->d_name, recurse+1);
-            //diag_printf("rmdir %s\n", de_res->d_name);
-            if (rmdir(de_res->d_name))
-                perror("rmdir");
-        } else {
-            // diag_printf("unlink %s\n", de_res->d_name);
-            MUSTOS(unlink(de_res->d_name));
-        }
-        // N.B. We have just unlinked a file or deleted a subdir
-        // during a live opendir/readdir cycle. What we get from readdir
-        // isn't (strictly) well-defined, but we expect to not crash.
-        // In fact what we get from YAFFS is probably the best
-        // possible behaviour: there's no explosion, and when we
-        // next say readdir() we get the next entry!
-    }
-    //diag_printf("rm -rf closes %s\n",f);
-    closedir(d);
-    MUSTOS(chdir(".."));
-    //diag_printf("chdir ..\n");
-}
-
-void RM_RF(const char *p)
-{
-    //diag_printf("chdir /\n");
-    //MUSTOS(chdir(MOUNTPOINT));
-    diag_printf("rm -rf %s\n",p);
-    RM_RF_work(p,0);
-    //diag_printf("rmdir %s\n",p);
-    RMDIR(p);
-}
-
-void checklen(const char *f, off_t size)
-{
-    struct stat st;
-    MUSTOS(stat(f, &st));
-    if (st.st_size != size) {
-        diag_printf("!! file %s size by stat is %lu, expect %lu\n", f, st.st_size, size);
-        CYG_TEST_FAIL_EXIT("file size readback mismatch");
-    }
-}
-
-// --------------------------------------------------------------
-
-// Function inspiration borrowed from fileio1.c and just about 
-// every other filesystem in eCos... Only this time, we're 
-// sufficiently paranoid to want to use arc4 to generate our file data.
-
-#define SHOW_RESULT(fn,res) do {                    \
-    diag_printf("%s returned %d, errno %d (%s)\n", #fn, (int)res, errno, strerror(errno));   \
-    CYG_TEST_FAIL("Unexpected result from "#fn);    \
-    cyg_test_exit();                                \
-} while(0)
-
-#define IOSIZE 100
-
-#include "ar4prng.inl"
-
-#define SEEDLEN (sizeof(time_t))
-unsigned char seed[SEEDLEN];
-
-ar4ctx prng;
-
-static void reinit_prng(void)
-{
-    static int seed_inited = 0;
-
-    if (!seed_inited) {
-        // This is a bit cruddy, but will introduce sufficient variation to make it interesting.
-        *(time_t*)seed = time(0);
-        seed_inited=1;
-    }
-
-    ar4prng_init(&prng, seed, SEEDLEN);
-}
-
-unsigned char buf[IOSIZE], testbuf[IOSIZE];
-
-static void createfile( char *name, size_t size )
-{
-    int fd;
-    ssize_t wrote;
-    int err;
-    size_t savesize = size;
-
-    diag_printf("<INFO>: create file %s size %zd\n",name,size);
-
-    err = access( name, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-    
-    reinit_prng();
-
- 
-    fd = open( name, O_WRONLY|O_CREAT );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    while( size > 0 )
-    {
-        ssize_t len = size;
-        if ( len > IOSIZE ) len = IOSIZE;
-        
-        ar4prng_many(&prng, buf, len);
-        wrote = write( fd, buf, len );
-        if( wrote != len ) SHOW_RESULT( write, wrote );        
-
-        size -= wrote;
-    }
-
-    err = fsync(fd);
-    if (err < 0) SHOW_RESULT(fsync, err);
-
-    struct stat st;
-    err = fstat(fd, &st);
-    if (err < 0) SHOW_RESULT(fstat, err);
-    if (st.st_size != savesize)
-        CYG_TEST_FAIL_EXIT("fstat size mismatched");
-
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-
-static void checkfile( char *name )
-{
-    int fd;
-    ssize_t done, pos=0, lastread=-1;
-    int i;
-    int err;
-
-    diag_printf("<INFO>: check file %s\n",name);
-    
-    reinit_prng();
-
-    err = access( name, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-
-    fd = open( name, O_RDONLY );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    for(;;)
-    {
-        done = read( fd, buf, IOSIZE );
-        pos += done;
-        if( done < 0 ) SHOW_RESULT( read, done );
-
-        if( done == 0 ) break;
-        lastread = done;
-
-        ar4prng_many(&prng, testbuf, done);
-
-        for( i = 0; i < done; i++ )
-            if( buf[i] != testbuf[i] )
-            {
-                diag_printf("buf[%d](%02x) != %02x\n",i,buf[i],testbuf[i]);
-                CYG_TEST_FAIL_EXIT("Data read not equal to data written");
-            }
-    }
-
-    // While we're here, let's have a play with lseek.
-#define LSEEK(f, o, w, expect) do {             \
-    err = lseek(f, o, w);                       \
-    if (err != expect) SHOW_RESULT(fseek, err); \
-} while(0)
-
-    LSEEK(fd, -lastread, SEEK_END, pos-lastread);
-    done = read(fd, buf, IOSIZE);
-    CYG_ASSERT(done == lastread, "reread last chunk size mismatch - lseek broken?");
-    for (i=0; i<IOSIZE; i++) {
-        if (buf[i] != testbuf[i]) {
-            diag_printf("buf[%d](%02x) != %02x\n",i,buf[i],testbuf[i]);
-            CYG_TEST_FAIL_EXIT("Data mismatch - lseek broken?");
-        }
-    }
-
-    reinit_prng();
-    ar4prng_many(&prng, testbuf, IOSIZE);
-
-    LSEEK(fd, 10, SEEK_SET, 10);
-    done = read(fd, &buf[10], IOSIZE-10);
-    CYG_ASSERT(done == IOSIZE-10, "reading after fseek");
-    LSEEK(fd, -IOSIZE, SEEK_CUR, 0); // i.e. to beginning of file
-    done = read(fd, buf, 10);
-    CYG_ASSERT(done == 10, "reading after 2nd fseek");
-    for (i=0; i<IOSIZE; i++) {
-        if (buf[i] != testbuf[i]) {
-            diag_printf("buf[%d](%02x) != %02x\n",i,buf[i],testbuf[i]);
-            CYG_TEST_FAIL_EXIT("Data mismatch - lseek broken?");
-        }
-    }
-
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-
-static void copyfile( char *name2, char *name1 )
-{
-    int err;
-    int fd1, fd2;
-    ssize_t done, wrote;
-
-    diag_printf("<INFO>: copy file %s -> %s\n",name2,name1);
-
-    err = access( name1, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-    err = access( name2, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-    
-    fd1 = open( name1, O_WRONLY|O_CREAT );
-    if( fd1 < 0 ) SHOW_RESULT( open, fd1 );
-
-    fd2 = open( name2, O_RDONLY );
-    if( fd2 < 0 ) SHOW_RESULT( open, fd2 );
-    
-    for(;;)
-    {
-        done = read( fd2, buf, IOSIZE );
-        if( done < 0 ) SHOW_RESULT( read, done );
-
-        if( done == 0 ) break;
-
-        wrote = write( fd1, buf, done );
-        if( wrote != done ) SHOW_RESULT( write, wrote );
-
-        if( wrote != done ) break;
-    }
-
-    err = close( fd1 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-
-    err = close( fd2 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-
-static void comparefiles( char *name2, char *name1 )
-{
-    int err;
-    int fd1, fd2;
-    ssize_t done1, done2;
-    int i;
-
-    diag_printf("<INFO>: compare files %s == %s\n",name2,name1);
-
-    err = access( name1, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-
-    err = access( name1, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-    
-    fd1 = open( name1, O_RDONLY );
-    if( fd1 < 0 ) SHOW_RESULT( open, fd1 );
-
-    fd2 = open( name2, O_RDONLY );
-    if( fd2 < 0 ) SHOW_RESULT( open, fd2 );
-
-    for(;;)
-    {
-        done1 = read( fd1, buf, IOSIZE );
-        if( done1 < 0 ) SHOW_RESULT( read, done1 );
-
-        done2 = read( fd2, testbuf, IOSIZE );
-        if( done2 < 0 ) SHOW_RESULT( read, done2 );
-
-        if( done1 != done2 )
-            diag_printf("Files different sizes\n");
-        
-        if( done1 == 0 ) break;
-
-        for( i = 0; i < done1; i++ )
-            if( buf[i] != testbuf[i] )
-            {
-                diag_printf("buf[%d](%02x) != buf[%d](%02x)\n",i,buf[i],i,testbuf[i]);
-                CYG_TEST_FAIL("Data in files not equal\n");
-            }
-    }
-
-    err = close( fd1 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-
-    err = close( fd2 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-    
-}
-
-#ifdef CYGPKG_DEVS_NAND_SYNTH
-
-#include <pkgconf/devs_nand_synth.h>
-
-static void maxfile( char *name )
-{
-    int fd;
-    ssize_t wrote;
-    int err;
-    size_t size = 0;
-    
-    diag_printf("<INFO>: create maximal file %s\n",name);
-
-    err = access( name, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-    reinit_prng();
-
-    fd = open( name, O_WRONLY|O_CREAT );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    do
-    {
-        ar4prng_many(&prng, buf, IOSIZE);
-        wrote = write( fd, buf, IOSIZE );
-        if( wrote < 0 ) SHOW_RESULT( write, wrote );        
-
-        CYG_ASSERT(size <= (CYGNUM_NAND_SYNTH_CHIPSIZE*1024), "filesystem overfull");
-        size += wrote;
-        
-    } while( wrote == IOSIZE );
-
-    diag_printf("<INFO>: file size == %zd\n",size);
-
-    err = close( fd );
-    cyg_fs_setinfo(MOUNTPOINT, FS_INFO_SYNC, NULL, 0); // sync();
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-#endif // CYGPKG_DEVS_NAND_SYNTH
-
-// --------------------------------------------------------------
-
-void cyg_user_start(void)
-{
-    CYG_TEST_INIT();
-
-    // 1. Mounting and unmounting. We should already be mounted
-    // by the time we get here (MTAB_ENTRY).
-    struct stat st;
-    MUSTOS(stat(MOUNTPOINT, &st));
-    diag_printf("got mountpoint ino %08x\n",st.st_ino);
-
-    EXPECT(mount(DEVICE, MOUNTPOINT, FSTYPE), -1);
-    MUSTOS(umount(MOUNTPOINT));
-    EXPECT(umount(MOUNTPOINT),-1);
-    MUSTOS(mount(DEVICE, MOUNTPOINT, FSTYPE));
-    EXPECT(mount(DEVICE, MOUNTPOINT, FSTYPE), -1);
-    CYG_TEST_INFO("mount, umount OK");
-
-    // 2. Directory creation, deletion and rename
-    // In fact we start by deleting if our test dir was already there...
-#define DIR1 MOUNTPOINT"/testdir"
-#define DIR2 MOUNTPOINT"/testdir2"
-    if (0==stat(DIR1, &st)) {
-        CYG_TEST_INFO("dir " DIR1 " already present - attempting to nuke");
-        RM_RF(DIR1);
-    }
-    if (0==stat(DIR2, &st)) {
-        CYG_TEST_INFO("dir " DIR2 " already present - attempting to nuke");
-        RM_RF(DIR2);
-    }
-    EXPECT(rmdir(DIR1),-1);
-    MKDIR(DIR1);
-    RMDIR(DIR1);
-    EXPECT(rmdir(DIR1),-1);
-    MKDIR(DIR1);
-    EXPECT(mkdir(DIR1,0777),-1);
-
-    MKDIR(DIR1"/foo////");
-    EXPECT(rmdir(DIR1),-1);
-    EXPECT(rmdir(DIR1"/."),-1);
-    EXPECT(rmdir(DIR1"/foo/.."),-1);
-    EXPECT(rmdir(DIR1"/./foo/."),-1); // Linux doesn't allow this either.
-    RMDIR(DIR1"/./foo/"); // Trailing slash on a dir op shouldn't catch us out
-
-    RENAME(DIR1"/", MOUNTPOINT"/newdir/");
-    WANTDIR(MOUNTPOINT"/newdir");
-    WANTDIR(MOUNTPOINT"/newdir/////");
-    DONOTWANT(DIR1);
-    RMDIR(MOUNTPOINT"/newdir");
-
-    EXPECT(rmdir(MOUNTPOINT"/"),-1);
-    EXPECT(rmdir(MOUNTPOINT),-1);
-
-    CYG_TEST_INFO("directory creation, deletion OK");
-
-    // 3. chdir. We'll make a simple hierarchy:
-    //      DIR1
-    //      DIR1/1
-    //      DIR1/1a
-    //      DIR1/foo/1foo
-    //      DIR2
-    //      DIR2/2
-    //      DIR2/bar/2bar
-    //      DIR2/bar/2baz
-    // .. then chdir into each in turn and confirm that the contents are as expected.
-    MKDIR(DIR1);
-    MKDIR(DIR1"/1");
-    MKDIR(DIR1"/1a");
-    MKDIR(DIR1"/foo");
-    MKDIR(DIR1"/foo/1foo");
-    MKDIR(DIR2);
-    MKDIR(DIR2"/2");
-    MKDIR(DIR2"/bar");
-    MKDIR(DIR2"/bar/2bar");
-    MKDIR(DIR2"/bar/2baz");
-
-    CHDIR(DIR1);
-    WANTDIR("1");
-    WANTDIR("1a");
-    WANTDIR("foo");
-    DONOTWANT("2");
-    DONOTWANT("1foo");
-    DONOTWANT("bar");
-    DONOTWANT("2bar");
-    DONOTWANT("2baz");
-
-    CHDIR("foo");
-    WANTDIR("1foo");
-    DONOTWANT("1");
-    DONOTWANT("1a");
-    DONOTWANT("foo");
-
-    CHDIR("..");
-    WANTDIR("1");
-    WANTDIR("1a");
-    WANTDIR("foo");
-    DONOTWANT("bar");
-    CHDIR(".");
-    WANTDIR("1");
-    WANTDIR("1a");
-    WANTDIR("foo");
-    DONOTWANT("bar");
-    WANTDIR("foo/1foo");
-    RMDIR("foo/1foo");
-    DONOTWANT("foo/1foo");
-
-    CYG_TEST_INFO("chdir, opendir, readdir OK");
-
-    // 4. File creation, copying, renaming, deletion - throughout dirs
-
-    CHDIR(DIR1);
-    createfile("floop", 202);
-    checklen("floop", 202);
-    checkfile(DIR1"/floop");
-    copyfile("floop", DIR2"/fee");
-    CHDIR(DIR2);
-    checkfile("fee");
-    checklen("fee", 202);
-    comparefiles("fee", DIR1"/floop");
-
-    copyfile("fee", DIR1"/fum");
-    checkfile(DIR1"/fum");
-    chdir(DIR1);
-    checkfile("fum");
-    comparefiles("floop", "fum");
-    comparefiles("fum", DIR2"/fee");
-
-    // Rename ...
-    RENAME("fum", DIR2"/fum2");
-    DONOTWANT("fum");
-    DONOTWANT("fum2");
-    DONOTWANT(DIR1"/fum");
-    checkfile(DIR2"/fum2");
-    CHDIR(DIR2);
-    checkfile("fum2");
-    CHDIR(DIR1);
-    RENAME(DIR2"/fum2", "fum3");
-    checkfile("fum3");
-    checkfile(DIR1"/fum3");
-    DONOTWANT(DIR2"/fum3");
-    comparefiles(DIR1"/fum3", DIR1"/floop");
-    CHDIR(DIR2);
-    comparefiles(DIR1"/fum3", DIR1"/floop");
-
-    // A brief diversion to check rewinddir...
-    list_dir_contents(DIR1);
-
-    // Create-over, rename-over
-    CHDIR(DIR1);
-    checklen("floop", 202);
-    checklen(DIR2"/fee", 202);
-    createfile(DIR2"/fee", 4242);
-    checklen(DIR2"/fee", 4242);
-    checklen("floop", 202);
-    RENAME(DIR2"/fee", "floop");
-    checklen("floop", 4242);
-
-    // Unlink
-    CHDIR(DIR2);
-    UNLINK(DIR1"/fum3");
-    DONOTWANT(DIR1"/fum3");
-    DONOTWANT("fum3");
-    CHDIR(DIR1);
-    DONOTWANT("fum3");
-
-    CYG_TEST_INFO("file create/read/write, copy, delete OK");
-
-    // 5. File hard links (and directory, which aren't supported)
-
-    LINK("floop","floop2");
-    checklen("floop2", 4242);
-    LINK("floop",DIR2"/floop3");
-    CHDIR(DIR2);
-    LINK(DIR1"/floop", "floop4");
-    LINK(DIR1"/floop", DIR1"/floop5");
-    DONOTWANT("floop2");
-    checkfile("floop3");
-    checkfile("floop4");
-    DONOTWANT("floop5");
-    CHDIR(DIR1);
-    checkfile("floop2");
-    DONOTWANT("floop3");
-    DONOTWANT("floop4");
-    checkfile("floop5");
-
-    checkfile(DIR1"/floop2");
-    checkfile(DIR2"/floop3");
-    checkfile(DIR2"/floop4");
-    checkfile(DIR1"/floop5");
-
-    UNLINK("floop2");
-    UNLINK(DIR2"/floop3");
-    CHDIR(DIR2);
-    UNLINK("floop4");
-    UNLINK(DIR1"/floop5");
-
-    DONOTWANT(DIR1"/floop2");
-    DONOTWANT(DIR2"/floop3");
-    DONOTWANT(DIR2"/floop4");
-    DONOTWANT(DIR1"/floop5");
-
-    CHDIR(DIR1);
-    checkfile("floop");
-    // we'll leave floop lying around for fpathconf() test
-
-    EXPECT(link(DIR1, DIR2"/dir-hardlink-should-fail"), -1);
-    EXPECT(errno, EPERM);
-
-    CYG_TEST_INFO("hard links OK");
-
-#ifdef CYGPKG_DEVS_NAND_SYNTH
-    // 6. EOF-on-write (by filling the filesystem!)
-    CYG_TEST_INFO("bigfile test, this might take a few seconds");
-
-    // To speed this test up tune your synth nand device to not be so big.
-    maxfile(DIR1"/bigfile");
-    checkfile(DIR1"/bigfile");
-    {
-        struct stat st;
-        stat(DIR1"/bigfile", &st);
-    }
-    UNLINK(DIR1"/bigfile");
-    CYG_TEST_INFO("EOF on write OK");
-#else
-    CYG_TEST_INFO("SKIPPING EOF-on-write test (only applied to synth nand)");
-#endif
-
-    // 7. Ancillary checks - getinfo, setinfo (no ioctls supported as yet)
-
-#ifdef CYGSEM_FILEIO_INFO_DISK_USAGE
-    struct cyg_fs_disk_usage usage;
-    MUSTOS(cyg_fs_getinfo(MOUNTPOINT, FS_INFO_DISK_USAGE, &usage, sizeof(usage)));
-    diag_printf("getinfo/disk_usage says:\n\ttotal blocks %llu\n\tfree blocks  %llu\n\tblock size   %u\n", usage.total_blocks, usage.free_blocks, usage.block_size);
-#endif
-
-    diag_printf("pathconf says:\n\tNAME_MAX %ld\n\tPATH_MAX %ld\n\tSYNC_IO %ld\n", 
-            pathconf(DIR1, _PC_NAME_MAX),
-            pathconf(DIR1, _PC_PATH_MAX),
-            pathconf(DIR1, _PC_SYNC_IO));
-
-    MUSTOS(cyg_fs_setinfo(MOUNTPOINT, FS_INFO_SYNC, 0, 0));
-
-    int fd = open(DIR1"/floop", O_RDONLY);
-    CYG_ASSERT(fd >= 0, "open");
-    CYG_ASSERT(fpathconf(fd, _PC_NAME_MAX) != -1, "fpathconf PC_NAME_MAX");
-    close(fd);
-
-    CYG_TEST_INFO("getinfo, setinfo OK");
-
-    // Clean up.
-
-    CHDIR(MOUNTPOINT);
-    RM_RF(DIR1);
-    RM_RF(DIR2);
-    DONOTWANT(DIR1);
-    DONOTWANT(DIR2);
-    CYG_TEST_INFO("recursive deletion OK");
-
-    MUSTOS(umount(MOUNTPOINT));
-#ifndef CYGDBG_USE_ASSERTS
-    CYG_TEST_INFO("WARNING: asserts disabled, test INCOMPLETE, try switching on CYGPKG_INFRA_DEBUG");
-#else
-    CYG_TEST_PASS_FINISH("All OK");
-#endif
-}
-
-#endif
-
deleted file mode 100644
--- a/packages/fs/yaffs/current/tests/mounttime.c
+++ /dev/null
@@ -1,303 +0,0 @@
-//=============================================================================
-//
-//      mounttime.c
-//
-//      Mount timings exerciser, use on a filesystem filled by `makefiles'
-//      THIS DOES NOT CURRENTLY WORK ON non-PRO eCos!
-//
-//=============================================================================
-// ####ECOSGPLCOPYRIGHTBEGIN####                                            
-// -------------------------------------------                              
-// This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 2009 Free Software Foundation, Inc.
-//
-// eCos is free software; you can redistribute it and/or modify it under    
-// the terms of the GNU General Public License as published by the Free     
-// Software Foundation; either version 2 or (at your option) any later      
-// version.                                                                 
-//
-// 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.,    
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-//
-// This exception does not invalidate any other reasons why a work based    
-// on this file might be covered by the GNU General Public License.         
-// -------------------------------------------                              
-// ####ECOSGPLCOPYRIGHTEND####                                              
-//==========================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):   wry
-// Date:        2009-06-29
-// Description: File system mount and unmount timing benchmark.
-//              Intended to be used on a complicated filesystem, e.g.
-//              one filled up by `makefiles'.
-//              Some timing code borrowed from mmfs tests.
-//
-//####DESCRIPTIONEND####
-//=============================================================================
-
-#include <cyg/infra/testcase.h>
-#include <cyg/infra/diag.h>
-#include <cyg/infra/cyg_ass.h>
-#include <pkgconf/system.h>
-#include <pkgconf/hal.h>
-#include <cyg/hal/hal_intr.h>
-
-#ifndef HAL_CLOCK_READ
-# error "HAL_CLOCK_READ not defined!"
-#endif
-
-#if !defined(CYGPKG_LIBC_TIME) || !defined(CYGPKG_ERROR) || !defined(CYGPKG_LIBC_STDIO) || !defined(CYGPKG_KERNEL)
-
-void cyg_user_start(void)
-{
-    CYG_TEST_NA("Needs CYGPKG_KERNEL, CYGPKG_LIBC_TIME, CYGPKG_ERROR and CYGPKG_LIBC_STDIO");
-}
-
-#else
-
-#include <cyg/fileio/fileio.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <stdlib.h>
-
-#include <cyg/kernel/kapi.h>
-
-#ifdef CYGPKG_DEVS_NAND_SYNTH
-#define DEVICE "synth/0"
-#else
-#define DEVICE "onboard/0"
-#endif
-
-#define MOUNTPOINT "/n"
-#define FSTYPE "yaffs"
-#define _NOCACHE "skip-checkpoint-read"
-
-#define FS_NOCACHE FSTYPE":"_NOCACHE
-
-//#define MUST(what) do { CYG_TEST_CHECK((what), #what); } while(0)
-
-#define MUST(what) do { \
-        if (0 != what) { \
-                perror(#what);          \
-                CYG_TEST_FAIL(#what);   \
-                cyg_test_exit();        \
-        }                           \
-} while(0)
-
-#define min(a,b) ( (a) > (b) ? (b) : (a) )
-
-// --------------------------------------------------------------
-
-void RM_RF_work(const char *f, int recurse)
-{
-    MUST(chdir(f));
-    DIR *d = opendir(".");
-    if (!d) {
-        diag_printf("opendir %s: %s\n", f, strerror(errno));
-        return;
-    }
-    struct dirent de_stack;
-    struct dirent *de_res;
-    while (0==readdir_r(d, &de_stack, &de_res) && de_res) {
-        struct stat st;
-        if (0==strcmp(de_res->d_name,".")) continue;
-        if (0==strcmp(de_res->d_name,"..")) continue;
-        MUST(stat(de_res->d_name,&st));
-        if (S_ISDIR(st.st_mode)) {
-            RM_RF_work(de_res->d_name, recurse+1);
-            if (rmdir(de_res->d_name))
-                perror("rmdir");
-        } else {
-            MUST(unlink(de_res->d_name));
-        }
-    }
-    closedir(d);
-    MUST(chdir(".."));
-}
-
-void RM_RF(const char *p)
-{
-    diag_printf("rm -rf %s\n",p);
-    RM_RF_work(p,0);
-    MUST(rmdir(p));
-}
-
-// --------------------------------------------------------------
-// Timing code cribbed from pvr5.c
-
-typedef struct
-{
-    cyg_int64           ticks;
-    cyg_uint32           halticks;
-} timestamp;
-
-typedef struct
-{
-    timestamp           start;
-    timestamp           end;
-    cyg_int64           interval;       // In HAL ticks
-    cyg_int64           us_interval;    // Interval in microseconds
-} timing;
-
-static cyg_int64        ticks_overhead = 0;
-static cyg_int32        us_per_haltick = 0;
-static cyg_int32        halticks_per_us = 0;
-
-static cyg_int64        rtc_resolution[] = CYGNUM_KERNEL_COUNTERS_RTC_RESOLUTION;
-static cyg_int64        rtc_period = CYGNUM_KERNEL_COUNTERS_RTC_PERIOD;
-
-static void wait_for_tick( void )
-{
-    cyg_tick_count_t now = cyg_current_time();
-
-    while( cyg_current_time() == now )
-        continue;
-}
-
-static void get_timestamp( timestamp *ts )
-{
-    ts->ticks = cyg_current_time();
-    HAL_CLOCK_READ( &ts->halticks );
-}
-
-static cyg_int64 ticks_to_us( cyg_int64 ticks )
-{
-    cyg_int64 us;
-
-    if( us_per_haltick != 0 )
-        us = ticks * us_per_haltick;
-    else
-        us = ticks / halticks_per_us;
-
-    return us;
-}
-
-static void calculate_interval( timing *t )
-{
-    t->interval = t->end.halticks - t->start.halticks;
-
-    t->interval += (t->end.ticks - t->start.ticks) * rtc_period;
-
-    t->interval -= ticks_overhead;
-
-    t->us_interval = ticks_to_us( t->interval );
-}
-
-static void init_timing( void )
-{
-    timing t;
-    cyg_thread_delay(2); // ensure clock running - asserts if not
-
-    us_per_haltick = 1000000/(rtc_period * rtc_resolution[1]);
-    halticks_per_us = (rtc_period * rtc_resolution[1])/1000000;
-
-    wait_for_tick();
-
-    get_timestamp( &t.start );
-    get_timestamp( &t.end );
-
-    calculate_interval( &t );
-
-    ticks_overhead = t.interval;
-
-    diag_printf("Timing overhead %lld ticks (%lluus), this will be factored out of all other measurements\n", ticks_overhead, t.us_interval );
-}
-
-static timing tm;
-
-#define START() do {            \
-    wait_for_tick();            \
-    get_timestamp(&tm.start);   \
-} while(0)
-
-static void report(const char *what, timing tm)
-{
-    if (tm.us_interval > 1100000) 
-        diag_printf("%30s: %2d.%03d s\n", what, (int)(tm.us_interval/1000000), (int)(tm.us_interval/1000)%1000);
-    else
-        diag_printf("%30s: %2d.%03d ms\n", what, (int)(tm.us_interval/1000), (int)(tm.us_interval%1000));
-
-}
-
-#define STOP(what) do {         \
-    get_timestamp(&tm.end);     \
-    calculate_interval(&tm);    \
-    report(what, tm);           \
-} while(0)
-
-// --------------------------------------------------------------
-
-void dumpmallinfo(void)
-{
-    struct mallinfo mi = mallinfo();
-    int total_ord = mi.uordblks + mi.fordblks;
-    double pct = (double)mi.uordblks / (double)total_ord;
-    diag_printf("! Arena: size 0x%x, small blks %u/%u, ord blks used %u/%u (%u%%)\n", 
-            mi.arena,
-            mi.usmblks, mi.fsmblks,
-            mi.uordblks, total_ord, (int)(100.0*pct));
-}
-
-// --------------------------------------------------------------
-
-#define WORKDIR MOUNTPOINT "/" "test"
-
-void mounttime_main(void)
-{
-#define NTIMES 3
-    int i;
-    for (i=0; i<NTIMES; i++) {
-        START();
-        MUST(mount(DEVICE, MOUNTPOINT, FSTYPE));
-        STOP("remount");
-        //if (i==0) dumpmallinfo();
-        START();
-        MUST(umount(MOUNTPOINT));
-        STOP("unmount");
-
-        START();
-        MUST(mount(DEVICE, MOUNTPOINT, FS_NOCACHE));
-        // plain eCos does not support mount options, this test won't work there.
-        STOP("remount without checkpoint");
-        //if (i==0) dumpmallinfo();
-        START();
-        MUST(umount(MOUNTPOINT));
-        STOP("unmount");
-        //if (i==0) dumpmallinfo();
-    }
-    //dumpmallinfo();
-
-    // then consider repeats..
-
-    CYG_TEST_EXIT("Run complete");
-}
-
-int main(void)
-{
-    CYG_TEST_INIT();
-    init_timing();
-
-    mounttime_main();
-    return 0;
-}
-
-#endif
-
deleted file mode 100644
--- a/packages/fs/yaffs/current/tests/yaffs1.c
+++ /dev/null
@@ -1,975 +0,0 @@
-//==========================================================================
-//
-//      yaffs1.c
-//
-//      Test fileio system
-//
-//==========================================================================
-// ####ECOSGPLCOPYRIGHTBEGIN####                                            
-// -------------------------------------------                              
-// This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
-// Copyright (C) 2004, 2006, 2007 eCosCentric Limited                       
-//
-// 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.,    
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-//
-// This exception does not invalidate any other reasons why a work based    
-// on this file might be covered by the GNU General Public License.         
-// -------------------------------------------                              
-// ####ECOSGPLCOPYRIGHTEND####                                              
-//==========================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):           nickg
-// Contributors:        nickg
-// Date:                2000-05-25
-// Purpose:             Test fileio system
-// Description:         This test uses the testfs to check out the initialization
-//                      and basic operation of the fileio system
-//                      
-//                      
-//                      
-//                      
-//                      
-//              
-//
-//####DESCRIPTIONEND####
-//
-//==========================================================================
-
-#include <pkgconf/system.h>
-
-#ifdef CYGPKG_KERNEL
-
-#include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
-#include <pkgconf/io_fileio.h>
-
-#include CYGDAT_DEVS_DISK_CFG           // testing config defines
-
-#include <cyg/kernel/ktypes.h>         // base kernel types
-#include <cyg/infra/cyg_trac.h>        // tracing macros
-#include <cyg/infra/cyg_ass.h>         // assertion macros
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <dirent.h>
-
-#include <cyg/fileio/fileio.h>
-
-#include <cyg/infra/testcase.h>
-#include <cyg/infra/diag.h>            // HAL polled output
-
-//==========================================================================
-// Config options
-
-#define TEST_DEVICE     CYGDAT_DEVS_DISK_TEST_DEVICE
-
-#define TEST_MOUNTPOINT CYGDAT_DEVS_DISK_TEST_MOUNTPOINT
-
-#define TEST_DIRECTORY CYGDAT_DEVS_DISK_TEST_DIRECTORY
-
-#define TEST_FSTYPE     "yaffs"
-
-#ifdef CYGDAT_DEVS_DISK_TEST_MOUNTPOINT2
-
-#define TEST_DEVICE2     CYGDAT_DEVS_DISK_TEST_DEVICE2
-
-#define TEST_MOUNTPOINT2 CYGDAT_DEVS_DISK_TEST_MOUNTPOINT2
-
-#define TEST_DIRECTORY2 CYGDAT_DEVS_DISK_TEST_DIRECTORY2
-
-#define TEST_FSTYPE2    "yaffs"
-
-#endif
-
-//==========================================================================
-
-#define SHOW_RESULT( _fn, _res )                                                                \
-{                                                                                               \
-    diag_printf("<FAIL>: " #_fn "() returned %ld %s\n", (long)_res, _res<0?strerror(errno):"");        \
-}
-
-//==========================================================================
-
-#define IOSIZE  100
-
-#define LONGNAME1       "long_file_name_that_should_take_up_more_than_one_directory_entry_1"
-#define LONGNAME2       "long_file_name_that_should_take_up_more_than_one_directory_entry_2"
-
-
-//==========================================================================
-
-#ifndef CYGPKG_LIBC_STRING
-
-char *strcat( char *s1, const char *s2 )
-{
-    char *s = s1;
-    while( *s1 ) s1++;
-    while( (*s1++ = *s2++) != 0);
-    return s;
-}
-
-#endif
-
-__externC int
-rename( const char * /* oldpath */, const char * /* newpath */ ) __THROW;
-
-//==========================================================================
-
-static void listdir( char *name, int statp, int numexpected, int *numgot )
-{
-    int err;
-    DIR *dirp;
-    int num=0;
-    
-    diag_printf("<INFO>: reading directory %s\n",name);
-    
-//    diag_printf("<INFO>: opendir(%s)\n",name);
-    dirp = opendir( name );
-    if( dirp == NULL ) SHOW_RESULT( opendir, -1 );
-
-    for(;;)
-    {
-        struct dirent *entry = readdir( dirp );
-        
-        if( entry == NULL )
-            break;
-        num++;
-        diag_printf("<INFO>: entry %14s",entry->d_name);
-#ifdef CYGPKG_FS_FAT_RET_DIRENT_DTYPE
-        diag_printf(" d_type %2x", entry->d_type);
-#endif
-        if( statp )
-        {
-            char fullname[PATH_MAX];
-            struct stat sbuf;
-
-            if( name[0] )
-            {
-                strcpy(fullname, name );
-                if( !(name[0] == '/' && name[1] == 0 ) )
-                    strcat(fullname, "/" );
-            }
-            else fullname[0] = 0;
-            
-            strcat(fullname, entry->d_name );
-            
-            err = stat( fullname, &sbuf );
-            if( err < 0 )
-            {
-                if( errno == ENOSYS )
-                    diag_printf(" <no status available>");
-                else SHOW_RESULT( stat, err );
-            }
-            else
-            {
-                diag_printf(" [mode %08x ino %08x nlink %d size %ld]",
-                            sbuf.st_mode,sbuf.st_ino,sbuf.st_nlink,sbuf.st_size);
-            }
-#ifdef CYGPKG_FS_FAT_RET_DIRENT_DTYPE
-            if ((entry->d_type & S_IFMT) != (sbuf.st_mode & S_IFMT))
-              CYG_TEST_FAIL("File mode's don't match between dirent and stat");
-#endif
-        }
-
-        diag_printf("\n");
-    }
-
-//    diag_printf("<INFO>: closedir(%s)\n",name);    
-    err = closedir( dirp );
-    if( err < 0 ) SHOW_RESULT( stat, err );
-    if (numexpected >= 0 && num != numexpected)
-        CYG_TEST_FAIL("Wrong number of dir entries\n");
-    if ( numgot != NULL )
-        *numgot = num;
-}
-
-//==========================================================================
-
-static void createfile( char *name, size_t size )
-{
-    char buf[IOSIZE];
-    int fd;
-    ssize_t wrote;
-    int i;
-    int err;
-
-    diag_printf("<INFO>: create file %s size %zd\n",name,size);
-
-    err = access( name, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-    
-    for( i = 0; i < IOSIZE; i++ ) buf[i] = i%256;
- 
-    fd = open( name, O_WRONLY|O_CREAT );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    while( size > 0 )
-    {
-        ssize_t len = size;
-        if ( len > IOSIZE ) len = IOSIZE;
-        
-        wrote = write( fd, buf, len );
-        if( wrote != len ) SHOW_RESULT( write, wrote );        
-
-        size -= wrote;
-    }
-
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-
-//==========================================================================
-
-#if 0
-static void maxfile( char *name )
-{
-    char buf[IOSIZE];
-    int fd;
-    ssize_t wrote;
-    int i;
-    int err;
-    size_t size = 0;
-    size_t prevsize = 0;
-    
-    diag_printf("<INFO>: create maximal file %s\n",name);
-    diag_printf("<INFO>: This may take a few minutes\n");
-
-    err = access( name, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-    
-    for( i = 0; i < IOSIZE; i++ ) buf[i] = i%256;
- 
-    fd = open( name, O_WRONLY|O_CREAT );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    do
-    {
-        wrote = write( fd, buf, IOSIZE );
-        //if( wrote < 0 ) SHOW_RESULT( write, wrote );        
-
-        if( wrote >= 0 )
-            size += wrote;
-
-        if( (size-prevsize) > 100000 )
-        {
-            diag_printf("<INFO>: size = %zd\n", size);
-            prevsize = size;
-        }
-        
-    } while( wrote == IOSIZE );
-
-    diag_printf("<INFO>: file size == %zd\n",size);
-
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-#endif
-
-//==========================================================================
-
-static void checkfile( char *name )
-{
-    char buf[IOSIZE];
-    int fd;
-    ssize_t done;
-    int i;
-    int err;
-    off_t pos = 0;
-
-    diag_printf("<INFO>: check file %s\n",name);
-    
-    err = access( name, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-
-    fd = open( name, O_RDONLY );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    for(;;)
-    {
-        done = read( fd, buf, IOSIZE );
-        if( done < 0 ) SHOW_RESULT( read, done );
-
-        if( done == 0 ) break;
-
-        for( i = 0; i < done; i++ )
-            if( buf[i] != i%256 )
-            {
-                diag_printf("buf[%ld+%d](%02x) != %02x\n",pos,i,buf[i],i%256);
-                CYG_TEST_FAIL("Data read not equal to data written\n");
-                for(;;);
-            }
-        
-        pos += done;
-    }
-
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-
-//==========================================================================
-
-static void copyfile( char *name2, char *name1 )
-{
-
-    int err;
-    char buf[IOSIZE];
-    int fd1, fd2;
-    ssize_t done, wrote;
-
-    diag_printf("<INFO>: copy file %s -> %s\n",name2,name1);
-
-    err = access( name1, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-    err = access( name2, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-    
-    fd1 = open( name1, O_WRONLY|O_CREAT );
-    if( fd1 < 0 ) SHOW_RESULT( open, fd1 );
-
-    fd2 = open( name2, O_RDONLY );
-    if( fd2 < 0 ) SHOW_RESULT( open, fd2 );
-    
-    for(;;)
-    {
-        done = read( fd2, buf, IOSIZE );
-        if( done < 0 ) SHOW_RESULT( read, done );
-
-        if( done == 0 ) break;
-
-        wrote = write( fd1, buf, done );
-        if( wrote != done ) SHOW_RESULT( write, wrote );
-
-        if( wrote != done ) break;
-    }
-
-    err = close( fd1 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-
-    err = close( fd2 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-    
-}
-
-//==========================================================================
-
-static void comparefiles( char *name2, char *name1 )
-{
-    int err;
-    char buf1[IOSIZE];
-    char buf2[IOSIZE];
-    int fd1, fd2;
-    ssize_t done1, done2;
-    int i;
-
-    diag_printf("<INFO>: compare files %s == %s\n",name2,name1);
-
-    err = access( name1, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-
-    err = access( name1, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-    
-    fd1 = open( name1, O_RDONLY );
-    if( fd1 < 0 ) SHOW_RESULT( open, fd1 );
-
-    fd2 = open( name2, O_RDONLY );
-    if( fd2 < 0 ) SHOW_RESULT( open, fd2 );
-    
-    for(;;)
-    {
-        done1 = read( fd1, buf1, IOSIZE );
-        if( done1 < 0 ) SHOW_RESULT( read, done1 );
-
-        done2 = read( fd2, buf2, IOSIZE );
-        if( done2 < 0 ) SHOW_RESULT( read, done2 );
-
-        if( done1 != done2 )
-            diag_printf("Files different sizes\n");
-        
-        if( done1 == 0 ) break;
-
-        for( i = 0; i < done1; i++ )
-            if( buf1[i] != buf2[i] )
-            {
-                diag_printf("buf1[%d](%02x) != buf1[%d](%02x)\n",i,buf1[i],i,buf2[i]);
-                CYG_TEST_FAIL("Data in files not equal\n");
-            }
-    }
-
-    err = close( fd1 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-
-    err = close( fd2 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-    
-}
-
-//==========================================================================
-
-void checkcwd( const char *cwd )
-{
-    static char cwdbuf[PATH_MAX];
-    char *ret;
-
-    ret = getcwd( cwdbuf, sizeof(cwdbuf));
-    if( ret == NULL ) SHOW_RESULT( getcwd, ret );    
-
-    if( strcmp( cwdbuf, cwd ) != 0 )
-    {
-        diag_printf( "cwdbuf %s cwd %s\n",cwdbuf, cwd );
-        CYG_TEST_FAIL( "Current directory mismatch");
-    }
-}
-
-//==========================================================================
-// main
-
-void fileio1_main( CYG_ADDRESS id )
-{
-    int err;
-    int existingdirents=-1;
-    cyg_bool mp2 = false;
-    int fd;
-#if defined(CYGSEM_FILEIO_BLOCK_USAGE)
-    struct cyg_fs_block_usage usage;
-#endif
-    
-    char dirname[64];
-    char filename1[64];
-    char filename2[64];
-
-#define NEW_FILENAME( fn, f )                           \
-{                                                       \
-    fn[0]=0;                                            \
-    strcat(fn, dirname);                                \
-    strcat(fn, "/");                                    \
-    strcat(fn,f);                                       \
-}
-
-#define NEW_FILENAME1( f ) NEW_FILENAME( filename1, f )
-#define NEW_FILENAME2( f ) NEW_FILENAME( filename2, f )
-
-    CYG_TEST_INIT();
-    
-    // --------------------------------------------------------------
-
-    err = mount( TEST_DEVICE, TEST_MOUNTPOINT, TEST_FSTYPE );    
-    if( err < 0 ) {
-        SHOW_RESULT( mount, err );
-        CYG_TEST_FAIL_FINISH("yaffs1");
-    }
-
-    err = access( TEST_MOUNTPOINT TEST_DIRECTORY, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-    if( err < 0 && errno == EACCES )
-    {
-        diag_printf("<INFO>: create %s\n",
-                    TEST_MOUNTPOINT TEST_DIRECTORY);
-        err = mkdir( TEST_MOUNTPOINT TEST_DIRECTORY, 0 );
-        if( err < 0 ) SHOW_RESULT( mkdir, err );
-    }
-
-    err = chdir( TEST_MOUNTPOINT TEST_DIRECTORY );    
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    checkcwd( TEST_MOUNTPOINT TEST_DIRECTORY );
-    
-    listdir( TEST_MOUNTPOINT TEST_DIRECTORY, true, -1, &existingdirents );
-
-    // --------------------------------------------------------------
-#if defined(CYGSEM_FILEIO_BLOCK_USAGE)
-    err = cyg_fs_getinfo(TEST_MOUNTPOINT, FS_INFO_BLOCK_USAGE,
-                         &usage, sizeof(usage));
-    if( err < 0 ) SHOW_RESULT( cyg_fs_getinfo, err );
-    diag_printf("<INFO>: total size: %6lld blocks, %10lld bytes\n",
-               usage.total_blocks, usage.total_blocks * usage.block_size);
-    diag_printf("<INFO>: free size:  %6lld blocks, %10lld bytes\n",
-               usage.free_blocks, usage.free_blocks * usage.block_size);
-    diag_printf("<INFO>: block size: %6u bytes\n", usage.block_size);
-#endif
-    // --------------------------------------------------------------
-    
-    dirname[0] = 0;
-    strcat(dirname, TEST_MOUNTPOINT );
-    strcat(dirname, TEST_DIRECTORY );
-    
-    // --------------------------------------------------------------
-
-    createfile( "foo", 20257 );
-    checkfile( "foo" );
-    copyfile( "foo", "fee");
-    checkfile( "fee" );
-    comparefiles( "foo", "fee" );
-    diag_printf("<INFO>: mkdir bar\n");
-    err = mkdir( "bar", 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    listdir( dirname , true, existingdirents+3, NULL );
-
-    copyfile( "fee", "bar/fum" );
-    checkfile( "bar/fum" );
-    comparefiles( "fee", "bar/fum" );
-    diag_printf("<INFO>: cd bar\n");
-    err = chdir( "bar" );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    // Create a further subdirectory and immediately remove it
-    // This should make no overall change, but may expose later
-    // node cache reference counting issues.
-    diag_printf("<INFO>: mkdir delme\n");                
-    err = mkdir( "delme", 0);
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-    diag_printf("<INFO>: cd delme\n");                
-    err = chdir( "delme");
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    diag_printf("<INFO>: cd ..\n");                
-    err = chdir( ".." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    diag_printf("<INFO>: rmdir delme\n");                
-    err = rmdir( "delme" );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-    NEW_FILENAME1( "bar/delme1" );
-    diag_printf("<INFO>: mkdir %s\n",filename1);            
-    err = mkdir( filename1, 0);
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-    diag_printf("<INFO>: rmdir %s\n",filename1);                
-    err = rmdir( filename1 );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-
-    
-    NEW_FILENAME1( "bar" );
-    checkcwd( filename1 );
-    
-    diag_printf("<INFO>: rename ../foo bundy\n");    
-    err = rename( "../foo", "bundy" );
-    if( err < 0 ) SHOW_RESULT( rename, err );
-    
-    listdir( dirname, true, existingdirents+2, NULL );
-    listdir( "." , true, 4, NULL );
-
-    checkfile( "../bar/bundy" );
-    comparefiles("../fee", "bundy" );
-
-#if defined(CYGSEM_FILEIO_BLOCK_USAGE)
-    err = cyg_fs_getinfo(TEST_MOUNTPOINT, FS_INFO_BLOCK_USAGE,
-                         &usage, sizeof(usage));
-    if( err < 0 ) SHOW_RESULT( cyg_fs_getinfo, err );
-    diag_printf("<INFO>: total size: %6lld blocks, %10lld bytes\n",
-               usage.total_blocks, usage.total_blocks * usage.block_size);
-    diag_printf("<INFO>: free size:  %6lld blocks, %10lld bytes\n",
-               usage.free_blocks, usage.free_blocks * usage.block_size);
-    diag_printf("<INFO>: block size: %6u bytes\n", usage.block_size);
-#endif
-    // --------------------------------------------------------------
-    // Check for some common error cases
-
-
-    // First make some directories
-    diag_printf("<INFO>: mkdir doo\n");    
-    err = mkdir( "doo", 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );    
-
-    diag_printf("<INFO>: mkdir fie\n");    
-    err = mkdir( "fie", 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );    
-
-    diag_printf("<INFO>: mkdir fie/foe\n");    
-    err = mkdir( "fie/foe", 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );    
-
-    
-    diag_printf("<INFO>: rename fum doo -- should fail\n");    
-    err = rename( "fum", "doo" );
-    if( err < 0 && errno != EISDIR ) SHOW_RESULT( rename, err );
-
-    diag_printf("<INFO>: rename doo fum -- should fail\n");    
-    err = rename( "doo", "fum" );
-    if( err < 0 && errno != ENOTDIR ) SHOW_RESULT( rename, err );
-
-    diag_printf("<INFO>: rename doo fie -- should fail\n");    
-    err = rename( "doo", "fie" );
-    // FATFS returns ENOTEMPTY, since fie has foe within it
-    if( err < 0 && errno != EIO ) SHOW_RESULT( rename, err );
-    
-    diag_printf("<INFO>: open floop for reading -- should fail\n");    
-    err = open( "floop", O_RDONLY );
-    if( err < 0 && errno != ENOENT ) SHOW_RESULT( open, err );
-
-    NEW_FILENAME1( "x/y" )
-    diag_printf("<INFO>: rename fum %s -- should fail\n",filename1);    
-    err = rename( "fum", filename1 );
-    if( err < 0 && errno != ENOENT ) SHOW_RESULT( rename, err );
-
-    diag_printf("<INFO>: rename fum fum -- should succeed\n");    
-    err = rename( "fum", "fum" );
-    if( err < 0 ) SHOW_RESULT( rename, err );
-
-    diag_printf("<INFO>: unlink fee -- should fail\n");        
-    err = unlink( "fee" );
-    if( err < 0 && errno != ENOENT ) SHOW_RESULT( unlink, err );
-
-    NEW_FILENAME1( "bar" );
-    diag_printf("<INFO>: rmdir %s -- should fail\n",filename1);        
-    err = rmdir( filename1 );
-    // FATFS gives EBUSY here, since bar is the current dir
-    if( err < 0 && errno != ENOTEMPTY ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: unlink %s -- should fail\n",filename1);        
-    err = unlink( filename1 );
-    // FATFS returns EBUSY here, also because bar is current dir
-    if( err < 0 && errno != EISDIR ) SHOW_RESULT( unlink, err );
-
-    NEW_FILENAME1( "bar/fum" );
-    diag_printf("<INFO>: rmdir %s -- should fail\n",filename1);        
-    err = rmdir( filename1 );
-    if( err < 0 && errno != ENOTDIR ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: mkdir %s -- should fail\n",filename1);        
-    err = mkdir( filename1, 0 );
-    if( err < 0 && errno != EEXIST ) SHOW_RESULT( mkdir, err );
-    
-    diag_printf("<INFO>: open bundy exclusive -- should fail\n");        
-    fd = open( "bundy", O_WRONLY|O_CREAT|O_EXCL );
-    if( fd < 0 && errno != EEXIST ) SHOW_RESULT( open, fd );
-
-    diag_printf("<INFO>: open %s -- should fail\n",dirname);        
-    fd = open( dirname, O_WRONLY );
-    if( fd < 0 && errno != EISDIR ) SHOW_RESULT( open, fd );
-    
-    
-    listdir( dirname, true, existingdirents+2, NULL );
-    listdir( "." , true, 6, NULL );
-    
-    // --------------------------------------------------------------    
-
-    diag_printf("<INFO>: rename fie doo\n");
-    err = rename( "fie", "doo" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: rmdir doo/foe\n");
-    err = rmdir("doo/foe");
-    if( err < 0 ) SHOW_RESULT( unlink, err );    
-
-    diag_printf("<INFO>: rmdir doo\n");
-    err = rmdir("doo");
-    if( err < 0 ) SHOW_RESULT( unlink, err );    
-    
-    diag_printf("<INFO>: unlink ../fee\n");    
-    err = unlink( "../fee" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink fum\n");
-    err = unlink( "fum" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink ../bar/bundy\n");        
-    err = unlink( "../bar/bundy" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: cd ..\n");        
-    err = chdir( ".." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    checkcwd( dirname );
-    
-    diag_printf("<INFO>: rmdir bar\n");        
-    err = rmdir( "bar" );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-    
-    listdir( dirname, false, existingdirents, NULL );
-
-    // --------------------------------------------------------------
-
-#ifdef TEST_MOUNTPOINT2
-    diag_printf("<INFO>: mount %s\n", TEST_MOUNTPOINT2);    
-    err = mount( TEST_DEVICE2, TEST_MOUNTPOINT2, TEST_FSTYPE2 );
-
-    if( err == 0 )
-    {
-        mp2 = true;
-        diag_printf("<INFO>: mount %s succeeded\n", TEST_MOUNTPOINT2);    
-        err = access( TEST_MOUNTPOINT2 TEST_DIRECTORY2, F_OK );
-        if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-        if( err < 0 && errno == EACCES )
-        {
-            diag_printf("<INFO>: create %s\n",
-                        TEST_MOUNTPOINT2 TEST_DIRECTORY2);
-            err = mkdir( TEST_MOUNTPOINT2 TEST_DIRECTORY2, 0 );
-            if( err < 0 ) SHOW_RESULT( mkdir, err );
-        }
-
-        err = chdir( TEST_MOUNTPOINT2 TEST_DIRECTORY2 );    
-        if( err < 0 ) SHOW_RESULT( chdir, err );
-
-        checkcwd( TEST_MOUNTPOINT2 TEST_DIRECTORY2 );
-
-        dirname[0] = 0;
-        strcat(dirname, TEST_MOUNTPOINT2 );
-        strcat(dirname, TEST_DIRECTORY2 );
-
-    }
-    else
-    {
-        mp2 = false;
-        diag_printf("<INFO>: mount %s failed, ", TEST_MOUNTPOINT2);
-        diag_printf("using %s instead\n", dirname );
-    }
-
-#endif
-    
-    listdir( dirname , true, -1, &existingdirents);
-
-    NEW_FILENAME1( "tinky" );
-    NEW_FILENAME2( "laalaa" );
-    
-    createfile( filename1, 4567 );
-    copyfile( filename1, filename2 );
-    checkfile( filename1);
-    checkfile( filename2);
-    comparefiles( filename1, filename2 );
-
-    diag_printf("<INFO>: cd %s\n",dirname);    
-    err = chdir( dirname );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    checkcwd( dirname );
-        
-    diag_printf("<INFO>: mkdir noonoo\n");    
-    err = mkdir( "noonoo", 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    listdir( dirname , true, existingdirents+3, NULL);
-
-    diag_printf("<INFO>: cd noonoo\n");
-    err = chdir( "noonoo" );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    NEW_FILENAME1( "noonoo" );
-    checkcwd( filename1 );
-    
-    createfile( "tinky", 6789 );
-    checkfile( "tinky" );
-
-    createfile( "dipsy", 34567 );
-    checkfile( "dipsy" );
-    copyfile( "dipsy", "po" );
-    checkfile( "po" );
-    comparefiles( "dipsy", "po" );
-
-    listdir( ".", true, 5, NULL );
-    listdir( "..", true, existingdirents+3, NULL );
-
-    // --------------------------------------------------------------
-
-    diag_printf("<INFO>: unlink tinky\n");    
-    err = unlink( "tinky" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink dipsy\n");    
-    err = unlink( "dipsy" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink po\n");    
-    err = unlink( "po" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: cd ..\n"); 
-    err = chdir( ".." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( dirname );
-    
-    diag_printf("<INFO>: rmdir noonoo\n"); 
-    err = rmdir( "noonoo" );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-
-    // --------------------------------------------------------------
-
-    diag_printf("<INFO>: mkdir x\n");    
-    err = mkdir( "x", 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-    
-    diag_printf("<INFO>: mkdir x/y\n");    
-    err = mkdir( "x/y", 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-    
-    diag_printf("<INFO>: mkdir x/y/z\n");    
-    err = mkdir( "x/y/z", 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    diag_printf("<INFO>: mkdir x/y/z/w\n");    
-    err = mkdir( "x/y/z/w", 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    NEW_FILENAME1( "x/y/z/w" );
-    diag_printf("<INFO>: cd %s\n",filename1);
-    err = chdir( filename1 );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( filename1 );
-
-    NEW_FILENAME1( "x/y/z" );    
-    diag_printf("<INFO>: cd ..\n");
-    err = chdir( ".." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( filename1 );
-
-    NEW_FILENAME1( "x/y/z" );
-    diag_printf("<INFO>: cd .\n");
-    err = chdir( "." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( filename1 );
-
-    NEW_FILENAME1( "x/y" );    
-    diag_printf("<INFO>: cd ../../y\n");
-    err = chdir( "../../y" );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( filename1 );
-
-    diag_printf("<INFO>: cd ../..\n");
-    err = chdir( "../.." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( dirname );
-
-    diag_printf("<INFO>: rmdir x/y/z/w\n"); 
-    err = rmdir( "x/y/z/w" );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: rmdir x/y/z\n"); 
-    err = rmdir( "x/y/z" );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: rmdir x/y\n"); 
-    err = rmdir( "x/y" );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: rmdir x\n"); 
-    err = rmdir( "x" );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-    
-    // --------------------------------------------------------------
-
-    checkcwd( dirname );
-    
-    diag_printf("<INFO>: unlink tinky\n");    
-    err = unlink( "tinky" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink laalaa\n");    
-    err = unlink( "laalaa" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    // --------------------------------------------------------------
-    
-    diag_printf("<INFO>: cd %s\n", TEST_MOUNTPOINT TEST_DIRECTORY);
-    err = chdir( TEST_MOUNTPOINT TEST_DIRECTORY);
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( TEST_MOUNTPOINT TEST_DIRECTORY );
-    
-    listdir( ".", true, -1, NULL );
-
-#ifdef TEST_MOUNTPOINT2
-    if( mp2 )
-    {
-        diag_printf("<INFO>: umount %s\n",TEST_MOUNTPOINT2);    
-        err = umount( TEST_MOUNTPOINT2 );
-        if( err < 0 ) SHOW_RESULT( umount, err );
-    }
-#endif
-
-    // --------------------------------------------------------------
-
-#if 0
-    maxfile("file.max");
-
-    listdir( "/", true, -1, NULL );    
-        
-    diag_printf("<INFO>: unlink file.max\n");    
-    err = unlink( "file.max" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );    
-#endif
-
-    // --------------------------------------------------------------
-
-    diag_printf("<INFO>: cd /\n");    
-    err = chdir( "/" );
-    if( err == 0 )
-    {
-        checkcwd( "/" );
-    
-        diag_printf("<INFO>: umount %s\n",TEST_MOUNTPOINT);    
-        err = umount( TEST_MOUNTPOINT );
-        if( err < 0 ) SHOW_RESULT( umount, err );
-    }
-
-    diag_printf("<INFO>: syncing\n");    
-    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
-    if (err != 0) SHOW_RESULT(sync, err);
-    
-    CYG_TEST_PASS_FINISH("yaffs1");
-}
-
-// -------------------------------------------------------------------------
-
-#include <cyg/kernel/kapi.h>
-
-static cyg_handle_t thread_handle;
-static cyg_thread thread;
-static char stack[CYGNUM_HAL_STACK_SIZE_TYPICAL+1024];
-
-externC void
-cyg_start( void )
-{
-    cyg_thread_create(3,                // Priority - just a number
-                      fileio1_main,     // entry
-                      0,                // index
-                      0,                // no name
-                      &stack[0],        // Stack
-                      sizeof(stack),    // Size
-                      &thread_handle,   // Handle
-                      &thread           // Thread data structure
-        );
-    cyg_thread_resume(thread_handle);
-
-    cyg_scheduler_start();
-}
-
-#else // CYGPKG_KERNEL
-
-#include <cyg/infra/testcase.h>
-
-externC void cyg_start(void)
-{
-    CYG_TEST_NA("Needs CYGPKG_KERNEL");
-}
-
-#endif
-
-// -------------------------------------------------------------------------
-// EOF yaffs1.c
deleted file mode 100644
--- a/packages/fs/yaffs/current/tests/yaffs2.c
+++ /dev/null
@@ -1,826 +0,0 @@
-//==========================================================================
-//
-//      yaffs2.c
-//
-//      Test fileio system
-//
-//==========================================================================
-// ####ECOSGPLCOPYRIGHTBEGIN####                                            
-// -------------------------------------------                              
-// This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
-// Copyright (C) 2004, 2006, 2007 eCosCentric Limited                       
-//
-// 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.,    
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-//
-// This exception does not invalidate any other reasons why a work based    
-// on this file might be covered by the GNU General Public License.         
-// -------------------------------------------                              
-// ####ECOSGPLCOPYRIGHTEND####                                              
-//==========================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):           nickg
-// Contributors:        nickg
-// Date:                2000-05-25
-// Purpose:             Test fileio system
-// Description:         This test uses the testfs to check out the initialization
-//                      and basic operation of the fileio system
-//                      
-//                      
-//                      
-//                      
-//                      
-//              
-//
-//####DESCRIPTIONEND####
-//
-//==========================================================================
-
-#include <pkgconf/system.h>
-
-#ifdef CYGPKG_KERNEL
-
-#include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
-#include <pkgconf/io_fileio.h>
-#include <pkgconf/io_fileio.h>
-
-#include CYGDAT_DEVS_DISK_CFG           // testing config defines
-
-#include <cyg/kernel/ktypes.h>         // base kernel types
-#include <cyg/infra/cyg_trac.h>        // tracing macros
-#include <cyg/infra/cyg_ass.h>         // assertion macros
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <dirent.h>
-
-#include <cyg/fileio/fileio.h>
-
-#include <cyg/infra/testcase.h>
-#include <cyg/infra/diag.h>            // HAL polled output
-
-#include <cyg/kernel/instrmnt.h>
-
-//==========================================================================
-// Config options
-
-#define TEST_DEVICE     CYGDAT_DEVS_DISK_TEST_DEVICE
-
-#define TEST_MOUNTPOINT CYGDAT_DEVS_DISK_TEST_MOUNTPOINT
-
-#define TEST_DIRECTORY CYGDAT_DEVS_DISK_TEST_DIRECTORY
-
-#define TEST_FSTYPE     "yaffs"
-
-#ifdef CYGDAT_DEVS_DISK_TEST_MOUNTPOINT2
-
-#define TEST_DEVICE2     CYGDAT_DEVS_DISK_TEST_DEVICE2
-
-#define TEST_MOUNTPOINT2 CYGDAT_DEVS_DISK_TEST_MOUNTPOINT2
-
-#define TEST_DIRECTORY2 CYGDAT_DEVS_DISK_TEST_DIRECTORY2
-
-#define TEST_FSTYPE2    "yaffs"
-
-#endif
-
-//==========================================================================
-
-#if 0
-# define X(_args_)                              \
-{                                               \
-    cyg_drv_isr_lock();                         \
-    diag_printf("%08x: ",cyg_thread_self());    \
-    diag_printf _args_;                         \
-    cyg_drv_isr_unlock();                       \
-                                                \
-}
-#else
-# define X(_args_) CYG_EMPTY_STATEMENT
-#endif
-
-#ifdef JNGPKG_USB_STACK
-extern int usb_stack_init(void);
-#endif
-
-//==========================================================================
-
-#define SHOW_RESULT( _fn, _res ) \
-diag_printf("<FAIL>: " #_fn "() returned %ld %s\n", (long)_res, _res<0?strerror(errno):"");
-
-//==========================================================================
-
-#define IOSIZE  100
-
-#define NTHREAD 6
-
-
-//==========================================================================
-
-#ifndef CYGPKG_LIBC_STRING
-
-char *strcat( char *s1, const char *s2 )
-{
-    char *s = s1;
-    while( *s1 ) s1++;
-    while( (*s1++ = *s2++) != 0);
-    return s;
-}
-
-#endif
-
-__externC int
-rename( const char * /* oldpath */, const char * /* newpath */ ) __THROW;
-
-//==========================================================================
-
-
-static cyg_mutex_t db_lock;
-
-#define db_printf( args... )                    \
-{                                               \
-    cyg_mutex_lock( &db_lock );                 \
-    diag_printf("%d: ",id);                     \
-    diag_printf( args );                        \
-    cyg_mutex_unlock( &db_lock );               \
-}
-
-//==========================================================================
-
-static void listdir( char *name, int statp, int numexpected, int *numgot, int id )
-{
-    int err;
-    DIR *dirp;
-    int num=0;
-    
-    db_printf("<INFO>: reading directory %s\n",name);
-
-    dirp = opendir( name );
-    if( dirp == NULL ) SHOW_RESULT( opendir, -1 );
-
-    for(;;)
-    {
-        struct dirent entry_data;
-        struct dirent *entry;
-        
-        err = readdir_r( dirp, &entry_data, &entry );
-        
-        if( err < 0 || entry == NULL )
-            break;
-        num++;
-        
-        cyg_mutex_lock( &db_lock );
-        diag_printf("%d: <INFO>: entry %14s",id, entry->d_name);
-        
-        if( statp )
-        {
-            char fullname[PATH_MAX];
-            struct stat sbuf;
-
-            if( name[0] )
-            {
-                strcpy(fullname, name );
-                if( !(name[0] == '/' && name[1] == 0 ) )
-                    strcat(fullname, "/" );
-            }
-            else fullname[0] = 0;
-            
-            strcat(fullname, entry->d_name );
-            
-            err = stat( fullname, &sbuf );
-            if( err < 0 )
-            {
-                if( errno == ENOSYS )
-                    diag_printf(" <no status available>");
-                else
-                {
-                    SHOW_RESULT( stat, err );
-                    cyg_scheduler_lock();
-                    CYG_INSTRUMENT_USER(0xff,err,errno);
-                    for(;;);
-                }
-            }
-            else
-            {
-                diag_printf(" [mode %08x ino %08x nlink %d size %ld]",
-                            sbuf.st_mode,sbuf.st_ino,sbuf.st_nlink,sbuf.st_size);
-            }
-        }
-
-        diag_printf("\n");
-        cyg_mutex_unlock( &db_lock );
-    }
-
-    err = closedir( dirp );
-    if( err < 0 ) SHOW_RESULT( stat, err );
-    if (numexpected >= 0 && num != numexpected)
-        CYG_TEST_FAIL("Wrong number of dir entries\n");
-    if ( numgot != NULL )
-        *numgot = num;
-}
-
-//==========================================================================
-
-static void createfile( char *name, size_t size, int id  )
-{
-    char buf[IOSIZE];
-    int fd;
-    ssize_t wrote;
-    int i;
-    int err;
-
-    db_printf("<INFO>: create file %s size %ld\n",name, (long)size);
-
-    err = access( name, F_OK );
-    if( err < 0 && errno == EEXIST )
-    {
-        err = unlink( name );
-        if( err < 0 ) SHOW_RESULT( unlink, err );
-    }
-    else
-        if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-    
-    for( i = 0; i < IOSIZE; i++ ) buf[i] = i%256;
- 
-    fd = open( name, O_WRONLY|O_CREAT );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    while( size > 0 )
-    {
-        ssize_t len = size;
-        if ( len > IOSIZE ) len = IOSIZE;
-        
-        wrote = write( fd, buf, len );
-        if( wrote != len ) SHOW_RESULT( write, wrote );        
-
-        size -= wrote;
-
-        cyg_thread_yield();
-    }
-
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-
-//==========================================================================
-
-#if 0
-static void maxfile( char *name, int id  )
-{
-    char buf[IOSIZE];
-    int fd;
-    ssize_t wrote;
-    int i;
-    int err;
-    size_t size = 0;
-    size_t prevsize = 0;
-    
-    db_printf("<INFO>: create maximal file %s\n",name);
-    db_printf("<INFO>: This may take a few minutes\n");
-
-    err = access( name, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-    
-    for( i = 0; i < IOSIZE; i++ ) buf[i] = i%256;
- 
-    fd = open( name, O_WRONLY|O_CREAT );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    do
-    {
-        wrote = write( fd, buf, IOSIZE );
-        //if( wrote < 0 ) SHOW_RESULT( write, wrote );        
-
-        if( wrote >= 0 )
-            size += wrote;
-
-        if( (size-prevsize) > 100000 )
-        {
-            db_printf("<INFO>: size = %ld \n", size);
-            prevsize = size;
-        }
-        
-    } while( wrote == IOSIZE );
-
-    db_printf("<INFO>: file size == %ld\n",size);
-
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-#endif
-
-//==========================================================================
-
-static void checkfile( char *name, int id  )
-{
-    char buf[IOSIZE];
-    int fd;
-    ssize_t done;
-    int i;
-    int err;
-    off_t pos = 0;
-
-    db_printf("<INFO>: check file %s\n",name);
-    
-    err = access( name, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-
-    fd = open( name, O_RDONLY );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    for(;;)
-    {
-        done = read( fd, buf, IOSIZE );
-        if( done < 0 ) SHOW_RESULT( read, done );
-
-        if( done == 0 ) break;
-
-        for( i = 0; i < done; i++ )
-            if( buf[i] != i%256 )
-            {
-//                db_printf("buf[%d+%d](%02x) != %02x\n",pos,i,buf[i],i%256);
-//                CYG_TEST_FAIL("Data read not equal to data written\n");
-                X(("buf[%ld+%d](%02x) != %02x\n",pos,i,buf[i],i%256));
-                cyg_scheduler_lock();
-                CYG_INSTRUMENT_USER(0xf0,err,errno);
-                for(;;);
-            }
-        
-        pos += done;
-
-        cyg_thread_yield();
-    }
-
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-
-//==========================================================================
-
-static void copyfile( char *name2, char *name1, int id  )
-{
-
-    int err;
-    char buf[IOSIZE];
-    int fd1, fd2;
-    ssize_t done, wrote;
-
-    db_printf("<INFO>: copy file %s -> %s\n",name2,name1);
-
-    err = access( name1, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-    err = access( name2, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-    
-    fd1 = open( name1, O_WRONLY|O_CREAT );
-    if( fd1 < 0 ) SHOW_RESULT( open, fd1 );
-
-    fd2 = open( name2, O_RDONLY );
-    if( fd2 < 0 ) SHOW_RESULT( open, fd2 );
-    
-    for(;;)
-    {
-        done = read( fd2, buf, IOSIZE );
-        if( done < 0 ) SHOW_RESULT( read, done );
-
-        if( done == 0 ) break;
-
-        wrote = write( fd1, buf, done );
-        if( wrote != done ) SHOW_RESULT( write, wrote );
-
-        if( wrote != done ) break;
-
-        cyg_thread_yield();
-    }
-
-    err = close( fd1 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-
-    err = close( fd2 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-    
-}
-
-//==========================================================================
-
-static void comparefiles( char *name2, char *name1, int id  )
-{
-    int err;
-    char buf1[IOSIZE];
-    char buf2[IOSIZE];
-    int fd1, fd2;
-    ssize_t done1, done2;
-    int i;
-
-    db_printf("<INFO>: compare files %s == %s\n",name2,name1);
-
-    err = access( name1, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-
-    err = access( name1, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-    
-    fd1 = open( name1, O_RDONLY );
-    if( fd1 < 0 ) SHOW_RESULT( open, fd1 );
-
-    fd2 = open( name2, O_RDONLY );
-    if( fd2 < 0 ) SHOW_RESULT( open, fd2 );
-    
-    for(;;)
-    {
-        done1 = read( fd1, buf1, IOSIZE );
-        if( done1 < 0 ) SHOW_RESULT( read, done1 );
-
-        done2 = read( fd2, buf2, IOSIZE );
-        if( done2 < 0 ) SHOW_RESULT( read, done2 );
-
-        if( done1 != done2 )
-            db_printf("Files different sizes\n");
-        
-        if( done1 == 0 ) break;
-
-        for( i = 0; i < done1; i++ )
-            if( buf1[i] != buf2[i] )
-            {
-//                db_printf("buf1[%d](%02x) != buf1[%d](%02x)\n",i,buf1[i],i,buf2[i]);
-//                CYG_TEST_FAIL("Data in files not equal\n");
-                X(("%s[%d](%02x) != %s[%d](%02x)\n",name1,i,buf1[i],name2,i,buf2[i]));
-                cyg_scheduler_lock();
-                CYG_INSTRUMENT_USER(0xf1,err,errno);
-                for(;;);
-            }
-
-        cyg_thread_yield();
-    }
-
-    err = close( fd1 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-
-    err = close( fd2 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-    
-}
-
-//==========================================================================
-
-void checkcwd( const char *cwd, int id  )
-{
-    static char cwdbuf[PATH_MAX];
-    char *ret;
-
-    ret = getcwd( cwdbuf, sizeof(cwdbuf));
-    if( ret == NULL ) SHOW_RESULT( getcwd, ret );    
-
-    if( strcmp( cwdbuf, cwd ) != 0 )
-    {
-        db_printf( "cwdbuf %s cwd %s\n",cwdbuf, cwd );
-        CYG_TEST_FAIL( "Current directory mismatch");
-    }
-}
-
-//==========================================================================
-// main
-
-static cyg_sem_t sem;
-
-void fileio2_main( CYG_ADDRESS id )
-{
-    int err;
-    int existingdirents=-1;
-
-    char dirname[64];
-    char filename1[64];
-    char filename2[64];
-
-#define NEW_FILENAME( fn, f )                           \
-{                                                       \
-    fn[0]=0;                                            \
-    strcat(fn, dirname);                                \
-    strcat(fn, "/");                                    \
-    strcat(fn,f);                                       \
-}
-
-#define NEW_FILENAME1( f ) NEW_FILENAME( filename1, f )
-#define NEW_FILENAME2( f ) NEW_FILENAME( filename2, f )
-    
-    // --------------------------------------------------------------
-
-    if( id == 0 )
-    {
-        int i;
-
-#ifdef JNGPKG_USB_STACK
-        err = usb_stack_init();
-        cyg_thread_delay( 1000 );
-#endif
-    
-        CYG_TEST_INIT();
-        
-        err = mount( TEST_DEVICE, TEST_MOUNTPOINT, TEST_FSTYPE );
-        if( err < 0 ) {
-            SHOW_RESULT( mount, err );
-            CYG_TEST_FAIL_FINISH("yaffs2");
-        }
-
-        err = access( TEST_MOUNTPOINT TEST_DIRECTORY, F_OK );
-        if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-        if( err < 0 && errno == EACCES )
-        {
-            db_printf("<INFO>: create %s\n",
-                      TEST_MOUNTPOINT TEST_DIRECTORY);
-            err = mkdir( TEST_MOUNTPOINT TEST_DIRECTORY, 0 );
-            if( err < 0 ) SHOW_RESULT( mkdir, err );
-        }
-        
-        err = chdir( TEST_MOUNTPOINT TEST_DIRECTORY );
-        if( err < 0 ) SHOW_RESULT( chdir, err );
-
-        checkcwd( TEST_MOUNTPOINT TEST_DIRECTORY, id );
-    
-        for( i = 0; i < NTHREAD-1; i++ )
-            cyg_semaphore_post( &sem );
-    }
-    else
-    {
-        cyg_semaphore_wait( &sem );
-    }
-
-    // --------------------------------------------------------------
-
-    dirname[0] = 0;
-    strcat(dirname, TEST_MOUNTPOINT );
-    strcat(dirname, TEST_DIRECTORY );
-    strcat(dirname, "/dirX");
-    dirname[sizeof(TEST_MOUNTPOINT) +
-            sizeof(TEST_DIRECTORY) - 2 +
-            4] = '0' + id;
-//    dirname[5] = 0;
-
-    
-    db_printf("<INFO>: create %s\n",dirname);        
-    err = mkdir( dirname, 0 );
-    if( err < 0 && errno != EEXIST ) SHOW_RESULT( mkdir, err );
-
-    listdir( dirname, true, -1, &existingdirents, id );
-
-    db_printf("<INFO>: existingdirents %d\n",existingdirents);
-    
-    // --------------------------------------------------------------
-
-    NEW_FILENAME1( "foo" );
-    createfile( filename1, 20257, id );
-    checkfile( filename1, id );
-
-    NEW_FILENAME1( "foo" );
-    NEW_FILENAME2( "fee" );
-    
-    copyfile( filename1, filename2, id);
-    checkfile( filename2, id );
-    comparefiles( filename1, filename2, id );
-
-    NEW_FILENAME1( "bar" );
-    db_printf("<INFO>: mkdir bar\n");
-    err = mkdir( filename1, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    listdir( dirname , true, existingdirents+3, NULL, id );
-
-    NEW_FILENAME1( "bar/fum" );
-    copyfile( filename2, filename1, id );
-    checkfile( filename1, id );
-    comparefiles( filename2, filename1, id );
-
-    NEW_FILENAME1( "foo" );    
-    NEW_FILENAME2( "bar/bundy" );    
-    db_printf("<INFO>: rename %s -> %s\n",filename1,filename2);    
-    err = rename( filename1, filename2 );
-    if( err < 0 ) SHOW_RESULT( rename, err );
-
-    NEW_FILENAME1( "bar" );
-    
-    listdir( dirname, true, existingdirents+2, NULL, id );
-    listdir( filename1 , true, 4, NULL, id );
-
-    NEW_FILENAME1( "fee" );        
-    checkfile( filename2, id );
-    comparefiles( filename1, filename2, id );
-
-//    db_printf("spinning\n"); for(;;) cyg_thread_delay(10);
-    
-    
-    // --------------------------------------------------------------
-
-    db_printf("<INFO>: unlink %s\n",filename1);    
-    err = unlink( filename1 );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    NEW_FILENAME1( "bar/fum" );    
-    db_printf("<INFO>: unlink %s\n",filename1);        
-    err = unlink( filename1 );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    NEW_FILENAME1( "bar/bundy" );        
-    db_printf("<INFO>: unlink %s\n",filename1);        
-    err = unlink( filename1 );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    NEW_FILENAME1( "bar" );            
-    db_printf("<INFO>: rmdir %s\n",filename1);        
-    err = rmdir( filename1 );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-    
-//    listdir( dirname, false, existingdirents, NULL, id );
-
-        listdir( dirname, true, existingdirents, NULL, id );
-
-    // --------------------------------------------------------------
-
-    
-    listdir( dirname , true, -1, &existingdirents, id);
-
-    NEW_FILENAME1( "tinky" );            
-    NEW_FILENAME2( "laalaa" );            
-    createfile( filename1, 4567, id );
-    copyfile( filename1, filename2, id );
-    checkfile( filename1, id);
-    checkfile( filename2, id);
-    comparefiles( filename1, filename2, id );
-
-    NEW_FILENAME1( "noonoo" );                
-    db_printf("<INFO>: mkdir %s\n",filename1);    
-    err = mkdir( filename1, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    listdir( dirname , true, existingdirents+3, NULL, id);
-
-    NEW_FILENAME1( "noonoo/tinky" );            
-    createfile( filename1, 6789, id );
-    checkfile( filename1, id );
-
-    NEW_FILENAME1( "noonoo/dipsy" );            
-    NEW_FILENAME2( "noonoo/po" );            
-    createfile( filename1, 34567, id );
-    checkfile( filename1, id );
-    copyfile( filename1, filename2, id );
-    checkfile( filename2, id );
-    comparefiles( filename1, filename2, id );
-
-    NEW_FILENAME1( "noonoo" );                    
-    listdir( filename1, true, 5, NULL, id );
-    listdir( dirname, true, existingdirents+3, NULL, id );
-
-    // --------------------------------------------------------------
-
-    NEW_FILENAME1( "noonoo/tinky" );                
-    db_printf("<INFO>: unlink %s\n",filename1);    
-    err = unlink( filename1 );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    NEW_FILENAME1( "noonoo/dipsy" );                
-    db_printf("<INFO>: unlink %s\n",filename1);    
-    err = unlink( filename1 );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    NEW_FILENAME1( "noonoo/po" );
-    db_printf("<INFO>: unlink %s\n",filename1);    
-    err = unlink( filename1 );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    NEW_FILENAME1( "noonoo" );                        
-    db_printf("<INFO>: rmdir %s\n",filename1); 
-    err = rmdir( filename1 );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-
-    listdir( dirname, true, existingdirents+2, NULL, id );
-    
-    // --------------------------------------------------------------
-
-    
-    NEW_FILENAME1( "tinky" );
-    db_printf("<INFO>: unlink %s\n",filename1);    
-    err = unlink( filename1 );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    NEW_FILENAME1( "laalaa" );
-    db_printf("<INFO>: unlink %s\n",filename1);    
-    err = unlink( filename1 );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    listdir( dirname, true, -1, NULL, id );
-
-#if 0
-    NEW_FILENAME1( "file.max" );
-    maxfile( filename1, id );
-
-    listdir( dirname, true, -1, NULL, id );    
-        
-    db_printf("<INFO>: unlink %s\n",filename1);    
-    err = unlink( filename1 );
-    if( err < 0 ) SHOW_RESULT( unlink, err );    
-#endif
-
-    db_printf("<INFO>: rmdir %s\n",dirname);    
-    err = rmdir( dirname );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    db_printf("<INFO>: syncing\n");
-    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
-    if (err != 0) SHOW_RESULT(sync, err);
-    
-    if( id == 0 )
-    {
-        int i;
-        db_printf("<INFO>: waiting for other threads to finish\n");        
-        for( i = 0; i < NTHREAD-1; i++ )
-            cyg_semaphore_wait( &sem );
-
-        CYG_TEST_PASS_FINISH("yaffs2");
-    }
-    else
-    {
-        db_printf("<INFO>: thread finished\n");
-        cyg_semaphore_post( &sem );
-    }
-    
-    cyg_thread_exit();
-}
-
-// -------------------------------------------------------------------------
-
-#include <cyg/kernel/kapi.h>
-
-#define STACK_SIZE (CYGNUM_HAL_STACK_SIZE_TYPICAL*2)
-
-static char stack[NTHREAD][STACK_SIZE];
-static cyg_handle_t thread_handle[NTHREAD];
-static cyg_thread thread[NTHREAD];
-
-externC void
-cyg_start( void )
-{
-    int i;
-
-    CYG_INSTRUMENT_USER(0x01,0,0);
-                    
-    cyg_mutex_init( &db_lock );
-    
-    cyg_semaphore_init( &sem, 0 );
-    
-    for( i = 0; i < NTHREAD; i++ )
-    {
-        cyg_thread_create(3,                    // Priority - just a number
-                          fileio2_main,         // entry
-                          i,                    // index
-                          0,                    // no name
-                          &stack[i][0],         // Stack
-                          STACK_SIZE,           // Size
-                          &thread_handle[i],    // Handle
-                          &thread[i]            // Thread data structure
-            );
-        cyg_thread_resume(thread_handle[i]);
-    }
-
-    cyg_scheduler_start();
-}
-
-#else // CYGPKG_KERNEL
-
-#include <cyg/infra/testcase.h>
-
-externC void cyg_start(void)
-{
-    CYG_TEST_NA("Needs CYGPKG_KERNEL");
-}
-
-#endif
-
-
-// -------------------------------------------------------------------------
-// EOF yaffs2.c
deleted file mode 100644
--- a/packages/fs/yaffs/current/tests/yaffs4.c
+++ /dev/null
@@ -1,950 +0,0 @@
-//==========================================================================
-//
-//      yaffs4.c
-//
-//      Test fileio system
-//
-//==========================================================================
-// ####ECOSGPLCOPYRIGHTBEGIN####                                            
-// -------------------------------------------                              
-// This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-// Copyright (C) 2004, 2005, 2006, 2007 eCosCentric Limited                 
-//
-// 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.,    
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-//
-// This exception does not invalidate any other reasons why a work based    
-// on this file might be covered by the GNU General Public License.         
-// -------------------------------------------                              
-// ####ECOSGPLCOPYRIGHTEND####                                              
-//==========================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):           nickg
-// Contributors:        nickg
-// Date:                2005-07-25
-// Purpose:             Test fileio system
-// Description:         This test uses the testfs to check out the initialization
-//                      and basic operation of the fileio system.
-//                      This is essentially a copy of yaffs1 but using long
-//                      file names.
-//                      
-//                       
-//                      
-//                      
-//              
-//
-//####DESCRIPTIONEND####
-//
-//==========================================================================
-
-#include <pkgconf/system.h>
-
-#ifdef CYGPKG_KERNEL
-
-#include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
-#include <pkgconf/io_fileio.h>
-
-#include CYGDAT_DEVS_DISK_CFG           // testing config defines
-
-#include <cyg/kernel/ktypes.h>         // base kernel types
-#include <cyg/infra/cyg_trac.h>        // tracing macros
-#include <cyg/infra/cyg_ass.h>         // assertion macros
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <dirent.h>
-
-#include <cyg/fileio/fileio.h>
-
-#include <cyg/infra/testcase.h>
-#include <cyg/infra/diag.h>            // HAL polled output
-
-//==========================================================================
-// Config options
-
-#define TEST_DEVICE     CYGDAT_DEVS_DISK_TEST_DEVICE
-
-#define TEST_MOUNTPOINT CYGDAT_DEVS_DISK_TEST_MOUNTPOINT
-
-#define TEST_DIRECTORY CYGDAT_DEVS_DISK_TEST_DIRECTORY
-
-#define TEST_FSTYPE     "yaffs"
-
-#ifdef CYGDAT_DEVS_DISK_TEST_MOUNTPOINT2
-
-#define TEST_DEVICE2     CYGDAT_DEVS_DISK_TEST_DEVICE2
-
-#define TEST_MOUNTPOINT2 CYGDAT_DEVS_DISK_TEST_MOUNTPOINT2
-
-#define TEST_DIRECTORY2 CYGDAT_DEVS_DISK_TEST_DIRECTORY2
-
-#define TEST_FSTYPE2    "yaffs"
-
-#endif
-
-//==========================================================================
-
-#define SHOW_RESULT( _fn, _res )                                                                \
-{                                                                                               \
-    diag_printf("<FAIL>: " #_fn "() returned %ld %s\n", (long)_res, _res<0?strerror(errno):""); \
-}
-
-//==========================================================================
-
-#define IOSIZE  100
-
-#define CLEANUP
-
-#define LONGNAME1       "long_file_name_that_should_take_up_more_than_one_directory_entry_1"
-#define LONGNAME2       "long_file_name_that_should_take_up_more_than_one_directory_entry_2"
-
-//                       123456789012345678901234567890
-#define FOO             "foo_longer_file_x.filename"
-//#define FEE             "fee_.filename"
-//#define BAR             "bar_long_directory_name.dirname"
-#define FEE             "a234567890123"
-#define BAR             "a2345678901234"
-#define BUNDY           "bundy_long_file_name_ccccccccccccccccccccccccccccccc.filename"
-#define FUM             "bundy_long_file_name_fum.filename"
-#define DOO             "doo_aaaaaaaaaabbbbbbbbbbbccccccccccccc"
-#define FIE             "fie.rrrrrrrrrrrrllllllllllllvvvvvvvvvvvvv"
-#define FOE             "foe_xxxxxxxxxxllllll.xxxxxxeeeeeeeeee"
-
-#define TINKY           "tinky_long_file_name.filename"
-#define LAALAA          "laalaa_long_file_name.filename"
-#define NOONOO          "noonoo_long_directory_name.dirname"
-#define DIPSY           "dipsy_long_file_name.filename"
-#define PO              "po_long_file_name.filename"
-
-#define XXXX            "xxxx_long_directory_name.dirname"
-#define YYYY            "yyyy_long_directory_name.dirname"
-#define ZZZZ            "zzzz_long_directory_name.dirname"
-#define WWWW            "wwww_long_directory_name.dirname"
-
-
-//==========================================================================
-
-#ifndef CYGPKG_LIBC_STRING
-
-char *strcat( char *s1, const char *s2 )
-{
-    char *s = s1;
-    while( *s1 ) s1++;
-    while( (*s1++ = *s2++) != 0);
-    return s;
-}
-
-#endif
-
-__externC int
-rename( const char * /* oldpath */, const char * /* newpath */ ) __THROW;
-
-//==========================================================================
-
-static void listdir( char *name, int statp, int numexpected, int *numgot )
-{
-    int err;
-    DIR *dirp;
-    int num=0;
-    
-    diag_printf("<INFO>: reading directory %s\n",name);
-    
-//    diag_printf("<INFO>: opendir(%s)\n",name);
-    dirp = opendir( name );
-    if( dirp == NULL ) SHOW_RESULT( opendir, -1 );
-
-    for(;;)
-    {
-        struct dirent *entry = readdir( dirp );
-        
-        if( entry == NULL )
-            break;
-        num++;
-        diag_printf("<INFO>: entry");
-        if( statp )
-        {
-            char fullname[PATH_MAX];
-            struct stat sbuf;
-
-            if( name[0] )
-            {
-                strcpy(fullname, name );
-                if( !(name[0] == '/' && name[1] == 0 ) )
-                    strcat(fullname, "/" );
-            }
-            else fullname[0] = 0;
-            
-            strcat(fullname, entry->d_name );
-            
-            err = stat( fullname, &sbuf );
-            if( err < 0 )
-            {
-                if( errno == ENOSYS )
-                    diag_printf(" <no status available>");
-                else SHOW_RESULT( stat, err );
-            }
-            else
-            {
-                diag_printf(" [mode %08x ino %08x nlink %d size %6ld]",
-                            sbuf.st_mode,sbuf.st_ino,sbuf.st_nlink,sbuf.st_size);
-            }
-        }
-
-        diag_printf(" %s\n",entry->d_name);        
-    }
-
-//    diag_printf("<INFO>: closedir(%s)\n",name);    
-    err = closedir( dirp );
-    if( err < 0 ) SHOW_RESULT( stat, err );
-    if (numexpected >= 0 && num != numexpected)
-        CYG_TEST_FAIL("Wrong number of dir entries");
-    if ( numgot != NULL )
-        *numgot = num;
-}
-
-//==========================================================================
-
-static void createfile( char *name, size_t size )
-{
-    char buf[IOSIZE];
-    int fd;
-    ssize_t wrote;
-    int i;
-    int err;
-
-    diag_printf("<INFO>: create file %s size %ld\n",name, (long)size);
-
-    err = access( name, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-    
-    for( i = 0; i < IOSIZE; i++ ) buf[i] = i%256;
- 
-    fd = open( name, O_WRONLY|O_CREAT );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    while( size > 0 )
-    {
-        ssize_t len = size;
-        if ( len > IOSIZE ) len = IOSIZE;
-        
-        wrote = write( fd, buf, len );
-        if( wrote != len ) SHOW_RESULT( write, wrote );        
-
-        size -= wrote;
-    }
-
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-
-//==========================================================================
-
-#if 0
-static void maxfile( char *name )
-{
-    char buf[IOSIZE];
-    int fd;
-    ssize_t wrote;
-    int i;
-    int err;
-    size_t size = 0;
-    size_t prevsize = 0;
-    
-    diag_printf("<INFO>: create maximal file %s\n",name);
-    diag_printf("<INFO>: This may take a few minutes\n");
-
-    err = access( name, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-    
-    for( i = 0; i < IOSIZE; i++ ) buf[i] = i%256;
- 
-    fd = open( name, O_WRONLY|O_CREAT );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    do
-    {
-        wrote = write( fd, buf, IOSIZE );
-        //if( wrote < 0 ) SHOW_RESULT( write, wrote );        
-
-        if( wrote >= 0 )
-            size += wrote;
-
-        if( (size-prevsize) > 100000 )
-        {
-            diag_printf("<INFO>: size = %ld \n", size);
-            prevsize = size;
-        }
-        
-    } while( wrote == IOSIZE );
-
-    diag_printf("<INFO>: file size == %ld\n",size);
-
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-#endif
-
-//==========================================================================
-
-static void checkfile( char *name )
-{
-    char buf[IOSIZE];
-    int fd;
-    ssize_t done;
-    int i;
-    int err;
-    off_t pos = 0;
-
-    diag_printf("<INFO>: check file %s\n",name);
-    
-    err = access( name, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-
-    fd = open( name, O_RDONLY );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    for(;;)
-    {
-        done = read( fd, buf, IOSIZE );
-        if( done < 0 ) SHOW_RESULT( read, done );
-
-        if( done == 0 ) break;
-
-        for( i = 0; i < done; i++ )
-            if( buf[i] != i%256 )
-            {
-                diag_printf("buf[%ld+%d](%02x) != %02x\n",pos,i,buf[i],i%256);
-                CYG_TEST_FAIL("Data read not equal to data written\n");
-                for(;;);
-            }
-        
-        pos += done;
-    }
-
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-
-//==========================================================================
-
-static void copyfile( char *name2, char *name1 )
-{
-
-    int err;
-    char buf[IOSIZE];
-    int fd1, fd2;
-    ssize_t done, wrote;
-
-    diag_printf("<INFO>: copy file %s -> %s\n",name2,name1);
-
-    err = access( name1, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-    err = access( name2, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-    
-    fd1 = open( name1, O_WRONLY|O_CREAT );
-    if( fd1 < 0 ) SHOW_RESULT( open, fd1 );
-
-    fd2 = open( name2, O_RDONLY );
-    if( fd2 < 0 ) SHOW_RESULT( open, fd2 );
-    
-    for(;;)
-    {
-        done = read( fd2, buf, IOSIZE );
-        if( done < 0 ) SHOW_RESULT( read, done );
-
-        if( done == 0 ) break;
-
-        wrote = write( fd1, buf, done );
-        if( wrote != done ) SHOW_RESULT( write, wrote );
-
-        if( wrote != done ) break;
-    }
-
-    err = close( fd1 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-
-    err = close( fd2 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-    
-}
-
-//==========================================================================
-
-static void comparefiles( char *name2, char *name1 )
-{
-    int err;
-    char buf1[IOSIZE];
-    char buf2[IOSIZE];
-    int fd1, fd2;
-    ssize_t done1, done2;
-    int i;
-
-    diag_printf("<INFO>: compare files %s == %s\n",name2,name1);
-
-    err = access( name1, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-
-    err = access( name1, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-    
-    fd1 = open( name1, O_RDONLY );
-    if( fd1 < 0 ) SHOW_RESULT( open, fd1 );
-
-    fd2 = open( name2, O_RDONLY );
-    if( fd2 < 0 ) SHOW_RESULT( open, fd2 );
-    
-    for(;;)
-    {
-        done1 = read( fd1, buf1, IOSIZE );
-        if( done1 < 0 ) SHOW_RESULT( read, done1 );
-
-        done2 = read( fd2, buf2, IOSIZE );
-        if( done2 < 0 ) SHOW_RESULT( read, done2 );
-
-        if( done1 != done2 )
-            diag_printf("Files different sizes\n");
-        
-        if( done1 == 0 ) break;
-
-        for( i = 0; i < done1; i++ )
-            if( buf1[i] != buf2[i] )
-            {
-                diag_printf("buf1[%d](%02x) != buf1[%d](%02x)\n",i,buf1[i],i,buf2[i]);
-                CYG_TEST_FAIL("Data in files not equal\n");
-            }
-    }
-
-    err = close( fd1 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-
-    err = close( fd2 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-    
-}
-
-//==========================================================================
-
-void checkcwd( const char *cwd )
-{
-    static char cwdbuf[PATH_MAX];
-    char *ret;
-
-    ret = getcwd( cwdbuf, sizeof(cwdbuf));
-    if( ret == NULL ) SHOW_RESULT( getcwd, ret );    
-
-    if( strcmp( cwdbuf, cwd ) != 0 )
-    {
-        diag_printf( "cwdbuf %s cwd %s\n",cwdbuf, cwd );
-        CYG_TEST_FAIL( "Current directory mismatch");
-    }
-}
-
-//==========================================================================
-// main
-
-void fileio4_main( CYG_ADDRESS id )
-{
-    int err;
-    int existingdirents=-1;
-    cyg_bool mp2 = false;
-    int fd;
-    
-    char dirname[256];
-    char filename1[256];
-    char filename2[256];
-
-#define NEW_FILENAME( fn, f )                           \
-{                                                       \
-    fn[0]=0;                                            \
-    strcat(fn, dirname);                                \
-    strcat(fn, "/");                                    \
-    strcat(fn,f);                                       \
-}
-
-#define NEW_FILENAME1( f ) NEW_FILENAME( filename1, f )
-#define NEW_FILENAME2( f ) NEW_FILENAME( filename2, f )
-
-    CYG_TEST_INIT();
-    
-    // --------------------------------------------------------------
-
-    err = mount( TEST_DEVICE, TEST_MOUNTPOINT, TEST_FSTYPE );    
-    if( err < 0 ) {
-        SHOW_RESULT( mount, err );
-        CYG_TEST_FAIL_FINISH("yaffs4");
-    }
-
-    err = access( TEST_MOUNTPOINT TEST_DIRECTORY, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-    if( err < 0 && errno == EACCES )
-    {
-        diag_printf("<INFO>: create %s\n",
-                    TEST_MOUNTPOINT TEST_DIRECTORY);
-        err = mkdir( TEST_MOUNTPOINT TEST_DIRECTORY, 0 );
-        if( err < 0 ) SHOW_RESULT( mkdir, err );
-    }
-
-    err = chdir( TEST_MOUNTPOINT TEST_DIRECTORY );    
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    checkcwd( TEST_MOUNTPOINT TEST_DIRECTORY );
-    
-    listdir( TEST_MOUNTPOINT TEST_DIRECTORY, true, -1, &existingdirents );
-
-    // --------------------------------------------------------------
-    
-    dirname[0] = 0;
-    strcat(dirname, TEST_MOUNTPOINT );
-    strcat(dirname, TEST_DIRECTORY );
-    
-    // --------------------------------------------------------------
-
-    createfile( FOO, 20257 );    
-    checkfile( FOO );
-    copyfile( FOO, FEE);
-    checkfile( FEE );
-    comparefiles( FOO, FEE );
-    diag_printf("<INFO>: mkdir " BAR "\n");
-    err = mkdir( BAR, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    listdir( dirname , true, existingdirents+3, NULL );
-    
-    copyfile( FEE, BAR "/" FUM );
-    checkfile( BAR "/" FUM );
-    comparefiles( FEE, BAR "/" FUM );
-
-    diag_printf("<INFO>: cd " BAR "\n");
-    err = chdir( BAR );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    NEW_FILENAME1( BAR );
-    checkcwd( filename1 );
-    
-    diag_printf("<INFO>: rename ../" FOO " " BUNDY "\n");    
-    err = rename( "../" FOO, BUNDY );
-    if( err < 0 ) SHOW_RESULT( rename, err );
-    
-    listdir( dirname, true, existingdirents+2, NULL );
-    listdir( "." , true, 4, NULL );
-
-    checkfile( "../" BAR "/" BUNDY );
-    comparefiles("../" FEE, BUNDY );
-
-    // --------------------------------------------------------------
-    // Check for some common error cases
-
-    // First make some directories
-    diag_printf("<INFO>: mkdir " DOO "\n");    
-    err = mkdir( DOO, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );    
-
-    diag_printf("<INFO>: mkdir " FIE" \n");    
-    err = mkdir( FIE, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );    
-
-    diag_printf("<INFO>: mkdir " FIE "/" FOE "\n");    
-    err = mkdir( FIE "/" FOE, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );    
-
-    
-    diag_printf("<INFO>: rename " FUM " " DOO " -- should fail\n");    
-    err = rename( FUM, DOO );
-    if( err < 0 && errno != EISDIR ) SHOW_RESULT( rename, err );
-
-    diag_printf("<INFO>: rename " DOO " " FUM " -- should fail\n");    
-    err = rename( DOO, FUM );
-    if( err < 0 && errno != ENOTDIR ) SHOW_RESULT( rename, err );
-
-    diag_printf("<INFO>: rename " DOO " " FIE " -- should fail\n");    
-    err = rename( DOO, FIE );
-    if( err < 0 && errno != EIO ) SHOW_RESULT( rename, err );
-    
-    NEW_FILENAME1( XXXX "/" YYYY )
-    diag_printf("<INFO>: rename " FUM " %s -- should fail\n",filename1);    
-    err = rename( FUM, filename1 );
-    if( err < 0 && errno != ENOENT ) SHOW_RESULT( rename, err );
-    
-    diag_printf("<INFO>: rename " FUM " " FUM " -- should fail\n");    
-    err = rename( FUM, FUM );
-    if( err < 0 && errno != ENOENT ) SHOW_RESULT( rename, err );
-
-    diag_printf("<INFO>: unlink " FEE " -- should fail\n");        
-    err = unlink( FEE );
-    if( err < 0 && errno != ENOENT ) SHOW_RESULT( unlink, err );
-
-    NEW_FILENAME1( BAR );
-    diag_printf("<INFO>: rmdir %s -- should fail\n",filename1);        
-    err = rmdir( filename1 );
-    if( err < 0 && errno != ENOTEMPTY ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: unlink %s -- should fail\n",filename1);        
-    err = unlink( filename1 );
-    if( err < 0 && errno != EISDIR ) SHOW_RESULT( unlink, err );
-
-    NEW_FILENAME1( BAR "/" FUM );
-    diag_printf("<INFO>: rmdir %s -- should fail\n",filename1);        
-    err = rmdir( filename1 );
-    if( err < 0 && errno != ENOTDIR ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: mkdir %s -- should fail\n",filename1);        
-    err = mkdir( filename1, 0 );
-    if( err < 0 && errno != EEXIST ) SHOW_RESULT( mkdir, err );
-    
-    diag_printf("<INFO>: open " BUNDY "  exclusive -- should fail\n");        
-    fd = open( BUNDY, O_WRONLY|O_CREAT|O_EXCL );
-    if( fd < 0 && errno != EEXIST ) SHOW_RESULT( open, fd );
-
-    diag_printf("<INFO>: open %s -- should fail\n",dirname);        
-    fd = open( dirname, O_WRONLY );
-    if( fd < 0 && errno != EISDIR ) SHOW_RESULT( open, fd );
-    
-    
-    listdir( dirname, true, existingdirents+2, NULL );
-    listdir( "." , true, 6, NULL );
-    
-    // --------------------------------------------------------------    
-
-#ifdef CLEANUP
-
-    diag_printf("<INFO>: rename " FIE " " DOO "\n");
-    err = rename( FIE, DOO );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: rmdir " DOO "/" FOE "\n");
-    err = rmdir(DOO "/" FOE);
-    if( err < 0 ) SHOW_RESULT( unlink, err );    
-
-    diag_printf("<INFO>: rmdir " DOO "\n");
-    err = rmdir(DOO);
-    if( err < 0 ) SHOW_RESULT( unlink, err );    
-        
-    diag_printf("<INFO>: unlink ../" FEE "\n");    
-    err = unlink( "../" FEE );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink " FUM "\n");        
-    err = unlink( FUM );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink ../" BAR "/" BUNDY "\n");        
-    err = unlink( "../" BAR "/" BUNDY );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-#endif
-    
-    diag_printf("<INFO>: cd ..\n");        
-    err = chdir( ".." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    checkcwd( dirname );
-
-#ifdef CLEANUP    
-    diag_printf("<INFO>: rmdir " BAR "\n");        
-    err = rmdir( BAR );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-    
-    listdir( dirname, false, existingdirents, NULL );
-#endif
-    
-    // --------------------------------------------------------------
-
-#ifdef TEST_MOUNTPOINT2
-    diag_printf("<INFO>: mount %s\n", TEST_MOUNTPOINT2);    
-    err = mount( TEST_DEVICE2, TEST_MOUNTPOINT2, TEST_FSTYPE2 );
-
-    if( err == 0 )
-    {
-        mp2 = true;
-        diag_printf("<INFO>: mount %s succeeded\n", TEST_MOUNTPOINT2);    
-        err = access( TEST_MOUNTPOINT2 TEST_DIRECTORY2, F_OK );
-        if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-        if( err < 0 && errno == EACCES )
-        {
-            diag_printf("<INFO>: create %s\n",
-                        TEST_MOUNTPOINT2 TEST_DIRECTORY2);
-            err = mkdir( TEST_MOUNTPOINT2 TEST_DIRECTORY2, 0 );
-            if( err < 0 ) SHOW_RESULT( mkdir, err );
-        }
-
-        err = chdir( TEST_MOUNTPOINT2 TEST_DIRECTORY2 );    
-        if( err < 0 ) SHOW_RESULT( chdir, err );
-
-        checkcwd( TEST_MOUNTPOINT2 TEST_DIRECTORY2 );
-
-        dirname[0] = 0;
-        strcat(dirname, TEST_MOUNTPOINT2 );
-        strcat(dirname, TEST_DIRECTORY2 );
-
-    }
-    else
-    {
-        mp2 = false;
-        diag_printf("<INFO>: mount %s failed, ", TEST_MOUNTPOINT2);
-        diag_printf("using %s instead\n", dirname );
-    }
-
-#endif
-    
-    listdir( dirname , true, -1, &existingdirents);
-
-    NEW_FILENAME1( TINKY );
-    NEW_FILENAME2( LAALAA );
-    
-    createfile( filename1, 4567 );
-    copyfile( filename1, filename2 );
-    checkfile( filename1);
-    checkfile( filename2);
-    comparefiles( filename1, filename2 );
-
-    diag_printf("<INFO>: cd %s\n",dirname);    
-    err = chdir( dirname );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    checkcwd( dirname );
-        
-    diag_printf("<INFO>: mkdir " NOONOO "\n");    
-    err = mkdir( NOONOO, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    listdir( dirname , true, existingdirents+3, NULL);
-
-    diag_printf("<INFO>: cd " NOONOO "\n");
-    err = chdir( NOONOO );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    NEW_FILENAME1( NOONOO );
-    checkcwd( filename1 );
-    
-    createfile( TINKY, 6789 );
-    checkfile( TINKY );
-
-    createfile( DIPSY, 34567 );
-    checkfile( DIPSY );
-    copyfile( DIPSY, PO );
-    checkfile( PO );
-    comparefiles( DIPSY, PO );
-
-    listdir( ".", true, 5, NULL );
-    listdir( "..", true, existingdirents+3, NULL );
-
-    // --------------------------------------------------------------
-
-#ifdef CLEANUP    
-    diag_printf("<INFO>: unlink " TINKY "\n");    
-    err = unlink( TINKY );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink " DIPSY "\n");    
-    err = unlink( DIPSY );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink " PO "\n");    
-    err = unlink( PO );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-#endif
-    
-    diag_printf("<INFO>: cd ..\n"); 
-    err = chdir( ".." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( dirname );
-
-#ifdef CLEANUP    
-    diag_printf("<INFO>: rmdir " NOONOO "\n"); 
-    err = rmdir( NOONOO );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-#endif
-    
-    // --------------------------------------------------------------
-
-    diag_printf("<INFO>: mkdir " XXXX "\n");    
-    err = mkdir( XXXX, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    diag_printf("<INFO>: mkdir " XXXX "/" YYYY "\n");        
-    err = mkdir( XXXX "/" YYYY, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    diag_printf("<INFO>: mkdir " XXXX "/" YYYY "/" ZZZZ "\n");        
-    err = mkdir( XXXX "/" YYYY "/" ZZZZ, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    diag_printf("<INFO>: mkdir " XXXX "/" YYYY "/" ZZZZ "/" WWWW "\n");    
-    err = mkdir( XXXX "/" YYYY "/" ZZZZ "/" WWWW, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    NEW_FILENAME1( XXXX "/" YYYY "/" ZZZZ "/" WWWW );
-    diag_printf("<INFO>: cd %s\n",filename1);
-    err = chdir( filename1 );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( filename1 );
-
-    NEW_FILENAME1( XXXX "/" YYYY "/" ZZZZ );    
-    diag_printf("<INFO>: cd ..\n");
-    err = chdir( ".." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( filename1 );
-
-    NEW_FILENAME1( XXXX "/" YYYY "/" ZZZZ );
-    diag_printf("<INFO>: cd .\n");
-    err = chdir( "." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( filename1 );
-
-    NEW_FILENAME1( XXXX "/" YYYY );    
-    diag_printf("<INFO>: cd ../../" YYYY "\n");
-    err = chdir( "../../" YYYY );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( filename1 );
-
-    diag_printf("<INFO>: cd ../..\n");
-    err = chdir( "../.." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( dirname );
-
-    diag_printf("<INFO>: rmdir " XXXX "/" YYYY "/" ZZZZ "/" WWWW "\n"); 
-    err = rmdir( XXXX "/" YYYY "/" ZZZZ "/" WWWW );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: rmdir "XXXX "/" YYYY "/" ZZZZ "\n"); 
-    err = rmdir( XXXX "/" YYYY "/" ZZZZ );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: rmdir " XXXX "/" YYYY "\n"); 
-    err = rmdir( XXXX "/" YYYY );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: rmdir "XXXX "\n"); 
-    err = rmdir( XXXX );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-    
-    // --------------------------------------------------------------
-
-    checkcwd( dirname );
-
-#ifdef CLEANUP    
-    diag_printf("<INFO>: unlink "TINKY "\n");    
-    err = unlink( TINKY );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink " LAALAA" \n");    
-    err = unlink( LAALAA );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-#endif
-    
-    // --------------------------------------------------------------
-    
-    diag_printf("<INFO>: cd %s\n", TEST_MOUNTPOINT TEST_DIRECTORY);
-    err = chdir( TEST_MOUNTPOINT TEST_DIRECTORY);
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( TEST_MOUNTPOINT TEST_DIRECTORY );
-    
-    listdir( ".", true, -1, NULL );
-
-#ifdef TEST_MOUNTPOINT2
-    if( mp2 )
-    {
-        diag_printf("<INFO>: umount %s\n",TEST_MOUNTPOINT2);    
-        err = umount( TEST_MOUNTPOINT2 );
-        if( err < 0 ) SHOW_RESULT( umount, err );
-    }
-#endif
-
-    // --------------------------------------------------------------
-
-#if 0
-    maxfile("file.max");
-
-    listdir( "/", true, -1, NULL );    
-        
-    diag_printf("<INFO>: unlink file.max\n");    
-    err = unlink( "file.max" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );    
-#endif
-
-    // --------------------------------------------------------------
-
-    diag_printf("<INFO>: cd /\n");    
-    err = chdir( "/" );
-    if( err == 0 )
-    {
-        checkcwd( "/" );
-    
-        diag_printf("<INFO>: umount %s\n",TEST_MOUNTPOINT);    
-        err = umount( TEST_MOUNTPOINT );
-        if( err < 0 ) SHOW_RESULT( umount, err );
-    }
-
-    diag_printf("<INFO>: syncing\n");    
-    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
-    if (err != 0) SHOW_RESULT(sync, err);
-    
-    CYG_TEST_PASS_FINISH("yaffs4");
-}
-
-// -------------------------------------------------------------------------
-
-#include <cyg/kernel/kapi.h>
-
-static cyg_handle_t thread_handle;
-static cyg_thread thread;
-static char stack[CYGNUM_HAL_STACK_SIZE_TYPICAL+1024*4];
-
-externC void
-cyg_start( void )
-{
-    cyg_thread_create(3,                // Priority - just a number
-                      fileio4_main,     // entry
-                      0,                // index
-                      0,                // no name
-                      &stack[0],        // Stack
-                      sizeof(stack),    // Size
-                      &thread_handle,   // Handle
-                      &thread           // Thread data structure
-        );
-    cyg_thread_resume(thread_handle);
-
-    cyg_scheduler_start();
-}
-
-#else // CYGPKG_KERNEL
-
-#include <cyg/infra/testcase.h>
-
-externC void cyg_start(void)
-{
-    CYG_TEST_NA("Needs CYGPKG_KERNEL");
-}
-
-#endif
-
-// -------------------------------------------------------------------------
-// EOF yaffs4.c
deleted file mode 100644
--- a/packages/fs/yaffs/current/tests/yaffs5.c
+++ /dev/null
@@ -1,837 +0,0 @@
-//==========================================================================
-//
-//      yaffs5.c
-//
-//      Test FAT filesystem
-//
-//==========================================================================
-// ####ECOSGPLCOPYRIGHTBEGIN####                                            
-// -------------------------------------------                              
-// This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
-// Copyright (C) 2004, 2006, 2007 eCosCentric Limited                       
-//
-// 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.,    
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-//
-// This exception does not invalidate any other reasons why a work based    
-// on this file might be covered by the GNU General Public License.         
-// -------------------------------------------                              
-// ####ECOSGPLCOPYRIGHTEND####                                              
-//==========================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):           nickg
-// Contributors:        nickg
-// Date:                2007-03-28
-// Purpose:             Test FAT system
-// Description:         This test gets some performance figures from the
-//                      FAT filesystem.
-//                      
-//####DESCRIPTIONEND####
-//
-//==========================================================================
-
-#include <pkgconf/system.h>
-
-#ifdef CYGPKG_KERNEL
-
-#include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
-#include <pkgconf/io_fileio.h>
-
-#include CYGDAT_DEVS_DISK_CFG           // testing config defines
-
-#include <cyg/kernel/ktypes.h>         // base kernel types
-#include <cyg/infra/cyg_trac.h>        // tracing macros
-#include <cyg/infra/cyg_ass.h>         // assertion macros
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <dirent.h>
-#include <stdlib.h>
-
-#include <cyg/fileio/fileio.h>
-
-#include <cyg/infra/testcase.h>
-#include <cyg/infra/diag.h>            // HAL polled output
-
-//==========================================================================
-// Config options
-
-#define TEST_DEVICE     CYGDAT_DEVS_DISK_TEST_DEVICE
-
-#define TEST_MOUNTPOINT CYGDAT_DEVS_DISK_TEST_MOUNTPOINT
-
-#define TEST_DIRECTORY CYGDAT_DEVS_DISK_TEST_DIRECTORY
-
-#define TEST_FSTYPE     "yaffs"
-
-#ifdef CYGDAT_DEVS_DISK_TEST_MOUNTPOINT2
-
-#define TEST_DEVICE2     CYGDAT_DEVS_DISK_TEST_DEVICE2
-
-#define TEST_MOUNTPOINT2 CYGDAT_DEVS_DISK_TEST_MOUNTPOINT2
-
-#define TEST_DIRECTORY2 CYGDAT_DEVS_DISK_TEST_DIRECTORY2
-
-#define TEST_FSTYPE2    "yaffs"
-
-#endif
-
-//==========================================================================
-
-#define SHOW_RESULT( _fn, _res )                                                                \
-{                                                                                               \
-    diag_printf("<FAIL>: " #_fn "() returned %ld %s\n", (long)_res, _res<0?strerror(errno):"");        \
-}
-
-//==========================================================================
-
-typedef struct
-{
-    cyg_int64           ticks;
-    cyg_int32           halticks;
-} timestamp;
-
-typedef struct
-{
-    timestamp           start;
-    timestamp           end;
-    cyg_int64           interval;       // In HAL ticks
-    cyg_int64           us_interval;    // Interval in microseconds
-} timing;
-
-static cyg_int64        ticks_overhead = 0;
-static cyg_int32        us_per_haltick = 0;
-static cyg_int32        halticks_per_us = 0;
-
-static cyg_int64        rtc_resolution[] = CYGNUM_KERNEL_COUNTERS_RTC_RESOLUTION;
-static cyg_int64        rtc_period = CYGNUM_KERNEL_COUNTERS_RTC_PERIOD;
-static cyg_int32        ticks_per_second;
-
-//==========================================================================
-
-static char date_string[] = __DATE__;
-static char time_string[] = __TIME__;
-
-cyg_uint32 timehash;
-
-//==========================================================================
-
-static void wait_for_tick( void )
-{
-    cyg_tick_count_t now = cyg_current_time();
-
-    while( cyg_current_time() == now )
-        continue;
-}
-
-static void get_timestamp( timestamp *ts )
-{
-    ts->ticks = cyg_current_time();
-    HAL_CLOCK_READ( (cyg_uint32 *)&ts->halticks );
-}
-
-static cyg_int64 ticks_to_us( cyg_int64 ticks )
-{
-    cyg_int64 us;
-    
-    if( us_per_haltick != 0 )
-        us = ticks * us_per_haltick;
-    else
-        us = ticks / halticks_per_us;
-
-    return us;
-}
-
-static void calculate_interval( timing *t )
-{
-    t->interval = t->end.halticks - t->start.halticks;
-
-    t->interval += (t->end.ticks - t->start.ticks) * rtc_period;
-
-    t->interval -= ticks_overhead;
-    
-    t->us_interval = ticks_to_us( t->interval );
-}
-
-static void init_timing( void )
-{
-    timing t;
-
-    ticks_per_second = (1000000000ULL*rtc_resolution[1])/rtc_resolution[0];
-    us_per_haltick = 1000000/(rtc_period * rtc_resolution[1]);
-    halticks_per_us = (rtc_period * rtc_resolution[1])/1000000; 
-    
-    wait_for_tick();
-
-    get_timestamp( &t.start );
-    get_timestamp( &t.end );
-
-    calculate_interval( &t );
-
-    ticks_overhead = t.interval;
-
-    diag_printf("Timing overhead %lld ticks\n", ticks_overhead );
-    
-}
-
-//==========================================================================
-
-#ifndef CYGPKG_LIBC_STRING
-
-char *strcat( char *s1, const char *s2 )
-{
-    char *s = s1;
-    while( *s1 ) s1++;
-    while( (*s1++ = *s2++) != 0);
-    return s;
-}
-
-#endif
-
-__externC int
-rename( const char * /* oldpath */, const char * /* newpath */ ) __THROW;
-
-//==========================================================================
-
-static void listdir( char *name, int statp, int numexpected, int *numgot )
-{
-    int err;
-    DIR *dirp;
-    int num=0;
-    
-    diag_printf("<INFO>: reading directory %s\n",name);
-    
-//    diag_printf("<INFO>: opendir(%s)\n",name);
-    dirp = opendir( name );
-    if( dirp == NULL ) SHOW_RESULT( opendir, -1 );
-
-    for(;;)
-    {
-        struct dirent *entry = readdir( dirp );
-        
-        if( entry == NULL )
-            break;
-        num++;
-        diag_printf("<INFO>: entry %14s",entry->d_name);
-        if( statp )
-        {
-            char fullname[PATH_MAX];
-            struct stat sbuf;
-
-            if( name[0] )
-            {
-                strcpy(fullname, name );
-                if( !(name[0] == '/' && name[1] == 0 ) )
-                    strcat(fullname, "/" );
-            }
-            else fullname[0] = 0;
-            
-            strcat(fullname, entry->d_name );
-
-            err = stat( fullname, &sbuf );
-            if( err < 0 )
-            {
-                if( errno == ENOSYS )
-                    diag_printf(" <no status available>");
-                else SHOW_RESULT( stat, err );
-            }
-            else
-            {
-                diag_printf(" [mode %08x ino %08x nlink %d size %ld]",
-                            sbuf.st_mode,sbuf.st_ino,sbuf.st_nlink,sbuf.st_size);
-            }
-        }
-
-        diag_printf("\n");
-    }
-
-//    diag_printf("<INFO>: closedir(%s)\n",name);    
-    err = closedir( dirp );
-    if( err < 0 ) SHOW_RESULT( stat, err );
-    if (numexpected >= 0 && num != numexpected)
-        CYG_TEST_FAIL("Wrong number of dir entries\n");
-    if ( numgot != NULL )
-        *numgot = num;
-}
-
-//==========================================================================
-
-static void createfile( char *name, size_t asize, size_t block_size )
-{
-    size_t size = asize;
-    cyg_uint8 *buf;
-    cyg_uint32 *b;
-    int fd;
-    ssize_t wrote;
-    int i;
-    int err;
-    timing opent, writet;
-        
-    diag_printf("\n--------------------------------------------------------------------\n");
-    diag_printf("<INFO>: create file %s size %ld block_size %ld\n",name, (long)size, (long)block_size);
-
-    buf = malloc( block_size );
-    if( buf == NULL )
-    {
-        SHOW_RESULT( malloc, -1 );
-        return;
-    }
-    b = (cyg_uint32 *)buf;
-    
-    err = access( name, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-    i = 0;
-    while( i < block_size/sizeof(cyg_uint32) )
-    {
-        b[i] = i;
-        i++;
-        b[i++] = 0;
-        b[i++] = timehash;
-        b[i++] = 0x12345678;
-    }
-
-    
-    get_timestamp( &opent.start );        
-    fd = open( name, O_WRONLY|O_CREAT );
-    get_timestamp( &opent.end );        
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    get_timestamp( &writet.start );    
-    while( size > 0 )
-    {
-        ssize_t len = size;
-        if ( len > block_size ) len = block_size;
-
-        b[1] = asize-size;
-        b[block_size/sizeof(cyg_uint32)-3] = asize-size;
-        wrote = write( fd, buf, len );
-        if( wrote != len ) SHOW_RESULT( write, wrote );        
-
-        size -= wrote;
-    }
-    get_timestamp( &writet.end );        
-
-    free( buf );
-    
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-
-    calculate_interval( &opent );
-    calculate_interval( &writet );
-
-    diag_printf("CreateFile Results: %s size %ld\n", name, (long)asize);
-    diag_printf("         Open        %8d.%03d ms\n", (int)(opent.us_interval/1000), (int)(opent.us_interval%1000) );
-    diag_printf("        Write        %8d.%03d ms\n", (int)(writet.us_interval/1000), (int)(writet.us_interval%1000) );
-    diag_printf("    Data Rate          %10lld KiB/s\n", (1000000LL*asize)/1024/writet.us_interval);
-}
-
-//==========================================================================
-
-static void checkfile( char *name, size_t block_size )
-{
-    cyg_uint8 *buf;
-    cyg_uint32 *b;
-    int fd;
-    ssize_t done;
-    int err;
-    off_t pos = 0;
-    timing opent, readt;
-    
-    diag_printf("\n--------------------------------------------------------------------\n");
-    diag_printf("<INFO>: check file %s\n",name);
-    
-    buf = malloc( block_size );
-    if( buf == NULL )
-    {
-        SHOW_RESULT( malloc, -1 );
-        return;
-    }
-    b = (cyg_uint32 *)buf;
-    
-    err = access( name, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-
-    get_timestamp( &opent.start );
-    fd = open( name, O_RDONLY );
-    get_timestamp( &opent.end );            
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    get_timestamp( &readt.start );            
-    for(;;)
-    {
-        done = read( fd, buf, block_size );
-        if( done < 0 ) SHOW_RESULT( read, done );
-
-        if( done == 0 ) break;
-
-        // Check that this is the block we wrote
-        if( b[0] != 0 )
-            diag_printf("b[%d] != %08x\n", 0, 0 );
-
-        if( b[1] != pos )
-            diag_printf("b[%d] != %08x\n", 1, (unsigned)pos );
-
-        if( b[2] != timehash )
-            diag_printf("b[%d] != %08x\n", 2, timehash );
-
-        if( b[3] != 0x12345678 )
-            diag_printf("b[%d] != %08x\n", 3, 0x12345678 );
-
-        if( b[(block_size/sizeof(cyg_uint32))-4] != (block_size/sizeof(cyg_uint32)-4) )
-            diag_printf("b[%lu](%08x) != %08x\n", (long)block_size/sizeof(cyg_uint32)-4,
-                                                  b[(block_size/sizeof(cyg_uint32))-4],
-                                                  (unsigned)(block_size/sizeof(cyg_uint32)-4) );
-
-        if( b[block_size/sizeof(cyg_uint32)-3] != pos )
-            diag_printf("b[%lu] != %08x\n", (long)block_size/sizeof(cyg_uint32)-3, (unsigned)pos );
-
-        if( b[block_size/sizeof(cyg_uint32)-2] != timehash )
-            diag_printf("b[%lu] != %08x\n", (long)block_size/sizeof(cyg_uint32)-2, timehash );
-
-        if( b[block_size/sizeof(cyg_uint32)-1] != 0x12345678 )
-            diag_printf("b[%lu] != %08x\n", (long)block_size/sizeof(cyg_uint32)-1, 0x12345678 );
-        
-        pos += done;
-    }
-    get_timestamp( &readt.end );            
-
-    free( buf );
-    
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-
-    calculate_interval( &opent );
-    calculate_interval( &readt );
-
-    diag_printf("CheckFile Results: %s size %ld\n", name, pos);
-    diag_printf("         Open        %8d.%03d ms\n", (int)(opent.us_interval/1000), (int)(opent.us_interval%1000) );
-    diag_printf("         Read        %8d.%03d ms\n", (int)(readt.us_interval/1000), (int)(readt.us_interval%1000) );
-    diag_printf("    Data Rate          %10lld KiB/s\n", (1000000LL*pos)/1024/readt.us_interval);
-}
-
-//==========================================================================
-
-#define TIME_DATA_MAX 20
-
-static void checkfile1( char *name, size_t block_size )
-{
-    cyg_uint8 *buf;
-    cyg_uint32 *b;
-    int fd;
-    ssize_t done;
-    int err;
-    off_t pos = 0;
-    timing totalt;
-    
-    struct
-    {
-        int     valid;
-        timing  mountt;
-        timing  opent;
-        timing  seekt;
-        timing  readt;
-        timing  closet;
-        timing  umountt;
-    } time_data[TIME_DATA_MAX];
-    int td;
-
-    for( td = 0; td < TIME_DATA_MAX; td++ )
-        time_data[td].valid = 0;
-    td = 0;
-    
-    diag_printf("\n--------------------------------------------------------------------\n");
-    diag_printf("<INFO>: check file1 %s\n",name);
-    
-    buf = malloc( block_size );
-    if( buf == NULL )
-    {
-        SHOW_RESULT( malloc, -1 );
-        return;
-    }
-    b = (cyg_uint32 *)buf;
-
-    get_timestamp( &totalt.start );
-    for(;;)
-    {
-        get_timestamp( &time_data[td].mountt.start );
-        err = mount( TEST_DEVICE, TEST_MOUNTPOINT, TEST_FSTYPE );
-        get_timestamp( &time_data[td].mountt.end );
-        if( err < 0 ) SHOW_RESULT( mount, err );
-        
-        get_timestamp( &time_data[td].opent.start );
-        fd = open( name, O_RDONLY );        
-        get_timestamp( &time_data[td].opent.end );
-        if( fd < 0 ) SHOW_RESULT( open, fd );
-    
-        get_timestamp( &time_data[td].seekt.start );
-        err = lseek( fd, pos, SEEK_SET );
-        get_timestamp( &time_data[td].seekt.end );
-        if( err < 0 ) SHOW_RESULT( lseek, err );
-        
-        get_timestamp( &time_data[td].readt.start );        
-        done = read( fd, buf, block_size );
-        get_timestamp( &time_data[td].readt.end );                
-        if( done < 0 ) SHOW_RESULT( read, done );
-
-        get_timestamp( &time_data[td].closet.start );        
-        err = close( fd );
-        get_timestamp( &time_data[td].closet.end );        
-        if( err < 0 ) SHOW_RESULT( close, err );
-        
-        get_timestamp( &time_data[td].umountt.start );
-        err = umount( TEST_MOUNTPOINT );
-        get_timestamp( &time_data[td].umountt.end );
-        if( err < 0 ) SHOW_RESULT( umount, err );
-        
-        if( done == 0 ) break;
-
-        // Check that this is the block we wrote
-        if( b[0] != 0 )
-            diag_printf("b[%d] != %08x\n", 0, 0 );
-
-        if( b[1] != pos )
-            diag_printf("b[%d] != %08x\n", 1, (unsigned)pos );
-
-//        if( b[2] != timehash )
-//            diag_printf("b[%d] != %08x\n", 2, timehash );
-
-        if( b[3] != 0x12345678 )
-            diag_printf("b[%d] != %08x\n", 3, 0x12345678 );
-
-        if( b[(block_size/sizeof(cyg_uint32))-4] != (block_size/sizeof(cyg_uint32)-4) )
-            diag_printf("b[%lu](%08x) != %08x\n", (long)block_size/sizeof(cyg_uint32)-4,
-                                                  b[(block_size/sizeof(cyg_uint32))-4],
-                                                  (unsigned)(block_size/sizeof(cyg_uint32)-4) );
-
-        if( b[block_size/sizeof(cyg_uint32)-3] != pos )
-            diag_printf("b[%lu] != %08x\n", (long)block_size/sizeof(cyg_uint32)-3, (unsigned)pos );
-
-//        if( b[block_size/sizeof(cyg_uint32)-2] != timehash )
-//            diag_printf("b[%d] != %08x\n", block_size/sizeof(cyg_uint32)-2, timehash );
-
-        if( b[block_size/sizeof(cyg_uint32)-1] != 0x12345678 )
-            diag_printf("b[%lu] != %08x\n", (long)block_size/sizeof(cyg_uint32)-1, 0x12345678 );
-        
-        pos += done;
-
-        time_data[td].valid = 1;
-        if( td < (TIME_DATA_MAX-1) )
-            td++;
-    }
-    get_timestamp( &totalt.end );
-
-    free( buf );
-
-    diag_printf("Block      Mount        Open         Seek         Read         Close        Umount\n");
-
-    for( td = 0; td < TIME_DATA_MAX; td++ )
-    {
-        if( !time_data[td].valid )
-            continue;
-        
-        calculate_interval( &time_data[td].mountt );
-        calculate_interval( &time_data[td].opent );
-        calculate_interval( &time_data[td].seekt );
-        calculate_interval( &time_data[td].readt );
-        calculate_interval( &time_data[td].closet );
-        calculate_interval( &time_data[td].umountt );
-
-        diag_printf("%2d:", td);
-        diag_printf(" %8d.%03d", (int)(time_data[td].mountt.us_interval/1000), (int)(time_data[td].mountt.us_interval%1000) );
-        diag_printf(" %8d.%03d", (int)(time_data[td].opent.us_interval/1000), (int)(time_data[td].opent.us_interval%1000) );
-        diag_printf(" %8d.%03d", (int)(time_data[td].seekt.us_interval/1000), (int)(time_data[td].seekt.us_interval%1000) );
-        diag_printf(" %8d.%03d", (int)(time_data[td].readt.us_interval/1000), (int)(time_data[td].readt.us_interval%1000) );
-        diag_printf(" %8d.%03d", (int)(time_data[td].closet.us_interval/1000), (int)(time_data[td].closet.us_interval%1000) );
-        diag_printf(" %8d.%03d", (int)(time_data[td].umountt.us_interval/1000), (int)(time_data[td].umountt.us_interval%1000) );
-        diag_printf("\n");
-    }
-
-    calculate_interval( &totalt );
-    diag_printf("CheckFile1 Results: %s size %ld\n", name, pos);
-    diag_printf("        Total        %8d.%03d ms\n", (int)(totalt.us_interval/1000), (int)(totalt.us_interval%1000) );
-    diag_printf("    Data Rate          %10lld KiB/s\n", (1000000LL*pos)/1024/totalt.us_interval);
-    
-}
-
-//==========================================================================
-
-void checkcwd( const char *cwd )
-{
-    static char cwdbuf[PATH_MAX];
-    char *ret;
-
-    ret = getcwd( cwdbuf, sizeof(cwdbuf));
-    if( ret == NULL ) SHOW_RESULT( getcwd, ret );    
-
-    if( strcmp( cwdbuf, cwd ) != 0 )
-    {
-        diag_printf( "cwdbuf %s cwd %s\n",cwdbuf, cwd );
-        CYG_TEST_FAIL( "Current directory mismatch");
-    }
-}
-
-//==========================================================================
-
-void fs_callback( cyg_int32 event, CYG_ADDRWORD data )
-{
-#if 0
-    diag_printf("Filesystem %sSAFE\n",
-                event==CYG_FS_CALLBACK_UNSAFE?"UN":"");
-#endif
-}
-
-
-//==========================================================================
-// main
-
-void yaffs5_main( CYG_ADDRESS id )
-{
-    int err;
-    int existingdirents=-1;
-    int i;
-    timing mountt, umountt;
-    
-#if defined(CYGSEM_FILEIO_BLOCK_USAGE)
-    struct cyg_fs_block_usage usage;
-#endif
-//    struct cyg_fs_callback_info callback;
-    
-    CYG_TEST_INIT();
-
-    init_timing();
-
-    for( i = 0 ; date_string[i] != 0 ; i++ )
-        timehash = (timehash<<1) ^ date_string[i];
-    for( i = 0 ; time_string[i] != 0 ; i++ )
-        timehash = (timehash<<1) ^ time_string[i];
-    
-    // --------------------------------------------------------------
-
-#if 1
-#define DO_UMOUNT
-    get_timestamp( &mountt.start );
-    err = mount( TEST_DEVICE, TEST_MOUNTPOINT, TEST_FSTYPE );    
-//    err = mount( TEST_DEVICE, TEST_MOUNTPOINT, "yaffs:sync=write" );    
-//    err = mount( TEST_DEVICE, TEST_MOUNTPOINT, "yaffs:sync=close" );    
-//    err = mount( TEST_DEVICE, TEST_MOUNTPOINT, "yaffs:sync=data" );    
-    get_timestamp( &mountt.end );
-    if( err < 0 ) {
-        SHOW_RESULT( mount, err );
-        CYG_TEST_FAIL_FINISH("yaffs5");
-    }
-
-#if 0
-    callback.callback = fs_callback;
-    callback.data = 0;
-    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_CALLBACK,
-                         &callback, sizeof(callback));
-    if( err < 0 ) SHOW_RESULT( cyg_fs_setinfo, err );
-#endif
-    
-    calculate_interval( &mountt );
-    diag_printf("        Mount        %8d.%03d ms\n", (int)(mountt.us_interval/1000), (int)(mountt.us_interval%1000) );
-    
-    err = access( TEST_MOUNTPOINT TEST_DIRECTORY, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-    if( err < 0 && errno == EACCES )
-    {
-        diag_printf("<INFO>: create %s\n",
-                    TEST_MOUNTPOINT TEST_DIRECTORY);
-        err = mkdir( TEST_MOUNTPOINT TEST_DIRECTORY, 0 );
-        if( err < 0 ) SHOW_RESULT( mkdir, err );
-    }
-
-    err = chdir( TEST_MOUNTPOINT TEST_DIRECTORY );    
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    checkcwd( TEST_MOUNTPOINT TEST_DIRECTORY );
-    
-    listdir( TEST_MOUNTPOINT TEST_DIRECTORY, true, -1, &existingdirents );
-
-    // --------------------------------------------------------------
-#if defined(CYGSEM_FILEIO_BLOCK_USAGE)
-    err = cyg_fs_getinfo(TEST_MOUNTPOINT, FS_INFO_BLOCK_USAGE,
-                         &usage, sizeof(usage));
-    if( err < 0 ) SHOW_RESULT( cyg_fs_getinfo, err );
-    diag_printf("<INFO>: total size: %6lld blocks, %10lld bytes\n",
-               usage.total_blocks, usage.total_blocks * usage.block_size);
-    diag_printf("<INFO>: free size:  %6lld blocks, %10lld bytes\n",
-               usage.free_blocks, usage.free_blocks * usage.block_size);
-    diag_printf("<INFO>: block size: %6u bytes\n", usage.block_size);
-#endif
-    // --------------------------------------------------------------
-    
-#endif
-    
-#if 1
-    createfile( "yaffs5.0", 1024*1024, 16*1024 );
-    checkfile( "yaffs5.0",16*1024 );    
-    err = unlink( "yaffs5.0" );
-    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
-    if (err != 0) SHOW_RESULT(sync, err);
-#endif
-
-#if 1
-    createfile( "yaffs5.0", 200*1024, 1024 );
-    checkfile( "yaffs5.0", 1024 );    
-    err = unlink( "yaffs5.0" );
-#endif
-    
-#if 1
-    createfile( "yaffs5.1", 1024*1024, 1024 );
-    createfile( "yaffs5.2", 1024*1024, 4*1024 );
-    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
-    if (err != 0) SHOW_RESULT(sync, err);
-    createfile( "yaffs5.3", 8*1024*1024, 32*1024 );
-
-    checkfile( "yaffs5.1", 1024 );
-    checkfile( "yaffs5.2", 4*1024 );
-    checkfile( "yaffs5.3", 32*1024 );
-
-    diag_printf("\n--------------------------------------------------------------------\n");
-    
-    listdir( "." , true, existingdirents+3, NULL );
-
-    // --------------------------------------------------------------
-
-    diag_printf("<INFO>: unlink yaffs5.1\n");    
-    err = unlink( "yaffs5.1" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink yaffs5.2\n");    
-    err = unlink( "yaffs5.2" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink yaffs5.3\n");    
-    err = unlink( "yaffs5.3" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-#endif
-    
-    // --------------------------------------------------------------
-
-#if 1 && defined(DO_UMOUNT)
-
-    diag_printf("<INFO>: unlink yaffs5.4\n");    
-    err = unlink( "yaffs5.4" );
-    
-    createfile( "yaffs5.4", 5*1024*1024, 32*1024 );
-#endif
-    
-    // --------------------------------------------------------------
-
-#ifdef DO_UMOUNT
-    diag_printf("<INFO>: cd /\n");    
-    err = chdir( "/" );
-    if( err == 0 )
-    {
-        checkcwd( "/" );
-    
-        diag_printf("<INFO>: umount %s\n",TEST_MOUNTPOINT);
-        get_timestamp( &umountt.start );        
-        err = umount( TEST_MOUNTPOINT );
-        get_timestamp( &umountt.end );        
-        if( err < 0 ) SHOW_RESULT( umount, err );
-
-        calculate_interval( &umountt );
-        diag_printf("      Umount        %8d.%03d ms\n", (int)(umountt.us_interval/1000), (int)(umountt.us_interval%1000) );
-        
-    }
-#endif
-    
-#if 1
-
-    diag_printf("<INFO>: syncing\n");    
-    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
-    if (err != 0) SHOW_RESULT(sync, err);
-        
-    checkfile1(TEST_MOUNTPOINT TEST_DIRECTORY "/yaffs5.4", 32*1024 );
-
-    // Remount just to remove yaffs5.4
-    err = mount( TEST_DEVICE, TEST_MOUNTPOINT, TEST_FSTYPE );    
-    if( err < 0 ) {
-        SHOW_RESULT( mount, err );
-        CYG_TEST_FAIL_FINISH("yaffs5");
-    }
-    err = unlink( TEST_MOUNTPOINT TEST_DIRECTORY "/yaffs5.4" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-    err = umount( TEST_MOUNTPOINT );
-    if( err < 0 ) SHOW_RESULT( umount, err );
-
-#else
-
-    // don't sync if not mounted
-    diag_printf("<INFO>: syncing\n");    
-    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
-    if (err != 0) SHOW_RESULT(sync, err);
-
-#endif
-    
-    CYG_TEST_PASS_FINISH("yaffs5");
-}
-
-// -------------------------------------------------------------------------
-
-#include <cyg/kernel/kapi.h>
-
-static cyg_handle_t thread_handle;
-static cyg_thread thread;
-static char stack[CYGNUM_HAL_STACK_SIZE_TYPICAL+8*1024];
-//static char stack[64*1024];
-
-externC void
-cyg_start( void )
-{
-    cyg_thread_create(3,                // Priority - just a number
-                      yaffs5_main,      // entry
-                      0,                // index
-                      0,                // no name
-                      &stack[0],        // Stack
-                      sizeof(stack),    // Size
-                      &thread_handle,   // Handle
-                      &thread           // Thread data structure
-        );
-    cyg_thread_resume(thread_handle);
-
-    cyg_scheduler_start();
-}
-
-#else // CYGPKG_KERNEL
-
-#include <cyg/infra/testcase.h>
-
-externC void cyg_start(void)
-{
-    CYG_TEST_NA("Needs CYGPKG_KERNEL");
-}
-
-#endif
-
-// -------------------------------------------------------------------------
-// EOF yaffs5.c
deleted file mode 100644
--- a/packages/fs/yaffs/current/tests/yaffs6.c
+++ /dev/null
@@ -1,984 +0,0 @@
-//==========================================================================
-//
-//      yaffs6.c
-//
-//      Test FAT UTF-8 support
-//
-//==========================================================================
-// ####ECOSGPLCOPYRIGHTBEGIN####                                            
-// -------------------------------------------                              
-// This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-// Copyright (C) 2004, 2005, 2006, 2007 eCosCentric Limited                 
-//
-// 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.,    
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 v2.                                               
-//
-// This exception does not invalidate any other reasons why a work based    
-// on this file might be covered by the GNU General Public License.         
-// -------------------------------------------                              
-// ####ECOSGPLCOPYRIGHTEND####                                              
-//==========================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):           nickg
-// Contributors:        nickg
-// Date:                2007-06-20
-// Purpose:             Test fileio system
-// Description:         This test uses the testfs to check out the initialization
-//                      and basic operation of the fileio system.
-//                      This is essentially a copy of yaffs4 with UTF8 encoded
-//                      file names.
-//
-//####DESCRIPTIONEND####
-//
-//==========================================================================
-
-#include <pkgconf/system.h>
-
-#ifdef CYGPKG_KERNEL
-
-#include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
-#include <pkgconf/io_fileio.h>
-
-#include CYGDAT_DEVS_DISK_CFG           // testing config defines
-
-#include <cyg/kernel/ktypes.h>         // base kernel types
-#include <cyg/infra/cyg_trac.h>        // tracing macros
-#include <cyg/infra/cyg_ass.h>         // assertion macros
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <dirent.h>
-
-#include <cyg/fileio/fileio.h>
-
-#include <cyg/infra/testcase.h>
-#include <cyg/infra/diag.h>            // HAL polled output
-
-//==========================================================================
-// Config options
-
-#define TEST_DEVICE     CYGDAT_DEVS_DISK_TEST_DEVICE
-
-#define TEST_MOUNTPOINT CYGDAT_DEVS_DISK_TEST_MOUNTPOINT
-
-#define TEST_DIRECTORY CYGDAT_DEVS_DISK_TEST_DIRECTORY
-
-#define TEST_FSTYPE     "yaffs"
-
-#ifdef CYGDAT_DEVS_DISK_TEST_MOUNTPOINT2
-
-#define TEST_DEVICE2     CYGDAT_DEVS_DISK_TEST_DEVICE2
-
-#define TEST_MOUNTPOINT2 CYGDAT_DEVS_DISK_TEST_MOUNTPOINT2
-
-#define TEST_DIRECTORY2 CYGDAT_DEVS_DISK_TEST_DIRECTORY2
-
-#define TEST_FSTYPE2    "yaffs"
-
-#endif
-
-//==========================================================================
-
-#define SHOW_RESULT( _fn, _res )                                                                \
-{                                                                                               \
-    diag_printf("<FAIL>: " #_fn "() returned %ld %s\n", (long)_res, _res<0?strerror(errno):""); \
-}
-
-//==========================================================================
-
-#define IOSIZE  100
-
-#define CLEANUP
-
-//==========================================================================
-// The following filenames are in Cyrillic and are UTF-8 encoded. 
-//
-// WARNING: Only edit this file with an editor that is UTF-8 aware (I
-// use EMACS on Linux, but Notepad on Windows also works). Saving this
-// file from an unaware editor could cause these strings to be
-// corrupted and make this test fail. If the strings below do not
-// appear as clean Cyrillic characters then exit now without saving
-// and look for a better editor.
-
-#if 1
-
-#define FOO             "Фоо"
-#define FEE             "Спутник"
-#define BAR             "Байконур"
-#define BUNDY           "СергеЬй ПаЬвлович Королёв"
-#define FUM             "Юрий Гагаринский"
-#define DOO             "Константин Эдуардович Циолковский"
-//#define FIE             "Федеральное космическое агентство России"
-#define FIE             "Федеральное космическое"
-#define FOE             "Валентин Петрович Глушко"
-
-#define TINKY           "Восток"
-#define LAALAA          "Восход"
-#define NOONOO          "Салют"
-#define DIPSY           "Космодром"
-#define PO              "Лайка"
-
-#define XXXX            "Гласность"
-#define YYYY            "перестройка"
-#define ZZZZ            "Калашникова"
-#define WWWW            "матрёшка"
-
-#else
-
-#define FOO             "foo"
-#define FEE             "fee"
-#define BAR             "bar"
-#define BUNDY           "bundy"
-#define FUM             "fum"
-#define DOO             "doo"
-#define FIE             "fie"
-#define FOE             "foe"
-
-#define TINKY           "tinky"
-#define LAALAA          "laalaa"
-#define NOONOO          "noonoo"
-#define DIPSY           "dipsy"
-#define PO              "po"
-
-#define XXXX            "xxxx"
-#define YYYY            "yyyy"
-#define ZZZZ            "zzzz"
-#define WWWW            "wwww"
-
-#endif
-
-
-//==========================================================================
-
-#ifndef CYGPKG_LIBC_STRING
-
-char *strcat( char *s1, const char *s2 )
-{
-    char *s = s1;
-    while( *s1 ) s1++;
-    while( (*s1++ = *s2++) != 0);
-    return s;
-}
-
-#endif
-
-__externC int
-rename( const char * /* oldpath */, const char * /* newpath */ ) __THROW;
-
-//==========================================================================
-
-static void listdir( char *name, int statp, int numexpected, int *numgot )
-{
-    int err;
-    DIR *dirp;
-    int num=0;
-    
-    diag_printf("<INFO>: reading directory %s\n",name);
-    
-//    diag_printf("<INFO>: opendir(%s)\n",name);
-    dirp = opendir( name );
-    if( dirp == NULL ) SHOW_RESULT( opendir, -1 );
-
-    for(;;)
-    {
-        struct dirent *entry = readdir( dirp );
-        
-        if( entry == NULL )
-            break;
-        num++;
-
-       diag_printf("<INFO>: entry ");
-        
-        if( statp )
-        {
-            char fullname[PATH_MAX];
-            struct stat sbuf;
-
-            if( name[0] )
-            {
-                strcpy(fullname, name );
-                if( !(name[0] == '/' && name[1] == 0 ) )
-                    strcat(fullname, "/" );
-            }
-            else fullname[0] = 0;
-            
-            strcat(fullname, entry->d_name );
-            
-            err = stat( fullname, &sbuf );
-            if( err < 0 )
-            {
-                if( errno == ENOSYS )
-                    diag_printf(" <no status available>");
-                else SHOW_RESULT( stat, err );
-            }
-            else
-            {
-                diag_printf(" [mode %08x ino %08x nlink %d size %6ld]",
-                            sbuf.st_mode,sbuf.st_ino,sbuf.st_nlink,sbuf.st_size);
-            }
-        }
-
-        diag_printf(" %s\n",entry->d_name);
-    }
-
-//    diag_printf("<INFO>: closedir(%s)\n",name);    
-    err = closedir( dirp );
-    if( err < 0 ) SHOW_RESULT( stat, err );
-    if (numexpected >= 0 && num != numexpected)
-        CYG_TEST_FAIL("Wrong number of dir entries");
-    if ( numgot != NULL )
-        *numgot = num;
-}
-
-//==========================================================================
-
-static void createfile( char *name, size_t size )
-{
-    char buf[IOSIZE];
-    int fd;
-    ssize_t wrote;
-    int i;
-    int err;
-
-    diag_printf("<INFO>: create file %s size %ld\n",name, (long)size);
-
-    err = access( name, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-    
-    for( i = 0; i < IOSIZE; i++ ) buf[i] = i%256;
- 
-    fd = open( name, O_WRONLY|O_CREAT );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    while( size > 0 )
-    {
-        ssize_t len = size;
-        if ( len > IOSIZE ) len = IOSIZE;
-        
-        wrote = write( fd, buf, len );
-        if( wrote != len ) SHOW_RESULT( write, wrote );        
-
-        size -= wrote;
-    }
-
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-
-//==========================================================================
-
-#if 0
-static void maxfile( char *name )
-{
-    char buf[IOSIZE];
-    int fd;
-    ssize_t wrote;
-    int i;
-    int err;
-    size_t size = 0;
-    size_t prevsize = 0;
-    
-    diag_printf("<INFO>: create maximal file %s\n",name);
-    diag_printf("<INFO>: This may take a few minutes\n");
-
-    err = access( name, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-    
-    for( i = 0; i < IOSIZE; i++ ) buf[i] = i%256;
- 
-    fd = open( name, O_WRONLY|O_CREAT );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    do
-    {
-        wrote = write( fd, buf, IOSIZE );
-        //if( wrote < 0 ) SHOW_RESULT( write, wrote );        
-
-        if( wrote >= 0 )
-            size += wrote;
-
-        if( (size-prevsize) > 100000 )
-        {
-            diag_printf("<INFO>: size = %ld \n", size);
-            prevsize = size;
-        }
-        
-    } while( wrote == IOSIZE );
-
-    diag_printf("<INFO>: file size == %ld\n",size);
-
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-#endif
-
-//==========================================================================
-
-static void checkfile( char *name )
-{
-    char buf[IOSIZE];
-    int fd;
-    ssize_t done;
-    int i;
-    int err;
-    off_t pos = 0;
-
-    diag_printf("<INFO>: check file %s\n",name);
-    
-    err = access( name, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-
-    fd = open( name, O_RDONLY );
-    if( fd < 0 ) SHOW_RESULT( open, fd );
-
-    for(;;)
-    {
-        done = read( fd, buf, IOSIZE );
-        if( done < 0 ) SHOW_RESULT( read, done );
-
-        if( done == 0 ) break;
-
-        for( i = 0; i < done; i++ )
-            if( buf[i] != i%256 )
-            {
-                diag_printf("buf[%ld+%d](%02x) != %02x\n",pos,i,buf[i],i%256);
-                CYG_TEST_FAIL("Data read not equal to data written\n");
-                for(;;);
-            }
-        
-        pos += done;
-    }
-
-    err = close( fd );
-    if( err < 0 ) SHOW_RESULT( close, err );
-}
-
-//==========================================================================
-
-static void copyfile( char *name2, char *name1 )
-{
-
-    int err;
-    char buf[IOSIZE];
-    int fd1, fd2;
-    ssize_t done, wrote;
-
-    diag_printf("<INFO>: copy file %s -> %s\n",name2,name1);
-
-    err = access( name1, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-    err = access( name2, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-    
-    fd1 = open( name1, O_WRONLY|O_CREAT );
-    if( fd1 < 0 ) SHOW_RESULT( open, fd1 );
-
-    fd2 = open( name2, O_RDONLY );
-    if( fd2 < 0 ) SHOW_RESULT( open, fd2 );
-    
-    for(;;)
-    {
-        done = read( fd2, buf, IOSIZE );
-        if( done < 0 ) SHOW_RESULT( read, done );
-
-        if( done == 0 ) break;
-
-        wrote = write( fd1, buf, done );
-        if( wrote != done ) SHOW_RESULT( write, wrote );
-
-        if( wrote != done ) break;
-    }
-
-    err = close( fd1 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-
-    err = close( fd2 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-    
-}
-
-//==========================================================================
-
-static void comparefiles( char *name2, char *name1 )
-{
-    int err;
-    char buf1[IOSIZE];
-    char buf2[IOSIZE];
-    int fd1, fd2;
-    ssize_t done1, done2;
-    int i;
-
-    diag_printf("<INFO>: compare files %s == %s\n",name2,name1);
-
-    err = access( name1, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-
-    err = access( name1, F_OK );
-    if( err != 0 ) SHOW_RESULT( access, err );
-    
-    fd1 = open( name1, O_RDONLY );
-    if( fd1 < 0 ) SHOW_RESULT( open, fd1 );
-
-    fd2 = open( name2, O_RDONLY );
-    if( fd2 < 0 ) SHOW_RESULT( open, fd2 );
-    
-    for(;;)
-    {
-        done1 = read( fd1, buf1, IOSIZE );
-        if( done1 < 0 ) SHOW_RESULT( read, done1 );
-
-        done2 = read( fd2, buf2, IOSIZE );
-        if( done2 < 0 ) SHOW_RESULT( read, done2 );
-
-        if( done1 != done2 )
-            diag_printf("Files different sizes\n");
-        
-        if( done1 == 0 ) break;
-
-        for( i = 0; i < done1; i++ )
-            if( buf1[i] != buf2[i] )
-            {
-                diag_printf("buf1[%d](%02x) != buf1[%d](%02x)\n",i,buf1[i],i,buf2[i]);
-                CYG_TEST_FAIL("Data in files not equal\n");
-            }
-    }
-
-    err = close( fd1 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-
-    err = close( fd2 );
-    if( err < 0 ) SHOW_RESULT( close, err );
-    
-}
-
-//==========================================================================
-
-void checkcwd( const char *cwd )
-{
-    static char cwdbuf[PATH_MAX];
-    char *ret;
-
-    ret = getcwd( cwdbuf, sizeof(cwdbuf));
-    if( ret == NULL ) SHOW_RESULT( getcwd, ret );    
-
-    if( strcmp( cwdbuf, cwd ) != 0 )
-    {
-        diag_printf( "cwdbuf %s cwd %s\n",cwdbuf, cwd );
-        CYG_TEST_FAIL( "Current directory mismatch");
-    }
-}
-
-//==========================================================================
-// main
-
-void yaffs6_main( CYG_ADDRESS id )
-{
-    int err;
-    int existingdirents=-1;
-    cyg_bool mp2 = false;
-    int fd;
-    
-    char dirname[256];
-    char filename1[256];
-    char filename2[256];
-
-#define NEW_FILENAME( fn, f )                           \
-{                                                       \
-    fn[0]=0;                                            \
-    strcat(fn, dirname);                                \
-    strcat(fn, "/");                                    \
-    strcat(fn,f);                                       \
-}
-
-#define NEW_FILENAME1( f ) NEW_FILENAME( filename1, f )
-#define NEW_FILENAME2( f ) NEW_FILENAME( filename2, f )
-
-    CYG_TEST_INIT();
-    
-#ifdef CYGDBG_INFRA_DIAG_CHECK_STRINGS
-    diag_printf("WARNING: CYGDBG_INFRA_DIAG_CHECK_STRINGS is defined, Cyrillic file names will not be printed.\n");
-#else
-    diag_printf("WARNING: Cyrillic file names printed in UTF-8 may not be readable in some environments.\n");
-#endif
-    
-    // --------------------------------------------------------------
-
-    err = mount( TEST_DEVICE, TEST_MOUNTPOINT, TEST_FSTYPE );    
-    if( err < 0 ) {
-        SHOW_RESULT( mount, err );
-        CYG_TEST_FAIL_FINISH("yaffs6");
-    }
-
-    err = access( TEST_MOUNTPOINT TEST_DIRECTORY, F_OK );
-    if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-    if( err < 0 && errno == EACCES )
-    {
-        diag_printf("<INFO>: create %s\n",
-                    TEST_MOUNTPOINT TEST_DIRECTORY);
-        err = mkdir( TEST_MOUNTPOINT TEST_DIRECTORY, 0 );
-        if( err < 0 ) SHOW_RESULT( mkdir, err );
-    }
-
-    err = chdir( TEST_MOUNTPOINT TEST_DIRECTORY );    
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    checkcwd( TEST_MOUNTPOINT TEST_DIRECTORY );
-    
-    listdir( TEST_MOUNTPOINT TEST_DIRECTORY, true, -1, &existingdirents );
-
-    // --------------------------------------------------------------
-    
-    dirname[0] = 0;
-    strcat(dirname, TEST_MOUNTPOINT );
-    strcat(dirname, TEST_DIRECTORY );
-    
-    // --------------------------------------------------------------
-
-    createfile( FOO, 20257 );
-    checkfile( FOO );
-    copyfile( FOO, FEE);
-    checkfile( FEE );
-    comparefiles( FOO, FEE );
-
-    diag_printf("<INFO>: mkdir " BAR "\n");
-    err = mkdir( BAR, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    listdir( dirname , true, existingdirents+3, NULL );
-    
-    copyfile( FEE, BAR "/" FUM );
-    checkfile( BAR "/" FUM );
-    comparefiles( FEE, BAR "/" FUM );
-
-    diag_printf("<INFO>: cd " BAR "\n");
-    err = chdir( BAR );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    NEW_FILENAME1( BAR );
-    checkcwd( filename1 );
-    
-    diag_printf("<INFO>: rename ../" FOO " " BUNDY "\n");    
-    err = rename( "../" FOO, BUNDY );
-    if( err < 0 ) SHOW_RESULT( rename, err );
-    
-    listdir( dirname, true, existingdirents+2, NULL );
-    listdir( "." , true, 4, NULL );
-
-    checkfile( "../" BAR "/" BUNDY );
-    comparefiles("../" FEE, BUNDY );
-
-#if 1
-
-    // --------------------------------------------------------------
-    // Check for some common error cases
-
-    // First make some directories
-    diag_printf("<INFO>: mkdir " DOO "\n");    
-    err = mkdir( DOO, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );    
-
-    diag_printf("<INFO>: mkdir " FIE" \n");    
-    err = mkdir( FIE, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );    
-
-    diag_printf("<INFO>: mkdir " FIE "/" FOE "\n");    
-    err = mkdir( FIE "/" FOE, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );    
-
-
-    diag_printf("<INFO>: rename " FUM " " DOO " -- should fail\n");    
-    err = rename( FUM, DOO );
-    if( err < 0 && errno != EISDIR ) SHOW_RESULT( rename, err );
-
-    diag_printf("<INFO>: rename " DOO " " FUM " -- should fail\n");    
-    err = rename( DOO, FUM );
-    if( err < 0 && errno != ENOTDIR ) SHOW_RESULT( rename, err );
-
-    diag_printf("<INFO>: rename " DOO " " FIE " -- should fail\n");    
-    err = rename( DOO, FIE );
-    if( err < 0 && errno != EIO ) SHOW_RESULT( rename, err );
-    
-    NEW_FILENAME1( XXXX "/" YYYY )
-    diag_printf("<INFO>: rename " FUM " %s -- should fail\n",filename1);    
-    err = rename( FUM, filename1 );
-    if( err < 0 && errno != ENOENT ) SHOW_RESULT( rename, err );
-    
-    diag_printf("<INFO>: rename " FUM " " FUM " -- should fail\n");    
-    err = rename( FUM, FUM );
-    if( err < 0 ) SHOW_RESULT( rename, err );
-
-    diag_printf("<INFO>: unlink " FEE " -- should fail\n");        
-    err = unlink( FEE );
-    if( err < 0 && errno != ENOENT ) SHOW_RESULT( unlink, err );
-
-    NEW_FILENAME1( BAR );
-    diag_printf("<INFO>: rmdir %s -- should fail\n",filename1);        
-    err = rmdir( filename1 );
-    if( err < 0 && errno != ENOTEMPTY ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: unlink %s -- should fail\n",filename1);        
-    err = unlink( filename1 );
-    if( err < 0 && errno != EISDIR ) SHOW_RESULT( unlink, err );
-
-    NEW_FILENAME1( BAR "/" FUM );
-    diag_printf("<INFO>: rmdir %s -- should fail\n",filename1);        
-    err = rmdir( filename1 );
-    if( err < 0 && errno != ENOTDIR ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: mkdir %s -- should fail\n",filename1);        
-    err = mkdir( filename1, 0 );
-    if( err < 0 && errno != EEXIST ) SHOW_RESULT( mkdir, err );
-    
-    diag_printf("<INFO>: open " BUNDY "  exclusive -- should fail\n");        
-    fd = open( BUNDY, O_WRONLY|O_CREAT|O_EXCL );
-    if( fd < 0 && errno != EEXIST ) SHOW_RESULT( open, fd );
-
-    diag_printf("<INFO>: open %s -- should fail\n",dirname);        
-    fd = open( dirname, O_WRONLY );
-    if( fd < 0 && errno != EISDIR ) SHOW_RESULT( open, fd );
-    
-    
-    listdir( dirname, true, existingdirents+2, NULL );
-    listdir( "." , true, 6, NULL );
-    
-    // --------------------------------------------------------------    
-
-#ifdef CLEANUP
-
-    diag_printf("<INFO>: rename " FIE " " DOO "\n");
-    err = rename( FIE, DOO );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: rmdir " DOO "/" FOE "\n");
-    err = rmdir(DOO "/" FOE);
-    if( err < 0 ) SHOW_RESULT( unlink, err );    
-
-    diag_printf("<INFO>: rmdir " DOO "\n");
-    err = rmdir(DOO);
-    if( err < 0 ) SHOW_RESULT( unlink, err );    
-    
-    diag_printf("<INFO>: unlink ../" FEE "\n");    
-    err = unlink( "../" FEE );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink " FUM "\n");        
-    err = unlink( FUM );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink ../" BAR "/" BUNDY "\n");        
-    err = unlink( "../" BAR "/" BUNDY );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-#endif
-    
-    diag_printf("<INFO>: cd ..\n");        
-    err = chdir( ".." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    checkcwd( dirname );
-
-#ifdef CLEANUP    
-    diag_printf("<INFO>: rmdir " BAR "\n");        
-    err = rmdir( BAR );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-    
-    listdir( dirname, false, existingdirents, NULL );
-#endif
-
-    // --------------------------------------------------------------
-
-#ifdef TEST_MOUNTPOINT2
-    diag_printf("<INFO>: mount %s\n", TEST_MOUNTPOINT2);    
-    err = mount( TEST_DEVICE2, TEST_MOUNTPOINT2, TEST_FSTYPE2 );
-
-    if( err == 0 )
-    {
-        mp2 = true;
-        diag_printf("<INFO>: mount %s succeeded\n", TEST_MOUNTPOINT2);    
-        err = access( TEST_MOUNTPOINT2 TEST_DIRECTORY2, F_OK );
-        if( err < 0 && errno != EACCES ) SHOW_RESULT( access, err );
-
-        if( err < 0 && errno == EACCES )
-        {
-            diag_printf("<INFO>: create %s\n",
-                        TEST_MOUNTPOINT2 TEST_DIRECTORY2);
-            err = mkdir( TEST_MOUNTPOINT2 TEST_DIRECTORY2, 0 );
-            if( err < 0 ) SHOW_RESULT( mkdir, err );
-        }
-
-        err = chdir( TEST_MOUNTPOINT2 TEST_DIRECTORY2 );    
-        if( err < 0 ) SHOW_RESULT( chdir, err );
-
-        checkcwd( TEST_MOUNTPOINT2 TEST_DIRECTORY2 );
-
-        dirname[0] = 0;
-        strcat(dirname, TEST_MOUNTPOINT2 );
-        strcat(dirname, TEST_DIRECTORY2 );
-
-    }
-    else
-    {
-        mp2 = false;
-        diag_printf("<INFO>: mount %s failed, ", TEST_MOUNTPOINT2);
-        diag_printf("using %s instead\n", dirname );
-    }
-
-#endif
-    
-    listdir( dirname , true, -1, &existingdirents);
-
-    NEW_FILENAME1( TINKY );
-    NEW_FILENAME2( LAALAA );
-    
-    createfile( filename1, 4567 );
-    copyfile( filename1, filename2 );
-    checkfile( filename1);
-    checkfile( filename2);
-    comparefiles( filename1, filename2 );
-
-    diag_printf("<INFO>: cd %s\n",dirname);    
-    err = chdir( dirname );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    checkcwd( dirname );
-        
-    diag_printf("<INFO>: mkdir " NOONOO "\n");    
-    err = mkdir( NOONOO, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    listdir( dirname , true, existingdirents+3, NULL);
-
-    diag_printf("<INFO>: cd " NOONOO "\n");
-    err = chdir( NOONOO );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-
-    NEW_FILENAME1( NOONOO );
-    checkcwd( filename1 );
-    
-    createfile( TINKY, 6789 );
-    checkfile( TINKY );
-
-    createfile( DIPSY, 34567 );
-    checkfile( DIPSY );
-    copyfile( DIPSY, PO );
-    checkfile( PO );
-    comparefiles( DIPSY, PO );
-
-    listdir( ".", true, 5, NULL );
-    listdir( "..", true, existingdirents+3, NULL );
-
-    // --------------------------------------------------------------
-
-#ifdef CLEANUP
-    diag_printf("<INFO>: unlink " TINKY "\n");    
-    err = unlink( TINKY );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink " DIPSY "\n");    
-    err = unlink( DIPSY );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink " PO "\n");    
-    err = unlink( PO );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-#endif
-    
-    diag_printf("<INFO>: cd ..\n"); 
-    err = chdir( ".." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( dirname );
-
-#ifdef CLEANUP
-    diag_printf("<INFO>: rmdir " NOONOO "\n"); 
-    err = rmdir( NOONOO );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-#endif
-    
-    // --------------------------------------------------------------
-
-    err = mkdir( XXXX, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-    
-    err = mkdir( XXXX "/" YYYY, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-    
-    err = mkdir( XXXX "/" YYYY "/" ZZZZ, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    err = mkdir( XXXX "/" YYYY "/" ZZZZ "/" WWWW, 0 );
-    if( err < 0 ) SHOW_RESULT( mkdir, err );
-
-    NEW_FILENAME1( XXXX "/" YYYY "/" ZZZZ "/" WWWW );
-    diag_printf("<INFO>: cd %s\n",filename1);
-    err = chdir( filename1 );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( filename1 );
-
-    NEW_FILENAME1( XXXX "/" YYYY "/" ZZZZ );    
-    diag_printf("<INFO>: cd ..\n");
-    err = chdir( ".." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( filename1 );
-
-    NEW_FILENAME1( XXXX "/" YYYY "/" ZZZZ );
-    diag_printf("<INFO>: cd .\n");
-    err = chdir( "." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( filename1 );
-
-    NEW_FILENAME1( XXXX "/" YYYY );    
-    diag_printf("<INFO>: cd ../../" YYYY "\n");
-    err = chdir( "../../" YYYY );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( filename1 );
-
-    diag_printf("<INFO>: cd ../..\n");
-    err = chdir( "../.." );
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( dirname );
-
-    diag_printf("<INFO>: rmdir " XXXX "/" YYYY "/" ZZZZ "/" WWWW "\n"); 
-    err = rmdir( XXXX "/" YYYY "/" ZZZZ "/" WWWW );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: rmdir "XXXX "/" YYYY "/" ZZZZ "\n"); 
-    err = rmdir( XXXX "/" YYYY "/" ZZZZ );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: rmdir " XXXX "/" YYYY "\n"); 
-    err = rmdir( XXXX "/" YYYY );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-
-    diag_printf("<INFO>: rmdir "XXXX "\n"); 
-    err = rmdir( XXXX );
-    if( err < 0 ) SHOW_RESULT( rmdir, err );
-    
-    // --------------------------------------------------------------
-
-    checkcwd( dirname );
-
-#ifdef CLEANUP
-    diag_printf("<INFO>: unlink "TINKY "\n");    
-    err = unlink( TINKY );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-
-    diag_printf("<INFO>: unlink " LAALAA" \n");    
-    err = unlink( LAALAA );
-    if( err < 0 ) SHOW_RESULT( unlink, err );
-#endif
-    
-    // --------------------------------------------------------------
-    
-    diag_printf("<INFO>: cd %s\n", TEST_MOUNTPOINT TEST_DIRECTORY);
-    err = chdir( TEST_MOUNTPOINT TEST_DIRECTORY);
-    if( err < 0 ) SHOW_RESULT( chdir, err );
-    checkcwd( TEST_MOUNTPOINT TEST_DIRECTORY );
-    
-    listdir( ".", true, -1, NULL );
-
-#ifdef TEST_MOUNTPOINT2
-    if( mp2 )
-    {
-        diag_printf("<INFO>: umount %s\n",TEST_MOUNTPOINT2);    
-        err = umount( TEST_MOUNTPOINT2 );
-        if( err < 0 ) SHOW_RESULT( umount, err );
-    }
-#endif
-
-    // --------------------------------------------------------------
-
-#if 0
-    maxfile("file.max");
-
-    listdir( "/", true, -1, NULL );    
-        
-    diag_printf("<INFO>: unlink file.max\n");    
-    err = unlink( "file.max" );
-    if( err < 0 ) SHOW_RESULT( unlink, err );    
-#endif
-
-    // --------------------------------------------------------------
-
-#endif
-    diag_printf("<INFO>: cd /\n");    
-    err = chdir( "/" );
-    if( err == 0 )
-    {
-        checkcwd( "/" );
-    
-        diag_printf("<INFO>: umount %s\n",TEST_MOUNTPOINT);    
-        err = umount( TEST_MOUNTPOINT );
-        if( err < 0 ) SHOW_RESULT( umount, err );
-    }
-
-    diag_printf("<INFO>: syncing\n");    
-    err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0);
-    if (err != 0) SHOW_RESULT(sync, err);
-    
-    CYG_TEST_PASS_FINISH("yaffs6");
-}
-
-// -------------------------------------------------------------------------
-
-#include <cyg/kernel/kapi.h>
-
-static cyg_handle_t thread_handle;
-static cyg_thread thread;
-static char stack[CYGNUM_HAL_STACK_SIZE_TYPICAL+1024*4];
-
-externC void
-cyg_start( void )
-{
-    cyg_thread_create(3,                // Priority - just a number
-                      yaffs6_main,      // entry
-                      0,                // index
-                      0,                // no name
-                      &stack[0],        // Stack
-                      sizeof(stack),    // Size
-                      &thread_handle,   // Handle
-                      &thread           // Thread data structure
-        );
-    cyg_thread_resume(thread_handle);
-
-    cyg_scheduler_start();
-}
-
-#else // CYGPKG_KERNEL
-
-#include <cyg/infra/testcase.h>
-
-externC void cyg_start(void)
-{
-    CYG_TEST_NA("Needs CYGPKG_KERNEL");
-}
-
-#endif
-
-// -------------------------------------------------------------------------
-// EOF yaffs6.c