Merge pull request #923 from DiUS/spiffs-alignment-fix-915

Ugly workaround for broken SPIFFS GC alignment.
2016-01-20 09:48:47 +00:00 · 2016-01-20 09:48:47 +00:00 · a4e7885a6e
parent 5cbea0a61f 58427563ed
commit a4e7885a6e
1 changed files with 4 additions and 0 deletions
--- a/app/spiffs/spiffs_gc.c
+++ b/app/spiffs/spiffs_gc.c
@ -250,6 +250,10 @@ s32_t spiffs_gc_find_candidate(

  // divide up work area into block indices and scores
  // todo alignment?
+  // YES DO PROPER ALIGNMENT !^@#%!@%!
+  if (max_candidates & 1)
+    ++max_candidates; // HACK WORKAROUND ICK for sizeof(spiffs_block_idx)==2
+
  spiffs_block_ix *cand_blocks = (spiffs_block_ix *)fs->work;
  s32_t *cand_scores = (s32_t *)(fs->work + max_candidates * sizeof(spiffs_block_ix));