Mercurial > yaffs-ecoscentric
changeset 312:8678bc743892
build fixes; docs fix
| author | wry |
|---|---|
| date | Thu, 24 Sep 2009 13:09:01 +0000 |
| parents | 16de60f90faa |
| children | ba05a98df7e4 |
| files | packages/fs/yaffs/current/ChangeLog packages/fs/yaffs/current/doc/yaffs.sgml packages/fs/yaffs/current/src/ecos-yaffs-nand.h packages/fs/yaffs/current/src/ecos-yaffs.c packages/fs/yaffs/current/src/yaffs_guts.c |
| diffstat | 5 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/fs/yaffs/current/ChangeLog +++ b/packages/fs/yaffs/current/ChangeLog @@ -1,3 +1,9 @@ +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
--- a/packages/fs/yaffs/current/doc/yaffs.sgml +++ b/packages/fs/yaffs/current/doc/yaffs.sgml @@ -98,7 +98,7 @@ RedBoot's usual flexible scripting syste 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"/>. +<xref linkend="io-nand-overview" endterm="io-nand-short">. </para> <para> @@ -654,7 +654,7 @@ requires { CYGPKG_REDBOOT implies 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"/>. +environment. Refer also to <xref linkend="yaffs-mem-reqs">. </para></caution> <para>
--- a/packages/fs/yaffs/current/src/ecos-yaffs-nand.h +++ b/packages/fs/yaffs/current/src/ecos-yaffs-nand.h @@ -53,7 +53,7 @@ // If writing a yaffs_PackedTags1, we store only its eight meaningful bytes #define PACKEDTAGS1_OOBSIZE 8 -#define PACKEDTAGS2_OOBSIZE sizeof(yaffs_PackedTags2) +#define PACKEDTAGS2_OOBSIZE ((unsigned)sizeof(yaffs_PackedTags2)) int eyaffs_eraseBlockInNAND (struct yaffs_DeviceStruct * dev, int blockInNAND); int eyaffs_initialiseNAND (struct yaffs_DeviceStruct * dev);
--- a/packages/fs/yaffs/current/src/ecos-yaffs.c +++ b/packages/fs/yaffs/current/src/ecos-yaffs.c @@ -604,7 +604,7 @@ static int eyaffs_mount ( cyg_fstab_e y->isYaffs2 = 1; if (NAND_APPSPARE_PER_PAGE(nand) < PACKEDTAGS2_OOBSIZE) { NAND_ERROR(nand, - "Device has %d spare per page but YAFFS2 needs %d\n", + "Device has %d spare per page but YAFFS2 needs %u\n", NAND_APPSPARE_PER_PAGE(nand), PACKEDTAGS2_OOBSIZE); EG(EINVAL); }
--- a/packages/fs/yaffs/current/src/yaffs_guts.c +++ b/packages/fs/yaffs/current/src/yaffs_guts.c @@ -4453,8 +4453,8 @@ static int yaffs_ReadCheckpointObjects(y 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 %d ok %d"TENDSTR), - cp.structType, sizeof(cp), ok)); + T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %u ok %d"TENDSTR), + cp.structType, (unsigned)(sizeof(cp)), ok)); ok = 0; } @@ -7612,8 +7612,8 @@ static void yaffs_VerifyFreeChunks(yaffs #define yaffs_CheckStruct(structure, syze, name) \ do { \ if (sizeof(structure) != syze) { \ - T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\ - name, syze, sizeof(structure))); \ + T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %u\n" TENDSTR),\ + name, syze, (unsigned)sizeof(structure))); \ return YAFFS_FAIL; \ } \ } while (0)