Trivial update to a comments and to SPIFFS comments and debug output.

This commit is contained in:
Gregory Nutt
2018-09-30 07:15:15 -06:00
parent d23c5e0d61
commit a037aeec5d
5 changed files with 21 additions and 14 deletions
+6
View File
@@ -1468,6 +1468,12 @@
The ChangeLog for the current release is at the bottom of that file. The ChangeLog for the current release is at the bottom of that file.
</p> </p>
</li></ul> </li></ul>
<li><b>NxWidgets</b>.
<ul><p>
<p>
As of NuttX-7.27, the content of the NxWidgets repository has been included within the <code>apps/</code> package and no longer has separate releases.
</p>
</li></ul>
<li><b>pascal</b>. <li><b>pascal</b>.
<ul><p> <ul><p>
Release notes for all released versions on pascal are available in the <a href="https://bitbucket.org/nuttx/pascal/ReleaseNotes" target="_blank">Bitbucket GIT</a> Release notes for all released versions on pascal are available in the <a href="https://bitbucket.org/nuttx/pascal/ReleaseNotes" target="_blank">Bitbucket GIT</a>
+3 -3
View File
@@ -582,7 +582,7 @@ static int spiffs_check_luentry_validate(FAR struct spiffs_s *fs,
if ((pghdr->objid | SPIFFS_OBJID_NDXFLAG) != if ((pghdr->objid | SPIFFS_OBJID_NDXFLAG) !=
(lu_objid | SPIFFS_OBJID_NDXFLAG)) (lu_objid | SPIFFS_OBJID_NDXFLAG))
{ {
spiffs_checkinfo("LU: pgndx %04x differ in objid lu=" spiffs_checkinfo("pgndx %04x differ in objid lu="
"%04x ph:%04x\n", cur_pgndx, lu_objid, "%04x ph:%04x\n", cur_pgndx, lu_objid,
pghdr->objid); pghdr->objid);
delete_page = true; delete_page = true;
@@ -947,7 +947,7 @@ static int spiffs_check_luentry_validate(FAR struct spiffs_s *fs,
} }
else if ((pghdr->flags & SPIFFS_PH_FLAG_FINAL)) else if ((pghdr->flags & SPIFFS_PH_FLAG_FINAL))
{ {
spiffs_checkinfo("LU: pgndx %04x busy but not final\n", spiffs_checkinfo("pgndx=%04x busy but not final\n",
cur_pgndx); cur_pgndx);
/* Page can be removed if not referenced by object index */ /* Page can be removed if not referenced by object index */
@@ -1010,7 +1010,7 @@ static int spiffs_check_luentry_validate(FAR struct spiffs_s *fs,
if (delete_page) if (delete_page)
{ {
spiffs_checkinfo("LU: FIXUP: deleting page %04x\n", cur_pgndx); spiffs_checkinfo("Deleting page %04x\n", cur_pgndx);
ret = spiffs_page_delete(fs, cur_pgndx); ret = spiffs_page_delete(fs, cur_pgndx);
if (ret < 0) if (ret < 0)
{ {
+7 -6
View File
@@ -560,9 +560,10 @@ int spiffs_phys_cpy(FAR struct spiffs_s *fs,
* SPIFFS_VIS_CHECK_PH, SPIFFS_VIS_NO_WRAP * SPIFFS_VIS_CHECK_PH, SPIFFS_VIS_NO_WRAP
* objid - Argument object ID * objid - Argument object ID
* cb - Visitor callback function * cb - Visitor callback function
* user_const - Any const pointer, passed to the callback visitor function * user_const - Any const pointer, passed to the callback visitor
* function
* user_var - Any pointer, passed to the callback visitor function * user_var - Any pointer, passed to the callback visitor function
* blkndx - Reported block index where match was found * blkndx - Reported block index where match was found
* lu_entry - Reported look up index where match was found * lu_entry - Reported look up index where match was found
* *
****************************************************************************/ ****************************************************************************/
@@ -1482,7 +1483,7 @@ int spiffs_fobj_update_ndxhdr(FAR struct spiffs_s *fs,
*new_pgndx = new_objhdr_pgndx; *new_pgndx = new_objhdr_pgndx;
} }
/* callback on object index update */ /* Object index update */
spiffs_fobj_event(fs, (FAR struct spiffs_page_objndx_s *)objhdr, spiffs_fobj_event(fs, (FAR struct spiffs_page_objndx_s *)objhdr,
new_objhdr_data ? SPIFFS_EV_NDXUPD : new_objhdr_data ? SPIFFS_EV_NDXUPD :
@@ -1599,7 +1600,7 @@ void spiffs_fobj_event(FAR struct spiffs_s *fs,
spiffs_cache_page_release(fs, fobj->cache_page); spiffs_cache_page_release(fs, fobj->cache_page);
} }
finfo("callback: release objid=%d span=%04x objndx_pgndx to %04x\n", finfo("Release objid=%d span=%04x objndx_pgndx to %04x\n",
fobj->objid, spndx, new_pgndx); fobj->objid, spndx, new_pgndx);
/* Remove the file object */ /* Remove the file object */
@@ -1612,7 +1613,7 @@ void spiffs_fobj_event(FAR struct spiffs_s *fs,
{ {
if (ev != SPIFFS_EV_NDXDEL) if (ev != SPIFFS_EV_NDXDEL)
{ {
finfo("callback: setting objid=%d span=%04x objndx_pgndx to %04x\n", finfo("Setting objid=%d span=%04x objndx_pgndx to %04x\n",
fobj->objid, spndx, new_pgndx); fobj->objid, spndx, new_pgndx);
fobj->objndx_pgndx = new_pgndx; fobj->objndx_pgndx = new_pgndx;
@@ -1679,7 +1680,7 @@ int spiffs_fobj_open_bypage(FAR struct spiffs_s *fs, int16_t pgndx,
return ret; return ret;
} }
finfo("open: objid=%d\n", fobj->objid); finfo("objid=%d\n", fobj->objid);
return ret; return ret;
} }
+1 -1
View File
@@ -481,7 +481,7 @@ static int spiffs_gc_clean(FAR struct spiffs_s *fs, int16_t blkndx)
int obj_lookup_page; int obj_lookup_page;
uint8_t scan; uint8_t scan;
spiffs_gcinfo("gc_clean: state=%d entry=%d\n", gc.state, cur_entry); spiffs_gcinfo("state=%d entry=%d\n", gc.state, cur_entry);
gc.objid_found = false; /* Reset (to no found data page) */ gc.objid_found = false; /* Reset (to no found data page) */
+4 -4
View File
@@ -255,7 +255,7 @@ static int spiffs_consistency_check(FAR struct spiffs_s *fs)
status = spiffs_check_luconsistency(fs); status = spiffs_check_luconsistency(fs);
if (status < 0) if (status < 0)
{ {
fwarn("WARNING spiffs_check_luconsistency failed: %d\n", status); fwarn("WARNING: spiffs_check_luconsistency failed: %d\n", status);
if (ret >= 0) if (ret >= 0)
{ {
ret = status; ret = status;
@@ -265,7 +265,7 @@ static int spiffs_consistency_check(FAR struct spiffs_s *fs)
status = spiffs_check_objidconsistency(fs); status = spiffs_check_objidconsistency(fs);
if (status < 0) if (status < 0)
{ {
fwarn("WARNING spiffs_check_objidconsistency failed: %d\n", status); fwarn("WARNING: spiffs_check_objidconsistency failed: %d\n", status);
if (ret >= 0) if (ret >= 0)
{ {
ret = status; ret = status;
@@ -275,7 +275,7 @@ static int spiffs_consistency_check(FAR struct spiffs_s *fs)
status = spiffs_check_pgconsistency(fs); status = spiffs_check_pgconsistency(fs);
if (status < 0) if (status < 0)
{ {
fwarn("WARNING spiffs_check_pgconsistency failed: %d\n", status); fwarn("WARNING: spiffs_check_pgconsistency failed: %d\n", status);
if (ret >= 0) if (ret >= 0)
{ {
ret = status; ret = status;
@@ -285,7 +285,7 @@ static int spiffs_consistency_check(FAR struct spiffs_s *fs)
status = spiffs_objlu_scan(fs); status = spiffs_objlu_scan(fs);
if (status < 0) if (status < 0)
{ {
fwarn("WARNING spiffs_objlu_scan failed: %d\n", status); fwarn("WARNING: spiffs_objlu_scan failed: %d\n", status);
if (ret >= 0) if (ret >= 0)
{ {
ret = status; ret = status;