From 82251c4450c4fa3c5c96cd702aca5b8fc9ed1e4a Mon Sep 17 00:00:00 2001 From: n2232 Date: Thu, 30 Jan 2014 02:29:35 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=81=A8?= =?UTF-8?q?=E6=9B=B8=E5=BC=8F=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@600 013db118-44a6-b54f-8bf7-843cb86687b1 --- snake_trunk/VCProj/bsr_trunk.sdf | Bin 1200128 -> 1200128 bytes snake_trunk/VCProj/bsr_trunk.suo | Bin 78336 -> 78336 bytes snake_trunk/loader.c | 10 +++++++--- snake_trunk/yav_mcu_bsr.prk | 9 +++++---- snake_trunk/yav_mcu_bsr.sdb | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/snake_trunk/VCProj/bsr_trunk.sdf b/snake_trunk/VCProj/bsr_trunk.sdf index 2c016dc30bc739c2bcffcfc7f84a78d6e36d8066..ec708dfaadf56cf5dd293155ffe1ab3153abe234 100644 GIT binary patch delta 1978 zcmcgseNa?Y6hHUAxBK2@S=d!{l_=f@X*jMeDI(u%1_h!l3z(xM=-?kp>XJ42$*gIM z!f4>y+;p7MteweeKqY&bN;pmfjfIOJ6XZwEWMh*yp<*_UNawvJzox%^Gv~g0?)lww z-#NeEeZF1!zFqn3t7FYYfKO%WO zg!=!!X`haevR0;SHd;p(pJ|yn&_!bKj3~5-07)3#+CJu-(b|4?_|-WWio|97Dli7@ z6Y>MM9F1oCb#5xd2!0>P0lWR_)|LsyR`x^3dT$}7zMwKEJ!R&p+0@1tX47&$Q=6U3 z!r_=UQ?%hm7M;L*vZ;lBUd#W;rm@DK*Alw5mPh1Jk70E!p;df-4z;lvIK8uqP?@ho zmmXiscjVA<8S%J$awVZ(qwPkkM_Z0oj&>b0nb2}^o`&zcABuE$e-5pG(@vLr?du1N z)WIS`F0t(Sa!C<>^1=_8U}t2J_shJRE+PjU4tro{QqsY-!e`X#*uEvU2+P%&(0XLj zdc+F_VVd>b%jeJMU?^fJ6!~9hy!x9UoM7y2TeaVIyNj^E{^#t0=CMht5G4!{c4X2Q z1~(pjKxJ-YJhfhISW%O)HJr$f$>Q}ymBq$!>Kc!6gE{D?yO{G%c|j#^a;mJ4-i~G| zRl=TS=trrnQb1oCe<$Qae}T$e7!N9fi=Eh;o45tnX5c~WpXfT`6;$FC2cubm^9@}r ziysk7YM0ryD+NiLvB+mod8~rQI0ztc z4~}Ng<}o<(q6=~?w|pF7RCm6}I*F8;?wp*SGKE)9Vi)f_?i5yg-#Pn`qt2Pkf{gVK z99*O|ql7b`;rn4vtax+KYp_@Y!#~vo>{6jM6YNq2sRoNc419IP!rX@AyJjL zt$s_p!P@POMl(Mys&<2m#bqUwd2rKVm03_kL5tDFYK~=|(yGkWs_ck)6+&W|WS;@% zJ|H=fEaR+O980`mu1g=|+VCjXPC3l=hA`Le|K-}Rb8QY*8XH;4jk&tsUl`JRT6tLS z=CIzQpIW|8Z%3Ne3jl6^FG?51X}u$gNYr%ANIyDfq+=Q++FUQu$!KkxB$|iTwNau|dt}-%PoguHO7!&Wy!jW|!%ULp z);28nN0s?R{_{v-~)-+A&N`kmNB1NtLwoAo^>!h6{49l1Kb zX9(X`*P-J(hVTow*WW#g`xmL~l9sP>cZ2RP4*Nl$>}L1=Y}Ic`@sqwK)|NxPx+K!W ye8c7kH>6Kito=11J)AleuDc)hE6lG%_!X01iS#RGzY^tFqWy}+uULc1Fz3JgpfM=` delta 2951 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 TA)@@E#AaMV{Fv~spw>SD>>1+P diff --git a/snake_trunk/loader.c b/snake_trunk/loader.c index 78c6468..2b0393f 100644 --- a/snake_trunk/loader.c +++ b/snake_trunk/loader.c @@ -36,9 +36,9 @@ -#define REG_BIT_RESF_WDT 0x10 -#define REG_BIT_RESF_TRAP 0x80 -#define REG_BIT_RESF_LVI 0x01 +#define REG_BIT_RESF_WDT (1<<4) +#define REG_BIT_RESF_TRAP (1<<7) +#define REG_BIT_RESF_LVI (1<<0) @@ -293,6 +293,10 @@ void hdwinit( void ) 追加のレジスタ初期化を行います。 出来るだけ hdwinit には書かない方針です。 + + 【備考】 +  ファームアップデートでここに来た場合、(system_status.reboot == 1) + レジスタの値は直前の値を維持しています。 ***********************************************/ static void hdwinit2( ) { diff --git a/snake_trunk/yav_mcu_bsr.prk b/snake_trunk/yav_mcu_bsr.prk index f13db37..e9067b3 100644 --- a/snake_trunk/yav_mcu_bsr.prk +++ b/snake_trunk/yav_mcu_bsr.prk @@ -4,11 +4,12 @@ FrameX=23 FrameY=42 FrameCX=1320 FrameCY=987 -OpenFile1=config.h,0,206,11,1242,491,17,5,17,0 -OpenFile2=OutputWindow -OutputPos=0,296,827,375,1267 -OpenFile3=ProjectWindow +OpenFile1=ProjectWindow PrjPos=0,0,706,0,291 +OpenFile2=config.h,0,206,11,1242,491,0,6,0,0 +OpenFile3=OutputWindow +OutputPos=0,296,827,375,1267 +OpenFile4=config.h,0,100,100,1125,668,17,5,0,0 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/snake_trunk/yav_mcu_bsr.sdb b/snake_trunk/yav_mcu_bsr.sdb index b7f2720..6bbe4f8 100644 --- a/snake_trunk/yav_mcu_bsr.sdb +++ b/snake_trunk/yav_mcu_bsr.sdb @@ -40,7 +40,7 @@ T=51c8f7f4 7=i2c_mcu.h 8=pool.h [magic.c] -T=52b3e6e7 +T=52b3e79d 1=magic.h 2=config.h [WDT.c]