diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-05-04 22:47:34 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-05-04 22:47:34 +0000 |
| commit | b85797acfbfb1a29c84a0db6cfded6a6360d3f83 (patch) | |
| tree | 4f1f25965715df2bd76096e3b1bd82ab5b6e3a40 | |
| parent | 253f30c6d296de51ccc87f79091e923b2bc22c58 (diff) | |
| download | px4-nuttx-b85797acfbfb1a29c84a0db6cfded6a6360d3f83.tar.gz px4-nuttx-b85797acfbfb1a29c84a0db6cfded6a6360d3f83.tar.bz2 px4-nuttx-b85797acfbfb1a29c84a0db6cfded6a6360d3f83.zip | |
More NXFFS bugfixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3562 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | apps/examples/nxffs/nxffs_main.c | 2 | ||||
| -rw-r--r-- | nuttx/fs/nxffs/nxffs_pack.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/examples/nxffs/nxffs_main.c b/apps/examples/nxffs/nxffs_main.c index df0ddd249..af16b983d 100644 --- a/apps/examples/nxffs/nxffs_main.c +++ b/apps/examples/nxffs/nxffs_main.c @@ -103,7 +103,7 @@ #endif #ifndef CONFIG_EXAMPLES_NXFFS_NLOOPS -# define CONFIG_EXAMPLES_NXFFS_NLOOPS 2 +# define CONFIG_EXAMPLES_NXFFS_NLOOPS 3 #endif #ifndef CONFIG_EXAMPLES_NXFFS_VERBOSE diff --git a/nuttx/fs/nxffs/nxffs_pack.c b/nuttx/fs/nxffs/nxffs_pack.c index ea40e1d70..57fa11e76 100644 --- a/nuttx/fs/nxffs/nxffs_pack.c +++ b/nuttx/fs/nxffs/nxffs_pack.c @@ -782,7 +782,7 @@ static inline int nxffs_packblock(FAR struct nxffs_volume_s *volume, /* Transfer the smaller of the two amounts data */ uint16_t xfrlen = MIN(srclen, destlen); - nxffs_ioseek(volume, pack->src.blkoffset + pack->src.blkpos); + nxffs_ioseek(volume, pack->src.blkoffset + SIZEOF_NXFFS_DATA_HDR + pack->src.blkpos); memcpy(&pack->iobuffer[pack->iooffset], &volume->cache[volume->iooffset], xfrlen); /* Increment counts and offset for this data transfer */ |