diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-30 18:53:09 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-30 18:53:09 +0000 |
commit | dfe9e683b0c294ac7c1ab0198d952331aa08e1bc (patch) | |
tree | 5508a662a1c6a5ab2f925a92d080da26604559b8 /target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c | |
parent | 4ff577f968912f0452eaeec826ead436c8a8fc87 (diff) | |
download | openwrt-dfe9e683b0c294ac7c1ab0198d952331aa08e1bc.tar.gz openwrt-dfe9e683b0c294ac7c1ab0198d952331aa08e1bc.zip |
AA: generic: fold yaffs_cvs_2009_04_24 patch to generic/files
Backport of r34012.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34017 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c')
-rw-r--r-- | target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c b/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c index f480bf1df..3e67e6916 100644 --- a/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c +++ b/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c @@ -14,7 +14,7 @@ #include "yaffs_packedtags1.h" #include "yportenv.h" -void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t) +void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t) { pt->chunkId = t->chunkId; pt->serialNumber = t->serialNumber; @@ -27,7 +27,7 @@ void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t) } -void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt) +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, @@ -35,9 +35,8 @@ void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt) if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) { t->blockBad = 0; - if (pt->shouldBeFF != 0xFFFFFFFF) { + if (pt->shouldBeFF != 0xFFFFFFFF) t->blockBad = 1; - } t->chunkUsed = 1; t->objectId = pt->objectId; t->chunkId = pt->chunkId; @@ -47,6 +46,5 @@ void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt) t->serialNumber = pt->serialNumber; } else { memset(t, 0, sizeof(yaffs_ExtendedTags)); - } } |