Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add basic write logic

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3544 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2011-04-30 20:06:23 +00:00
parent efbd1dcf3e
commit e0f72ff94e
6 changed files with 551 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/nxffs/nxffs_open.c
+33 -12
View File
@@ -64,11 +64,19 @@
****************************************************************************/
/****************************************************************************
* Public Variables
* Private Data
****************************************************************************/
/* Since we are limited to a single file opened for writing, it makes sense
* to pre-allocate the write state structure.
*/
#ifdef CONFIG_NXFSS_PREALLOCATED
static struct nxffs_wrfile_s g_wrfile;
#endif
/****************************************************************************
* Private Variables
* Public Data
****************************************************************************/
/****************************************************************************
@@ -124,8 +132,7 @@ static inline int nxffs_hdrpos(FAR struct nxffs_volume_s *volume,
{
/* Save the offset to the FLASH region reserved for the inode header */
wrfile->ofile.entry.hoffset =
volume->ioblock * volume->geo.blocksize + volume->iooffset;
wrfile->ofile.entry.hoffset = nxffs_iotell(volume);
}
return OK;
}
@@ -180,8 +187,7 @@ static inline int nxffs_nampos(FAR struct nxffs_volume_s *volume,
{
/* Save the offset to the FLASH region reserved for the inode name */
wrfile->ofile.entry.noffset =
volume->ioblock * volume->geo.blocksize + volume->iooffset;
wrfile->ofile.entry.noffset = nxffs_iotell(volume);
}
return OK;
}
@@ -242,8 +248,7 @@ static inline int nxffs_hdrerased(FAR struct nxffs_volume_s *volume,
{
/* This is where we will put the header */
wrfile->ofile.entry.hoffset =
volume->ioblock * volume->geo.blocksize + volume->iooffset;
wrfile->ofile.entry.hoffset = nxffs_iotell(volume);
}
return ret;
}
@@ -305,8 +310,7 @@ static inline int nxffs_namerased(FAR struct nxffs_volume_s *volume,
{
/* This is where we will put the name */
wrfile->ofile.entry.hoffset =
volume->ioblock * volume->geo.blocksize + volume->iooffset;
wrfile->ofile.entry.hoffset = nxffs_iotell(volume);
}
return ret;
}
@@ -412,12 +416,17 @@ static inline int nxffs_wropen(FAR struct nxffs_volume_s *volume,
* that includes additional information to support the write operation.
*/
#ifdef CONFIG_NXFSS_PREALLOCATED
wrfile = &g_wrfile;
memset(wrfile, 0, sizeof(struct nxffs_wrfile_s));
#else
wrfile = (FAR struct nxffs_wrfile_s *)kzalloc(sizeof(struct nxffs_wrfile_s));
if (!wrfile)
{
ret = -ENOMEM;
goto errout;
}
#endif
/* Initialize the open file state structure */
@@ -553,7 +562,9 @@ static inline int nxffs_wropen(FAR struct nxffs_volume_s *volume,
return OK;
errout_with_ofile:
#ifndef CONFIG_NXFSS_PREALLOCATED
kfree(wrfile);
#endif
errout:
return ret;
}
@@ -672,10 +683,20 @@ static inline void nxffs_freeofile(FAR struct nxffs_volume_s *volume,
volume->ofiles = ofile->flink;
}
/* Then free the open file */
/* Release the open file entry */
nxffs_freeentry(&ofile->entry);
kfree(ofile);
/* Then free the open file container (unless this the pre-alloated
* write-only open file container)
*/
#ifdef CONFIG_NXFSS_PREALLOCATED
if ((FAR struct nxffs_wrfile_s*)ofile != &g_wrfile)
#endif
{
kfree(ofile);
}
}
else
{