From 7f0ef5851f069fd9439d20237fe5246012970482 Mon Sep 17 00:00:00 2001 From: Peter Andersson Date: Fri, 26 Jul 2013 19:59:25 +0200 Subject: [PATCH] fixed an erase count log bug --- build/linux_spiffs_test | Bin 209020 -> 209084 bytes build/spiffs_hydrogen.o | Bin 32704 -> 33752 bytes build/spiffs_nucleus.o | Bin 60888 -> 60888 bytes src/spiffs_gc.c | 2 +- src/spiffs_hydrogen.c | 20 ++++++++++++++++++-- src/spiffs_nucleus.c | 4 ++-- 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/build/linux_spiffs_test b/build/linux_spiffs_test index a56c44cc6540b6b5de8b3de12c85f28790ab9917..b239c18fa70471d6b092921b61d8166e03c9a0b2 100755 GIT binary patch delta 17128 zcmaJ}34Baf`@Z)~5F^AAL}Wt}i7gSag+xL^YD*A%kRbaa8$vNikp&Gmag?-0TT)xq zU?Nl~C8aG&OLYrv38GcY_i1SE|2g-bnani({?lJPbDnoO@B5zRo_pth->YhylecY( zJjI)vy!L3vmWTrTj4j!8>r~sKC2Ff^NwC5eEs^$$x9slRDBBo$I_1SsX|!Kiud&5X z4H*OUTS>EK+_sxA?tP4Qmxnei4>`wc=5NwAjXt0N%Fo z(kc>#)nBo(7KxCkztz%JBs~+QSFP3)pG2v^wzyTl#9-lJlX5@6@d1fauhz~?GPbn~ z(@SmLowc^KK1fC+N+a8RN5T{JUD^&7$&^GXs-0V_c-1-uP?3=+ZEWY#DqE$NaOy-m z_f{)ZDwk8ggUVB>4V>y?=RRh$N>N6Y;-9em^I`cn%2{!09z2(2TSI7l+?vx%Qp$HK z(hI8SGDKm8q1CpAAOi8iIpt-E(k8os9X>MGS`4j+ZOcDTlzy^XLvAKYvF$U7b&~X5 z`{QI#l2qK`DOs7M&+qt#NRB2+ww+#fJ)0CP)cpO2ELUD--=5-I+=bA3L3rq7YnWVL z{&SMl%i(Xwc@Cn$A`9DEXtl<5=WPKYI4BB_lBCei{mIKDX<6q8Vx6r2s&i+t8LM|? z?_}w*qZ0{EmTa9ylZa$#rjrwynJg^@#3oB`0n(GDawn%2uO~yDcm@eItEDqeb}iPj zc4iN>=PB(itbL{z+967N7i-JjXuB)zgRC9U5ACL`O)8S5OlN;ml`I`}em1m8O0b|- zG2THC@-dCN7F`{wdN=E)H%JO%B?q4sw^j5|(r; zp9a3d7bABnIYn}GokW_XNExmjf)sv;%CiyXV|ehsEZ?6%1fh~eR1@<|mh(eT<}N=e zEa{^93gEsjxVm^S9W}hI&jleaKlF>Z+~r>gI<6YTRc*TX+9>^v;Kb-IQ&r+MmCzsP zQYubssKMzDtOloZm!CFu8?9=Zg?jxiLOqA2tA@JnPZp|$&0OBy&Ti(Ro_eB$`V~U` z$`ooWSH0Vfhnm0%H@7KjsA-&7>z3!D)aE7Tp|L|}wKh7g)7w4KESoI5M%m=4ie}lY z`xV)AG8Nw6%sH=S0eAkpy9*mcTMv6RunnB==fOiS;zWiA4}A+Ku6c}7O}2BwqkDmx z%k)Q$a@o&yE_XN2&nY^06n+!7ZsX`DaQul;;wUkJhM|3}a>R2{QKXMKxA6EIrGG2%i6`{z`{Zul2fQz<P^n2O4ElHIR20tEaZP>x-8E4QkDzbr>E}}%Ii`kd8oZ(+cYSAYf|t~6vCK7 zk2I-Yz(^97CcPfuOw!Y&?E#C(rZlNtpcnZtO&=Kei%8C-N!@}5kT27unL%60%{2Y< zpspJ7SDL<4$S{#;7wBh%CJIIJJ-#;QH)28)uGdQu-LX7NxAcXAas&l=flPE{#UJ zL}{OA?FTVvFH+jKS$p4Hw5PH*`FnxXWvmnFlr9AU2Bb@K029)s6@b)q>1}{6T{;Qa zoGyJ2*q<)d0Zyh%oyIwl&(ozr2)Mkvk#}L{Lrf7 z)~0Rg^-O8~L|y}BVWS3zCJtBa*K+&%i9D!vobZ{%6U*mB(j=}?z=_gHJnZ$Hs5WYB z;6&Rc?vJa0Zw$A%6%N<#N?@5;}9p_GHQIxiAz&?x%8Z{na0a?gcC!ig$F3* zDz0u^E@SdPeqy#;8$pyf*@JbZOy|}urt<~6A2g18 zQ>-Qovsq_9?L&U;VOqJ1+3ap?W8KJRFSEIg?WwYi*)y`=3$F9*@fsfHEs z!x?s@QVn@m9=t1?Xh*Z9G6gqMm__xtFRd4HxT+^t9UskSpcf~WNB4430$X^qQDFVK zPF1w|Qlv-C{2Pa4AXjY}!8ajtvB zEmrNXZ!}C7p4V%ts@YVyy9e`bP^Dr}dbp9n818%h+%)F<)m&$CCsW#4++ONCuZKGQ zXK|JIdEJe&59T?jvbo04<|Q%nf%Au|p>6-BQBMmRh4#@04WY#zYGjbXeV?75*7Xwd zEu36sb~0=Z;|rmnDe;IDNbfFJI6bzF<-+O z*SPw4IZGPFd~a7n%x`1K|HFWC--Yo?IbX(`%ITBPRSoS!t};8pRL;@_9@;@J`!qog zR8xLtmhzGvI4w_pRv7v$|GYY&eXg(wELIP@w6Z;4PHaD48T98^Jpa)7MAb2yC9UB4 zelu(s$L^}dN&t5@Y-cxYi-LU;`axsqnso@#m{i!aFVx2gYDb<%xsNQ{4=iF zESXR7^PCuv9OPDO>NjDp`E8TZ>t(LEE!oARLGd#vBEWN4m-AGP$_RB-f8<1Y$|#kn=0uBBPW-}& z*{QwEQcS`l8{=aZ9(N5_JecaFx_ZEg8>!|w=anfrUqoCN1s$KTzjIZ`G(Xk$F(;zZ zoK@lpC)TD#x;-^j+G-CA!}wT3Dc?)3SfA!Xo@Poe3wZtNRo<+A_1jRtCb-2t-pMq1 z8eBWVHOA&V;yiDvp8#z(OY;`Ecr>Wq*sZ8qmYQ(YFBkAqH|K<7IM&YXCh!Rzh935QHhxN;&Sa}}w}lrCg;A+}l4gG>j~AxmnS<*oYZ&$WWHhN#3q zPUL0HSBb%#c#+kgbjp&vv%5IkX0cteC~QOMjxe*k?9aBy@^Ls%%MMaaM{v`MZ0;+R z6FnC8QZ+_$V(!8bE`8wDY!}*E%r;*3FjROr^Eg63w~)`Zaoosik#}Gnrk0tJw!!HB zV7ATtk5E5_-tiGxQpO@)hsoUM{zbeFQ#tW;5s!U3C+00y>acCGQqNBoyAj1t`{sTU zwrodM05OLbAfDTd%i&HEIq^x3ms)@%PCUuUCa-7e6PAo6s$drvoPPaoCuLIYQwg(4 z_2vetD7>To+hsFF)#eDd30N^*wfUrx&AWxnM)IC*C*4}nd6II^*y#k@xs6YNl+MmK zGVEQ58N44QtyFBPOB&f!@!rF9E*?xr-P1c#Wv!VW*DLNXan%hve$xGl6PI*T)Kso> zqW8+!9!iIcF=7Z(b=t2)5CU%FA}PRv?;UCrs{CbOK1HzTKNvz(e) zse9MV+!5rpENMrsk6Ic#&i{~`qY|As5&gzEm2l$3@i+J}#g!9H*W{}j9-P>|X0%H5 zc%{z8OF!W=T`t z&Tn~>XL5)WPv7MGg`N|`iWJKgMclHS^QVe7MI>UItf?$xGe^CHuFd@Lc$>?rHYe%S!{ZCH9oTv? z4v(QPDzH-s#^d9O-Hkeb)F|4^iyBV6YgRQf_@j}*JBwuLV=4My&g@=rWjwRbGM?GP zig|8A6LnqX6!U{IzXUYl{13&`$;vG0i<16QN=aw69(}n?Dj7(EvLTC5`5Bz|+=4r? zg;LCxK$U;M`F&f~5c?d-m#$R#rcKqpPf`A)qy;Bzwk{`~bM%E<;|b}RBR$&|;nOz< z1AR74men7Yzj?);VQ00$BkJLhn3eoz=u}S3k+QePl6g7O_uHqnU&U;%r(%1{#W>`K zJ{BwUbEL4+AX1Ve6_iGkT{%*1seSK5mYxQ~qWl85!pXH}9du>%H#t(@w_Qkejx_P@ z9<6Fw2ZbpZGHvCv9DTvtGexpzi~im_pNXWpSUR}lK6x%lZ|&?$ns3p6vGWWea*_Vc z_uGi1_D%h+54vfrjc)-+UzS}W&kFV1K5VTack=Z6_qVYk9oFe94>c1>%e7L~$4^M7 zHTsi>9YyjoSAR>to{-d4`h;USB6+Hl?iiMm#X9}$@>wFWUm<;RJcE3&T=J=SM2;=f zyPWVA$(q;o5hp_kd9g^p<s>Cmh-7@K zKB(#;Au&n%-j}u!Vw0r*{L3PdEKShQyo{&&gX8t3SLSQT`WQXA9w8F{Xno{2e`rY2 zY$^1+ImCOme)o6lHDty#z2A>d3E4kY?^WHIkg!Smk#}ZV5#I^=_wL#>AwRyR|M=ld zLROB_xBA_lkhoC2=i|#wwd`oi9xYuDlEnYcCO-v8G5>u;0t56BFXl8OKlayuEZb?w z1z*DjB3>rsKi-C|O+=z0PkI?jt;INz6!bJ$X~o_mnc2h8uZ1{NBu-v5!$y2gJUk5v zEyd-8>~W{}Y{jSKu$$qB)?zy=vdF{mr=9qyDcR*@sO~IgizM2KPH_^ukSmUcB~D^B zymdCrbP>l{5u1*5Z#Qu(8QsPZ;wBCfN$b{z74D)ZA-CGlvhLy*vZ$>g$Wt6iNYfUE zydL6jqU%04cIX_0Su@$It&#N{0p^w@3u)?6Qu>8=Qc(de{Al&~5m)Z-VHO$k6Q1;8M zaQ`pm^j%~7QRw6R&}XVmdYIxT%#%U0!U#uO!}3>Bs_ZP*NbBWpZ9C%GaenBp_wo1y zC--Mq71AlWL+{+>wSw|)%BymMmyXOQg>GkMRy>UAc+YDnl~+uV;7vQ|3%SJ@VCv1#)fQB^K1u@O5- zMRgf1GXGZI*QqKDb1d-@our7PO{AaeI?y?RqP29oF2Dm1G72Yp+J1D!*07M(9tCx? z{ph@SMXcHoQ6IKpTpc4N-G`lYy|7;)QP#y0>q2CVmn_)ZICXKkFXU{zrxRMoevoTv zneDOfkgc||GuWCWe2>cweI??R9p0JG;7@H=2V&b|-QcaFMa+elrHd?>g%#=$Tg3cw ze@odkMaD!vv7%s_4BhuhOfNE zIZa8sYXt^G&0M-JK#V6R zlMIgoL=7R&7t!a#uqG}oqAo#VU$S+PVPcRtfRN~HS}_p2( z(U$XpcPCJ*SaCQhc#np~igPuG=Bgd<_h%iCq_%NlutO0(VfiU;H^=7BcdHKD(7W3J zS7Gc1cgF!VE>7%8X6~d?oR~=R`qTP2(VP6d%itX^2Da8UkIjskGcPUM-_<=)D>Ssm zdj|_#G$%DCM-`{UWM$8Z&CE<&;P0yF&rMk{FF6Yh_F)d|W($!rD6+!H*8Ip~~#hzWe7S+o|_AiY+2hbaM8dwUf2EGpzu+<#_x&j}+4+lWu1K0yU+zoqR?uW1kUfBnGVCF&C z1MeJyeRDzRtA{;s!77?nhbQ3x=voN}z-hqKKnkn|t~(6}s8*-5Z~z<* z3<6#{2YcYP&tMPy&y{+)4A}H)y<7#{{Y|}G13U(_ZXpP*zpa-&ffult!*uwv9h+*c_g=sO@Td$2z`sOUE(4AuvRnlmrjg|u;6*E0 zwr+)?X(G#>z&XvZZ363?%W?v6n~f~z0o`q34}7OB?15z+VGrzM4|}{JwYU@PfxZs1 zP7cGD!p?92bajLS;89>1aF7!m085?W0C*Z`-C7X70eS-ayCMLFU0@HCfO$YGH`oI& zxx*f~yF2WGxt_4c+hy*3WZ4H;+(#$N5%^N!Bg^T)ZGC0A2gLLFG`_T)FUu=|39+)g1GqO`mQMpuXUlRmaK%DIj(7a};?BhrxMwLk2KIa%9RoiA z76ILsp=02y<>(k#uo@i$Wc{unPG8#~3rn z2Ll`c58=F31iW<|fdhZ7K;XcSPoQIVP(6u`ful~r4*0ARcEA&-Vb=-k-}4Mg2I4#5 z6=2j^lni+597^VZ+4~tv2HbHGB?k_>gpvcl#LqfK!1Xs^4}2GAzbn8O_fRq5;Tlw| zGbS}&cO3+De}swwqkl)mfscVZ=yhH04e!qh{tOQ!WNBtQVd_ZR~ zytRieW!QW#-Nvx{0b0Q@^bozpaGsvlG0Zti9aaI0j#7VyA04GL80wDEr40Wpr`s6T zmD37_^D5{qhGS09x>d+?`rE$kng?2kbH1LWf^>|Zn5>xAo2(BhWpjD>@fCI`(Y6GLb2tgVI)nlxc4unJ{EUT!VRYb`QdWy-J^ za%UXFUbCoBh^azHARncbeWTDFNXXO&9y!vzdAOJib)pv;4tJps7!p^i%?HkPr9Bu{cA=vgw(CZd7{d)|IG@Vf>dUQ>Tk!AMQplNtD2bF@bgpc6wzipvwKPfF(W!XZr z!fnDi{0=eGVkJ*8tzSS zfowN9cmobzt(EEPtHe$t-$x@YUzXXMyQbbW@uq2V4)TfuS;iZX4RTVhIAc}&74oTt z^y>|%+LbqH-3C-)+a~I;5%|+)>d!D)qB9sKmC&UOua(ek48yn3ijAn&SSri$7XIg& zg0;gvjRbjwg?x-j?g#l<$R}CI$D8DlkpBnrpDgnG&XiwvTVaH71h*(xEgXDda!?Eh zv3TXe*Ib^eh?R05fqd~cwhSEHujBi9=$^HLvgv?(N;yNZVm*UAh2DNs?2boM&5HmI zv~Q81zz;(?kIIbT2K~BsxR*A!Ebn=Zw8@h(2I!f7*OAn%7U#9-Gneg-__{%@~mv zU&wNWdBWtVsUYuT|J(efET>t>6HW4SkXJ+A#G(j-=^*(l1Tsu@1zv{un(iJN!!<6^Lf!p3#47YS)&Ow^bW zHOO8hr-|0c2l>)f-Xv7}F;A$AFTLVTx@&`c)t;03QPGFY(_ZK8f&FNj59z8+>Zi)H z{pdCyvP}CmZwL5M*S@5SHrr2?2luCA`jP?KD&FqepBDBd&f4Jqs=TN_)%PVK+9KY* zF_4PB zpAfZuIfPmdA<^2)yge(NW)30y`WQl0`5Plue1Su6hY{Es#6!oGfu1jPe8OejN6|4u z$?86?VXE#Uj%7G7t2XydHpj=PI^pB#%b~B>M7ruCkvw)0}>*MTHTo6XxpV(6e@ z#J$fR-flNb)jNy}phGeq4T-g)8szxS>mpUzr6^iB472mjWVL-hiryMV7HdD6rna9= zr!#|ygSNwTwY_pW)di7J+R~Y7`#==E5=44x2lKvq$IvFh@Hc_C@yI_in7C^XG_-Sr zNs2ZvMztS4m;Mz@25X1URojQ=(xJnV6CS-QH8>hacMT_dwX^4Oc^sWGg1GnobH3V+ zj#Y6o4h=4uf;dg1uHa~)vr%*?j+TwU1kUBEfpPSk5u~^FXq;+V6K}8yAu~govAby^ z=;)!T#Gbkq5l6$WJkp^FaVeq`77_>dQSAj{B{q#~`o_D~CwH>%nhDc1zSe!LZ&<&} z|Jz9~Y#?uvl)i>(8;LI=wL=Z-i^#AU9g3Zme9*z7*2eE8&W76$$n#c)n|~2k4M~_q z>t2yQ+NuOKu&M;=`!^ZTrkb~_6GX+wM|8>G#9Q0&e=tA~LrrU~Q_ZY(h9`fM^MsI{ zB^8)@8I|666(-Q(}xr#7)CeK z+_fHU+%B(k6LzyegqDJFo9vVvI@W0DD8fSRWR&!otm)OI0nvoh(oj~h4LgjHh&9v9-CfLFq zI%#G*7`NP1)uS*RuG^w3Y`L2uC%7~`>7!b#+aS|y)$>0-H`9+dEnjqo^sDQx6GZ{;rK)A59QVc9^#r6 zp1ZYeB~f5MZKW0WPBu)Np|;Xy1S)LW3~8@;&u&t3w{Le&pFU?wtHPd1w;Mi~;aY2s zZVjnbiwqvG+gj&_Sf@NTPzWhK9U3crQukH;kT|sRN4*QlyHPwiPMTruMgSYFJ++EN zVRhH7Yl|c*PIs?fGm+%SNgwJjAq8>LVw=MH66~MXC@KUTT^%R2wRK^VLAI_;FWI&= zYpu3DNVdmG{TkdQU&QH}H|#2suj8bMMsD>>RqM-u;u~?&vPQ1;Z>iK>P91C1s{R9& z`h`=kKvk&JOHMVnYc=q-O8u8nAMht6?|ew!_eHEY70>>VWgC64A$H-ZnNy0ycqT1X zMb{t-$qz2K(FYKSr$-jmj+a*0`8TmK*O~#X=M9TI8RnY`9lz5^MWtO=FGV)WOLO3u4>)9qqWjsUrr2YK1L<_tAy@A^9|zIsv4YX z!fJ3TXU-{8w^6F5S*W)jBh<54x@xGO{mw$Qu$jcW+uG7R)RV83P_H7?tENz6xa#AU zJk)qjxVep1LrvktBDY*ur8a+I9vVAzQEQXUb=tK`Fw17DUA1g-RYkLGKKm8fG&L2z zo0)T7&BfgLt5&XT5N+J;)xef=-q)RnUciZTcOLp`PTX|=ST$MC3HR2E)m+BCtd`4u zu5+!mc`i2^RLkXSRnaV$M-P$96Vu47c~Rw@=fb8sn~((_N-ke|@LY~@{yPtz%Slc& z^5nUk<-~N)eQM}Wu^j#}4Bv5`-d^URPqe8P`U6$bEcEF=A@uX6&^^qY^U%vxo0V;p z$eXv}k^jQ`3~s|Cf6R%THhiwX;KbuLd1~bADyl_}O--rGvbGD%CeWYOEOLugSPLPd zfM$```w@|EFioISPndHHn>wnE6yMH#IsCWcUsf(Q7A1}Y?RYjeoOs@jk3(Zl3~uj4 zen`|MweKUUSw%dm>XFsNnE>Yk;DQlihm^0k^9=^W1hs( zNB@#UC$9S3hbPg66P_J-61_N)-@%CpNxIKF7?W`MxvFEH#89rQ^;MEs=G#PFOJg~I z$hUE{vM&T-_WvX3FjdDa(ebyDXgo&iC`Mc;W`9mr?WUjn{4eQ@=N)%R70qHFaTBo@fG$z;t*JP- z*mxIIvvFlM5upDiUl*aG=THBV@Iuv#6z9(q&gH~T|Iw|L>&dce{dD^lr;AxQ23)k! zUoXl^l3H}xO|~TIE_F!}i7rX%-mNXUlq4l|8$cc=>Avb_C6YHu(y{JIq`?%)qlY(f zn<9gjh6^g>9NOBK*rwpcW+oa&GD1{v z+L=l_khS+sLVFBrlkq81^FhvJW{MO5Se+t80=`U<<^ryyNE-n^rAWsCuT!M^0P9rg zJ-{hdYC71Nc&18S20Pd7nhLMiX2UCy0tee!4`A)ExoH0~KuRCj$U2M>C5$+$60wZ< zZ61i7Dv`m6WjP=gsl*aScr5}Erx0XMs?=bJGbu}zd;m97rJ;bAsZt7{cAB&l&@4^b z4+uz;E&-y`q-TJ6X;Ph`&SZU>SRo4qGX)1;iCecg9}P!B#u z=areOo+h%I7b&W7T=m7!j;d_}C%i)4RU(lS5uxo>VhSf#8#R(SQ5M=o)kx)p^)T)u zjT60wag7X4EHG+J<;0O;om3ywIq}D^mMW3S3Af=xo8CuK75i|i$_p+#THCZO-A|L2 z4Cgga7B*^dXm}shei64f4Cg_8#tEMhJh41ZB#z)3i#f4j1P^-&C(4Z)OF7YSB-dEZ ziP0mu54QWTvB(|C6I;oN3nO`A><*7RX*o;m`(OTCRSM=v9rpXD%!VCDW5vlfV-TZw?mIZ48O`UxZcYS_=85d##MIH;WG^QU z7&Z2B;-}HP7za4fat!xzkQ1ZEaE(KpSZmbyk`tH4@N(%mVLg_Y>j)>hj~&`mDOX{6 z^>P`L|M7&`Zf#8d4EInv*44eLPHR+Eb$J+7*`b|{jrBO5G&^uHqTe_^tuAt+a2(I^ z5+}|ZO|GcK$}p~Ql`C`%<3+g6iAL=_ncT3 zKFb{0_gts$gs#~in9jX>Oy@GYA2g18O{^vi zvsq^k_94He?)#hQlooA}Z~mw< zvy)*R7?%d)a)IYnvySqZ<6{EVxN^AdS21mjG5(q{vQUE`_7M3%K2BEshmFXE!5CH=PDE8P37DW&qF)NWoP2$UTVs3 z%~GDZ1*hdvZ}WrS=ABmuwEcA!fyL@!msYmt%L$F6l|lali{~FYCsZA?SyCUapVq>L zanv3KRqvaawR%-Yx zTw`p`BhK@t`U%ixvotr=)xApf`(28vWvK~Qy^_jHU567+X}q%5oJchiHk>$<)|Q1{ znbxF}l9HXun}zPZ7NK{>yvKz(=bgrQVrar0bWc}uk4Wby0SC^{OZQi+>BNa|(wnP< z3nwbmdA(gZ;gG?JW}FDhm`}perP7S%BsE=nmf=7$)1{hIy;VP*xK`lQ?keHWiQK8t zD$$h_@1}MlGt(vSY0X_ym0hwRWNGl05VO1NbE{?fD4eHE3s6n_a?|2z+*dFsyr#ER zHTrR4()7Nr%iz^)7g|%uHeU8HRCpeK6rrD;&ga@-Ze*3|-7Cz}NLyv}v@6?Y{zs^1 zpm%h8x|E*D>oAJ@+@HzoFoqLvGI{LdI5ByKQipXjlzN_+;YJicjqCVH*s`5i0mLj` zfH-b5IEy<;;KYe6PqhGvoOqozjoeSu#m^i>RKYebIQ7Znrplz+rxIq9YWY&BVCYA> z+q1(()#eDd={a|tYICBR&E|Y&BY97-lkUxR9HHDZHa*66ZsQXmrL*(Z4BO>n2Jc5n zOB9>(Rn=_Dc<&+EuI@}n-P1p!%33o$u2eP3YAoP5Qlauir{4-ZSJ}*Jd>1k25_@1jeW(E8^7dbg%pHXu)IWg)p-eCwQwtdD;hH%0?mv=aV6SH%b4oh=owX+z` zf1AfG6FD(@@i0{*g%i5Pe520b1j(PJYGiRDH=oBhhZ7I;GmxEb)Dn@em;x@Cv~-MW zTF8lWOS$tkoUmIqMb+5Ci6zUrsKjCZT^Ct^dgkHdoS5dNu%^dX(j$e{5s5)lT`(~DMhExpla;h0z z;!ZcOm`iS|XK}xkZfZ_Ha9Q-q)<)U3mHhDdkju(eCT6RL$9HDicI_EBJO;lj#!ev^ zkB`T8RqOm^wP>$pR-Jek&aYey6!kA>c2Br6p4rD6&+H+EJU5|+x~{Sc z`N5c90%~ynhr)5BJYBlHs*^Njm7`jZ4qPU!@+Vs|APZIbFwT3d_9szOrHQM1sr)m} z?_0f)WMxVn={%LMSyS!%B;`*^>T<$*%^dPcrY?U?93lCc(%W^RJ}WXY(BGuUviimH zcOTd@?5Pd#htISE5(whnNrAx z0P;tsw0J`lAv2^G8|>TJ&am**6&6LU!R3#7Vb(zlMt7Pab=c@i0%l0VH+t0{1f`1n zDHt+s$;cVH#T&y#Qg@Z^$)*Bx863Ljk($D%?YNbgX&p#&)sXEtESCJe}(gl<~ zC*)kbuHB_|grvpmE?g-P$%9y3_%%G;-x#CYa6MW>DkF8|R;WleP0)?}?l%p28zBYX zjU-ZpZr9x<8gg>9&hN)JgxHSOd6qj8vVWMa-_PMzWc5(p_Q%#WNMMNW%je;Q{2HvQ z|H___i+yz-mDg%&F>#bfOI>yTg{d8Z-b{f*AgT9oA z*9Zw~uU}I`BpNchjebLIF;*n6JoQ#uv7JatJoLVG#U3J=-#;v3SWrTzz7v5^(I=cfPNPJCID)O6C9JBrgpa@LWKb{3lxKS%vcXR#dKn(D({ z#lco2tufu(Qd~n0+USGa#4aM4R$o82mFPi8FI&2&wYZwxv(*Q9i2VpjtfSBM5+8}p zY+ABo{|CHXQo$aZt?gpb9Pdk)wiTOM2ZZF!xlOr8&d@U$2zrNQjGSwJO&r++HP>=!m);QlrE9kmS+J!;PEG z7o|Zh_hgit)tot%g7TuuhoVWAt7+8_1{?_UgDZ2&d*fx6hDC8R=*4#8=B#K@ZDi(C3j{^Ag71_5??6N^QXolduhh||cP7@FQ+w5PxI7wgep z{oy)PVWP>iXp^J|DO4J*^uq^;D@5|cBvthHK(QOi<&9y3#8u>UG_4qf1Qv{#7U&bSeiUeOd-Kh^v7}HQ}X8sJ%md|a%sGNOoZ6VitHFi=SGR+NdIyAyHVoz z8j?1O9*)NHwC_(pj{z_9zOIscHr#0inHsr5u)HhyCARhj7Q@rR+vUljO#f!ac z*^4fsqo(^b>^AJFYQRc^T!7EF3Jr1*@CEP=u*E8a{0_JsXpi-97uW^(aJ4}m3mi!e zau%=%xCVG)E$o5YHo_iQZ<|3DY6-#+U^C!SU;r>XaEC#T!iR;xdBC2?bqjDP@D%Vk zupD?6DBx0Y3)l>3yBiLG&45wB3wvM>+`bR?z{&%#2d+E>dmz!lzK$Ra`wI5JdDsKrl)@g^;Zg&#TQZ+^*{EbL5>GuC^yKtz+u0_0WkG38~}@e z6+r(AIKT@eZJ)vcaMm+80Cs;4d*Hekum@(mggx-ZE7$|ORl**);&<5B6NE=^U=Qs7 zU)X2kL#@By0Qj9K%ela&Rg!9vIvJ_P~>Num_ekg*|YH1MKnc4t0b*aJZ8!XNTa!K4&-p2Drch@H^lh;8<5U z03L4!2f%V*ZCgS31Ly%9)dB%9Yzcdy4wwscbB8_fd284M&wIiixZMl(c<(9LN0xnn zM||XLITRo6b(G~aV6m?(7XZ8Y$?_qfzLP9p2e$E-`pe%<1 zFZO{waC1M{15bp&9(b=m?12#jU=MsY2=Jve?LAP0x|v!N(L^2+#ZE>T12-xy2?18f@P%&U8|f^D$2Zb-4EJxO z#SF_f(R&PwHqrMC1Gi9z1wdRkyD{|GNy8ZK-A!jPeE&IJ$Ix>>EoS)f7xW&(n8Wlv z!BYbNtQ@%6EBPgLFBSEHUr$Jr@dA7y0oMoDpg^;(#`T7qF`%07j5y(G4KE%Sl zztKKhxCI5T2L}1Hg@fZJ2X7(21bL)|gD|55!49VrEw0^nEbMQZ?EN4=1Nkfq`{~>s z2Y``KaQgXwMkq{!e84XTd5ndF;idozA)k*!!$^zq8fqG^BanZELqxR2a73!Z!4818 zpztS76(=nej+(~nE#wrZimRxEX^1ozYO)mB&R~Z&pLgA&Ugwr5T#c?Iyq5_MmDggPtcLq7e!amAme*|*ZKMk^vMSyKs zfZ0k0x1ivSW6)*`g>|M3-a>xxZ-dNU%dM&aHOcL8K=cxDhh-sOWRm+qzKY25Op6Ln zLxr=|5{`tzE1a{GyMEK=TcZX`fmLW4&D9BWyBap}8 zoOaB@{%fUwwE|Ee^<;URg@chM2X7(ojsxB*3kL!EO=Wo-+slpfg)GX^Xg*?dh8|li)+6;? z>BYskm_)eJXACDbr`mjAix$+2;er-)0K=bJ(nN;7t>|KgpSjb$46WMGiwsY-r_UG; z_o3P)z*>IPi(!qz!{rw&Vj0Xl-HfN&Wx#d`)QjPg z1Ui6WP!dgKcsP|VW|*2m_cFXUjb2=aV^+Z|Sx!d*O@-4;smm(M7Md0A6MkJN%i$I) zd9-OIyFu=nE6e+#YqBT1O|u{f@_mrwZlOv(ND(Xkqiu1P*#Lzt<_cuJ$-$>^;FKrR z^*LhGeml@umM_cfrBYLGnmE%mIScu{C9;f{^Qz>eNO8uh_ABHwmeSYDQMJky)S&=X zD3)k9hK52K#xQ>soyBl5rRx~Jp|qG`>Kb~l0M(kZR+i%|{7*6kYloW}9ps@F@_{C~ zALPG4KEgsi#3UaHc@un@|G*-@yQci6H5B>^w{VYg!@|L3lY>GyShzu!JDSUr6|qw8 zBaqV#Y#BJTx`oe=q3dC>3Aa=(bF5fzA+Mz3O0l)LfqF97M2D>uUBz6QjuvURovvGn z!bEJR#VavgKiMhE>>bXkf!Sl4u5WSER(m%klISk(rk)bKyrumaETjnxDrg>n^xH@G zN}>yd7Z`h)K4t8{FR8W=>{04ji00T6bO4%U;7OWTh!L56MV5=r6DD7o3bF(HUz4k{ zoMItQFv-tC9u0X7EAzkw(?RlA$oqdQ%f1$gwKpYZ)dX)+MBStfSBdU5%5KUs(Fd*) zpVZcet`gk{_1Gka5|23jtW9E+6?yL@-4L5Nv_)4$$icM>dp&-xdj~2wudbQ+KP!yl z(C(`EgBKG^*R8DdqqmE5rV>L#`dt&^s=dnXWglwmMP})1UC!W)klM2RpvvLciY_9XW1U-NES zOklcryI;|bXmK55E3W0uD7wy*xQg+#*pmb`FlJ^G}@DMZ1%?-}=&TI*=gkTi)*8nKtN1HfneJsrqL+(V~u| zrM7!#wO!#)A9W;4v}btxia-6t7xD^!RsKa6y2ls(+H_Idge2Itl3*L6>N>{TReq%_P4^>xwS#zjSyy_}k2KR>;qB1ww8D?%H8j?5P^@aVwhJ3+cUrC`i}k*p zNdt}6sB*Oj9nzH)Xs`BARX6mc6G-4;@t}iSW_rU{xnSn1=Tt3)+9$Pi+tTSj9a!D62M4 zO*YO0RGDrNt=p4$YTxtrg@LqJPvWKhWuPiQJcwrW#8enCSZ%KyOt<$WZranlJ#Q$z z(UW|ooi|jKOQE!&7YWfyp=$d@B>lM;iO}BR?ah%iq&I2RzV0wpJ|kSk!?^G{B;lEm z_(D{J9OC$VxGM7wr|WxTdiEQsw!OmXv)*Kew$T{1J$5Wj3Lp;JS-k!07`i-we5@71 zRC$ANS{^{!XgBh{Rz%Xqf$;YgZ-++G=s?m++aN;KM_URcQ?xH4)%LC^TBi@`s@)Z( zw(*#IP#@%EH&JajjiHD8kiFV7ylodlWBZa;?M6*j8nIl6KmrF{+C}v3jQ<5*}1*5>8e`$fl>p5PRBw8FA7d&LvH1*fz0v@goJk2Uo9ZL!}lvGv9^Bjb8@M^zR7#iLZc}Q7wPq4(wK(+P3*NE_{V1U;}J(Q{wAFp1n_o1oT%{a z=+VE4x3=ov-RWznX)9){W)-vb9S!6>A+NWrdavm$2GI_prgxqAG3;oAue9h)QR7d3 zr}VI>=|%4A=xd<3o^~Lb-ePx}4j^|3Jxn0Ia`6u_&2epF?z2?n)4#N zpuV=#^wW@lINHq~DxtCTu)Ss%!TufAR5QWBxZftL9)&(|-4I=2zx@_+g6l#@2Td&T z(9m@bn#TnD@&ZTr!KU%v5yh|Y*Lyi(iV$2NCON|ZEANc6rXQI%RIhc>9B%l3I(Em( diff --git a/build/spiffs_hydrogen.o b/build/spiffs_hydrogen.o index 566a38aa9b573d844d9daa8afa0ac6e23f2dc8bf..f91f2f229aaf4ace371ec2582a6d94311e117465 100644 GIT binary patch delta 4229 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 diff --git a/build/spiffs_nucleus.o b/build/spiffs_nucleus.o index 4213a77d9ecca8fc3d746cf46b65e023d794c488..293a353d78509e8feb84219816c8911c8698baad 100644 GIT binary patch delta 23 fcmca{oB76V<_(419RL5P9e4f5z_7WJJN^*>l1vMS delta 23 fcmca{oB76V<_(4191IL;$6f#Z|G&ACJN^*>hFA-S diff --git a/src/spiffs_gc.c b/src/spiffs_gc.c index b21876b..9a225df 100644 --- a/src/spiffs_gc.c +++ b/src/spiffs_gc.c @@ -20,7 +20,7 @@ static s32_t spiffs_gc_erase_block( fs->free_blocks++; // register erase count for this block - res = _spiffs_wr(fs, SPIFFS_OP_C_UPDT | SPIFFS_OP_T_OBJ_LU2, 0, + res = _spiffs_wr(fs, SPIFFS_OP_C_WRTHRU | SPIFFS_OP_T_OBJ_LU2, 0, SPIFFS_ERASE_COUNT_PADDR(fs, bix), sizeof(spiffs_obj_id), (u8_t *)&fs->max_erase_count); SPIFFS_CHECK_RES(res); diff --git a/src/spiffs_hydrogen.c b/src/spiffs_hydrogen.c index cdbe089..5854c70 100644 --- a/src/spiffs_hydrogen.c +++ b/src/spiffs_hydrogen.c @@ -693,13 +693,29 @@ s32_t SPIFFS_vis(spiffs *fs) { } // per entry obj_lookup_page++; } // per object lookup page - if ((cur_entry & 0x1f) != 0) { - spiffs_printf("\n"); + + spiffs_obj_id erase_count; + res = _spiffs_rd(fs, SPIFFS_OP_C_READ | SPIFFS_OP_T_OBJ_LU2, 0, + SPIFFS_ERASE_COUNT_PADDR(fs, bix), + sizeof(spiffs_obj_id), (u8_t *)&erase_count); + SPIFFS_CHECK_RES(res); + + if (erase_count != (spiffs_obj_id)-1) { + spiffs_printf("\tera_cnt: %i\n", erase_count); + } else { + spiffs_printf("\tera_cnt: N/A\n"); } bix++; } // per block + spiffs_printf("era_cnt_max: %i\n", fs->max_erase_count); + spiffs_printf("last_errno: %i\n", fs->errno); + spiffs_printf("blocks: %i\n", fs->block_count); + spiffs_printf("free_blocks: %i\n", fs->free_blocks); + spiffs_printf("page_alloc: %i\n", fs->stats_p_allocated); + spiffs_printf("page_delet: %i\n", fs->stats_p_deleted); + SPIFFS_UNLOCK(fs); return res; } diff --git a/src/spiffs_nucleus.c b/src/spiffs_nucleus.c index 3894e30..7390dae 100644 --- a/src/spiffs_nucleus.c +++ b/src/spiffs_nucleus.c @@ -255,8 +255,8 @@ s32_t spiffs_obj_lu_scan( bix = 0; spiffs_obj_id erase_count_final; - spiffs_obj_id erase_count_min = 0; - spiffs_obj_id erase_count_max = SPIFFS_OBJ_ID_FREE; + spiffs_obj_id erase_count_min = SPIFFS_OBJ_ID_FREE; + spiffs_obj_id erase_count_max = 0; while (bix < fs->block_count) { spiffs_obj_id erase_count; res = _spiffs_rd(fs,