From 065d3ff258121dd6a7fd946e7bef0f2c6c774d9e Mon Sep 17 00:00:00 2001 From: fujita_ryohei Date: Mon, 7 Dec 2009 12:14:25 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC?= =?UTF-8?q?=E3=83=88=E6=99=82=E3=80=81=E5=86=8D=E8=B5=B7=E5=8B=95=E3=81=8C?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F=20?= =?UTF-8?q?=EF=BC=88LED=E3=81=8C=E7=9E=AC=E9=96=93=E6=B6=88=E3=81=88?= =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=81=AF=E5=8B=98=E5=BC=81=E3=81=97=E3=81=A6?= =?UTF-8?q?=E4=B8=8B=E3=81=95=E3=81=84=EF=BC=89?= 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@41 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/loader.c | 3 +- trunk/main.c | 29 +--------- trunk/self_flash.c | 6 +- trunk/yav_mcu_bsr.plg | 124 ++---------------------------------------- trunk/yav_mcu_bsr.pri | 30 +++++----- trunk/yav_mcu_bsr.prk | 7 ++- trunk/yav_mcu_bsr.sdb | 16 +++--- 7 files changed, 39 insertions(+), 176 deletions(-) diff --git a/trunk/loader.c b/trunk/loader.c index 969f5d3..b48daaf 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -91,8 +91,9 @@ void main( ) while( pwup_delay1 != 0 ); // u16にするとコンパイラが怒るんだが…。 } while( pwup_delay0 != 0 ); + + hdwinit2( ); } - hdwinit2( ); // ファームの整合性チェック // { diff --git a/trunk/main.c b/trunk/main.c index 54921f7..0bb0542 100644 --- a/trunk/main.c +++ b/trunk/main.c @@ -35,45 +35,22 @@ void main_loop( void ) // 電池投入時の１回のみ RTC_init( ); // 内部でリブートか判定しています - if( system_status.reboot == 0 ) + iic_mcu_start( ); + system_status.pwr_state = OFF_TRIG; + if( system_status.reboot == 1 ) { // システムの電源が入りっぱなしだったら、 // マイコンだけが再起動したのだ // todo - iic_mcu_start( ); #ifdef _MCU_BSR_ if( RESET1_n ) #else if( PM_chk_LDSW() != 0 ) #endif { - PM_init( ); // 電池残量ICの設定 vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_AUTO; system_status.pwr_state = ON_TRIG; } - else - { - system_status.pwr_state = OFF_TRIG; - } - } - else - { - vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_AUTO; - system_status.pwr_state = ON_TRIG; - iic_mcu_start( ); - -/* - // リセットだけ、かけてみる - PM_reset_ast( ); - RESET2_ast; - FCRAM_RST_ast; - - wait_ms( 1 ); - - FCRAM_RST_neg; - RESET2_neg; - PM_reset_neg( ); -*/ } #ifdef _PARRADIUM_ system_status.pwr_state = OFF; diff --git a/trunk/self_flash.c b/trunk/self_flash.c index fd14c4f..fc200df 100644 --- a/trunk/self_flash.c +++ b/trunk/self_flash.c @@ -190,9 +190,9 @@ err firm_update( ) if( comp == 0 ) { FSL_InvertBootFlag( ); -// FSL_SwapBootCluster( ); // リセットせずに頭から - FSL_ForceReset(); // リセット - // FSL_SwapActiveBootCluster(); // ←スワップされてしまうので、続けられず暴走！ + FSL_SwapBootCluster( ); // リセットせずに頭から + // FSL_ForceReset(); // リセット + // FSL_SwapActiveBootCluster(); // ←スワップされてしまうので、続けられず暴走！ // 戻ってこない // } else diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index fb3b7cb..3e60349 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,131 +1,15 @@ C:\WINDOWS\system32\cmd.exe /c touch magic.c "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no loader.c -loader.c(105) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(109) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(112) : CC78K0R warning W0401: Conversion may lose significant digits +loader.c(106) : CC78K0R warning W0401: Conversion may lose significant digits +loader.c(110) : CC78K0R warning W0401: Conversion may lose significant digits +loader.c(113) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 3 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\loader.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no pm.c -pm.c(193) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(205) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(209) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(376) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(448) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(874) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 6 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pm.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no i2c_ctr.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no main.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\main.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no magic.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no WDT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\WDT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no i2c_mcu.c -i2c_mcu.c(119) : CC78K0R warning W0401: Conversion may lose significant digits -i2c_mcu.c(196) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_mcu.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qx1 -sainter_asm -zp -no i2c_twl.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no ini_VECT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\ini_VECT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no led.c -led.c(422) : CC78K0R warning W0401: Conversion may lose significant digits -led.c(423) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\led.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no rtc.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\rtc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no vreg_ctr.c -vreg_ctr.c(68) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(115) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(116) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(118) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(120) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(121) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(123) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(142) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 8 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no vreg_twl.c -vreg_twl.c(46) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_twl.c(50) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no adc.c -adc.c(73) : CC78K0R warning W0745: Expected function prototype -adc.c(78) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(81) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(96) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(99) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(246) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 6 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\adc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no renge\renge.c -renge\renge.c(147) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\renge.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no accero.c -accero.c(101) : CC78K0R warning W0745: Expected function prototype -accero.c(110) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\accero.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no self_flash.c -self_flash.c(188) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\self_flash.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no reboot.c -reboot.c(14) : CC78K0R warning W0915: Asm statement found. skip to jump optimize this function 'my_reboot' -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\reboot.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no sw.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\sw.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no task_debug.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_debug.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no task_misc.c -task_misc.c(48) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(166) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(34) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_misc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no task_sys.c -task_sys.c(301) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(341) : CC78K0R warning W0622: No return value -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_sys.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -kp -gb6EFBFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel ini_VECT.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel reboot.rel sw.rel task_debug.rel task_misc.rel task_sys.rel Link complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\oc78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf @@ -133,4 +17,4 @@ Object Conversion Complete, 0 error(s) and 0 warning(s) found. C:\WINDOWS\system32\cmd.exe /c ruby C:\Cygwin\home\fujita_ryohei\ctr\nec_s_2_bsrbin.rb bsr.hex C:/Cygwin/home/fujita_ryohei/ctr/nec_s_2_bsrbin.rb:2: warning: variable $KCODE is no longer effective; ignored -Build Total error(s) : 0 Total warning(s) : 39 +Build Total error(s) : 0 Total warning(s) : 3 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 555817a..85e65dd 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -78,7 +78,7 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=167, 56, 600, 1014 +Geometry=294, 80, 600, 1014 Window=Normal DispStart=53 CaretPos=109,0 @@ -140,18 +140,18 @@ SaveStart= SaveEnd= Accumulative=ON [Source1] -Geometry=0, 5, 726, 1048 +Geometry=25, 25, 600, 1014 Window=Normal -DispStart=112 -CaretPos=1,0 +DispStart=780 +CaretPos=789,5 Mode=Normal -DispFile=task_misc.c +DispFile=pm.c Accumulative=ON [Assemble] Geometry=605, 2, 600, 400 Window=Normal -DispStart=10271 -CaretPos=10271,27 +DispStart=10264 +CaretPos=10264,27 Address1= Address2= Address3= @@ -915,20 +915,20 @@ Name3=Swb00004 Address3=self_flash.c#_firm_update+0x101 Window3=ASM Status3=ON -Name4=Swb00007 -Address4=pm.c#_ntr_pmic_comm+0x0 +Name4=Swb00006 +Address4=task_misc.c#_do_command+0x15 Window4=ASM Status4=ON -Name5=Swb00006 -Address5=task_misc.c#_do_command+0x15 +Name5=Swb00008 +Address5=task_misc.c#_do_command+0x37 Window5=ASM Status5=ON -Name6=Swb00008 -Address6=task_misc.c#_do_command+0x37 +Name6=Swb00009 +Address6=task_misc.c#_do_command+0x4a Window6=ASM Status6=ON -Name7=Swb00009 -Address7=task_misc.c#_do_command+0x4a +Name7=Swb00002 +Address7=pm.c#_ntr_pmic_comm+0x5 Window7=ASM Status7=ON Count=8 diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index c4dffec..403b3bb 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -7,9 +7,10 @@ FrameCY=1043 OpenFile1=accero.c,0,272,165,1516,922,26,119,26,0 OpenFile2=ProjectWindow PrjPos=0,2,754,3,253 -OpenFile3=config.h,0,286,286,1530,1043,21,18,21,0 -OpenFile4=sw.c,0,132,132,1376,889,0,86,0,0 -OpenFile5=OutputWindow +OpenFile3=sw.c,0,132,132,1376,889,54,121,54,0 +OpenFile4=config.h,0,286,286,1530,1043,0,23,21,0 +OpenFile5=loader.c,0,154,154,1398,911,4,107,0,0 +OpenFile6=OutputWindow OutputPos=0,48,992,426,1226 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index e117666..dee2dd7 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4b1c9f97 +T=4b1cefc9 1=incs_loader.h 2=fsl.h 3=fsl_user.h @@ -11,7 +11,7 @@ T=4b1c9f97 7=rtc.h 8=reboot.h [pm.c] -T=4b18b78d +T=4b1ce7a6 1=incs.h 2=adc.h 3=led.h @@ -20,7 +20,7 @@ T=4b18b78d T=4b024862 1=incs.h [main.c] -T=4b1ca2a5 +T=4b1ceddb 1=incs.h 2=WDT.h 3=rtc.h @@ -28,7 +28,7 @@ T=4b1ca2a5 5=accero.h 6=led.h [magic.c] -T=4b1ca968 +T=4b1ceee0 1=config.h [WDT.c] T=4afd21ca @@ -73,7 +73,7 @@ T=4b1c8cd2 3=pm.h 4=led.h [renge\renge.c] -T=4b0d1a2b +T=4b1cb2ad 1=renge\renge_defs.h 2=renge\renge_task_intval.h 3=renge\renge_task_immediate.h @@ -85,7 +85,7 @@ T=4b18cd05 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] -T=4b1ca2a5 +T=4b1cee10 1=incs_loader.h 2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h @@ -138,10 +138,10 @@ T=4afd21cb T=4b023fdb 1=config.h [user_define.h] -T=4b0d0086 +T=4b1cdaa0 1=config.h [config.h] -T=4b1c8d89 +T=4b1cea92 [bsr_system.h] T=4afd21ca [renge\renge.h]