phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Fix NXTEXT link error 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3787 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2011-07-14 23:29:43 +00:00
parent 19bd49cdb5
commit 518f1869f1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/examples/nxtext/nxtext_internal.h
View File

@ -268,8 +268,8 @@ extern const struct nx_callback_s g_bgcb;
/* The screen resolution */
nxgl_coord_t g_xres;
nxgl_coord_t g_yres;
extern nxgl_coord_t g_xres;
extern nxgl_coord_t g_yres;
extern bool b_haveresolution;
#ifdef CONFIG_NX_MULTIUSER

9
nuttx/fs/fat/fs_fat32dirent.c
View File

@ -986,7 +986,7 @@ static inline int fat_findlfnentry(struct fat_mountpt_s *fs,
* order.. from last to first).
*/
lastseq = LDIR_SEQ | nentries;
lastseq = LDIR0_LAST | nentries;
seqno = lastseq;
/* Search, beginning with the current sector, for a directory entry this
@ -1274,7 +1274,7 @@ static inline int fat_allocatelfnentry(struct fat_mountpt_s *fs,
/* Check if this directory entry is empty */
ch = direntry[DIR_NAME];
ch = LDIR_GETSEQ(direntry);
if (ch == DIR0_ALLEMPTY || ch == DIR0_EMPTY)
{
/* It is empty -- we have found a directory entry. Is this the
@ -1288,7 +1288,7 @@ static inline int fat_allocatelfnentry(struct fat_mountpt_s *fs,
dirinfo->fd_seq.ds_lfnsector = fs->fs_currentsector;
dirinfo->fd_seq.ds_lfnoffset = diroffset;
dirinfo->fd_seq.ds_lfncluster = dirinfo->dir.fd_currcluster;
}
}
/* Is this last entry we need (i.e., the entry for the short
* file name entry)?
@ -1790,6 +1790,7 @@ static int fat_putlfname(struct fat_mountpt_s *fs, struct fat_dirinfo_s *dirinfo
dirinfo->dir.fd_currcluster = dirinfo->fd_seq.ds_lfncluster;
dirinfo->dir.fd_currsector = dirinfo->fd_seq.ds_lfnsector;
dirinfo->dir.fd_index = dirinfo->fd_seq.ds_lfnoffset / DIR_SIZE;
/* Make sure that the sector containing the "last" long file name entry
* is in the sector cache (it probably is not).
@ -1807,7 +1808,7 @@ static int fat_putlfname(struct fat_mountpt_s *fs, struct fat_dirinfo_s *dirinfo
{
/* Get the string offset associated with the directory entry. */
offset = nentries * LDIR_MAXLFNCHARS;
offset = (nentries - 1) * LDIR_MAXLFNCHARS;
/* Get a reference to the current directory entry */