From 31281f00ddb95863a264a5b13cf9f7541d970709 Mon Sep 17 00:00:00 2001 From: fujita_ryohei Date: Wed, 3 Feb 2010 04:25:13 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=BB=E3=82=A6=E3=82=A9=E3=83=83=E3=83=81?= =?UTF-8?q?=E3=83=89=E3=83=83=E3=82=B0=E3=82=BF=E3=82=A4=E3=83=9E=E6=9C=89?= =?UTF-8?q?=E5=8A=B9=E3=80=82=E2=86=92=E5=89=B2=E3=82=8A=E8=BE=BC=E3=81=BF?= =?UTF-8?q?=E3=81=AB=E8=BF=BD=E5=8A=A0=20=E3=83=BBRESET1=E6=99=82=E3=81=AB?= =?UTF-8?q?CODEC=E3=81=AE=E3=83=AC=E3=82=B8=E3=82=B9=E3=82=BF=E3=82=AF?= =?UTF-8?q?=E3=83=AA=E3=82=A2?= 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@93 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/loader.c | 32 ++- trunk/main.c | 4 +- trunk/pm.c | 22 +- trunk/pm.h | 2 +- trunk/rtc.c | 3 +- trunk/self_flash.c | 2 +- trunk/task_misc.c | 9 +- trunk/user_define.h | 8 +- trunk/vreg_ctr.c | 2 +- trunk/vreg_ctr.h | 5 +- trunk/yav_mcu_bsr.plg | 11 +- trunk/yav_mcu_bsr.pri | 14 +- trunk/yav_mcu_bsr.prj | 574 +++++++++++++++++++++--------------------- trunk/yav_mcu_bsr.prk | 16 +- trunk/yav_mcu_bsr.sdb | 10 +- 15 files changed, 378 insertions(+), 336 deletions(-) diff --git a/trunk/loader.c b/trunk/loader.c index 012fc3c..dbb9873 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -69,12 +69,17 @@ void main( ) { while( 1 ) { - WDT_Restart( ); if( RTCEN ) { system_status.reboot = 1; } + else if( ( RESF & 0x10 ) != 0) // WDRF + { + system_status.reboot = 1; + vreg_ctr[ VREG_C_MCU_STATUS ] |= REG_BIT_WDT_RESET; + hdwinit2( ); + } else { u8 pwup_delay0 = 0; @@ -175,16 +180,33 @@ void hdwinit( void ) void hdwinit2( ) { // ポート設定 + if( system_status.reboot ) // リセットピンだけはすぐにセットする + { +#ifdef _MODEL_TS0_ + P3 = 0b00000111; // 簡易I2Cは出力ラッチを1にする + P14 = 0b00000000; +#else + P3 = 0b00000110; // 簡易I2Cは出力ラッチを1にする + P14 = 0b00000001; +#endif + } + else + { + P3 = 0b00000110; // 簡易I2Cは出力ラッチを1にする + P14 = 0b00000000; + } + + PM3 = 0b11110000; // P31,32は簡易I2C + PM14 = 0b11111100; // debugger[1] とりあえず出力 + P0 = 0b00000000; P1 = 0b00000000; P2 = 0b00000000; - P3 = 0b00000110; // 簡易I2Cは出力ラッチを1にする P4 = 0b00000000; P5 = 0b00000000; P6 = 0b00000000; P7 = 0b01000000; P12 = 0b00000000; - P14 = 0b00000000; #ifdef _MCU_BSR_ P20 = 0b00000000; @@ -213,7 +235,7 @@ void hdwinit2( ) #endif #ifdef _MCU_BSR_ - PM0 = 0b11111101; // BSRマイコンでは、reset1は監視のみになる。 + PM0 = 0b11111111; // BSRマイコンでは、reset1は監視のみになる。 #else PM0 = 0b00000000; // 0で出力 #endif @@ -224,7 +246,6 @@ void hdwinit2( ) #else PM2 = 0b11101111; #endif - PM3 = 0b11110000; // P31,32は簡易I2C #ifdef _PMIC_CTR_ PM4 = 0b11110111; @@ -236,7 +257,6 @@ void hdwinit2( ) PM6 = 0b11111100; // I2CのラインがL出力になってしまうが、システムがOFFなのでかまわない PM7 = 0b00011111; PM12 = 0b11111111; // 32kHzクロックのピン設定はどっちでもよい - PM14 = 0b11111100; // debugger[1] とりあえず出力 PM15 = 0b11111111; #ifdef _MCU_BSR_ diff --git a/trunk/main.c b/trunk/main.c index ee44cd8..e337add 100644 --- a/trunk/main.c +++ b/trunk/main.c @@ -40,8 +40,7 @@ void main_loop( void ) iic_mcu_start( ); PM_init(); - system_status.pwr_state = OFF_TRIG; - if( system_status.reboot == 1 ) + if( system_status.reboot ) { // システムの電源が入りっぱなしだったら、 // マイコンだけが再起動したのだ @@ -59,6 +58,7 @@ void main_loop( void ) else { // リブート時は実行されない + system_status.pwr_state = OFF_TRIG; } #ifdef _PARRADIUM_ diff --git a/trunk/pm.c b/trunk/pm.c index 9f18868..38cbea0 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -500,16 +500,22 @@ err PM_sys_pow_on( ) { return ( ERR_ERR ); } - PM_reset_neg( ); + PM_reset_neg(); RESET2_neg; FCRAM_RST_neg; + wait_ms( 100 ); + { // CODEC 不定レジスタ初期化 + u8 codec_reg_init[3] = { 0,0,0 }; + iic_mcu_write( IIC_SLA_CODEC, CODEC_REG_PM, 3, codec_reg_init ); + } + #else // TWL PMIC u8 temp; // 電源投入 - RESET1_ast; + PM_reset_ast(); RESET2_ast; FCRAM_RST_ast; @@ -526,18 +532,22 @@ err PM_sys_pow_on( ) } vreg_ctr[VREG_C_BT_REMAIN] = temp; - RESET1_neg; + PM_reset_neg(); RESET2_neg; FCRAM_RST_neg; wait_ms( 100 ); if( !RESET1_n ) { // 起動失敗 - RESET1_ast; + PM_reset_ast(); RESET2_ast; FCRAM_RST_ast; return ( ERR_ERR ); } + { // CODEC 不定レジスタ初期化 + u8 codec_reg_init[3] = { 0,0,0 }; + iic_mcu_write( IIC_SLA_CODEC, CODEC_REG_PM, 3, codec_reg_init ); + } #endif @@ -571,7 +581,7 @@ err PM_sys_pow_off( ) if( RESET1_n ) { - RESET1_ast; + PM_reset_ast(); RESET2_ast; FCRAM_RST_ast; PM_TEG_PWSW = 1; @@ -580,7 +590,7 @@ err PM_sys_pow_off( ) wait_ms( 250 ); PM_TEG_PWSW = 0; } - RESET1_ast; + PM_reset_ast(); RESET2_ast; FCRAM_RST_ast; diff --git a/trunk/pm.h b/trunk/pm.h index 796560f..179884e 100644 --- a/trunk/pm.h +++ b/trunk/pm.h @@ -145,7 +145,7 @@ task_status_immed tski_PM_BL_set(); // ほか // #ifdef _PMIC_TWL_ -#define PM_reset_neg() { PM0.0 = 1; PU0.0 = 1; } +#define PM_reset_neg() { PM0.0 = 1; } #define PM_reset_ast() { P0.0 = 0; PM0.0 = 0; } #define PM_chk_LDSW() ( 1 ) #else diff --git a/trunk/rtc.c b/trunk/rtc.c index fe98b04..6773e6a 100644 --- a/trunk/rtc.c +++ b/trunk/rtc.c @@ -41,8 +41,7 @@ void RTC_init( void ) ALARMWW = 0x7F; - vreg_ctr[VREG_C_MCU_STATUS] = REG_BIT_RTC_BLACKOUT; - + vreg_ctr[VREG_C_MCU_STATUS] |= REG_BIT_RTC_BLACKOUT; } // 割り込み設定 RTCIF = 0; diff --git a/trunk/self_flash.c b/trunk/self_flash.c index 7e68e85..99c481c 100644 --- a/trunk/self_flash.c +++ b/trunk/self_flash.c @@ -212,7 +212,7 @@ err firm_update( ) 　■ファームをバックアップ領域からリストアします。 　チェック後、最後の最後でブートスワップするので、 　ここではブートスワップは不要です。 - + ======================================================== */ err firm_restore( ) { diff --git a/trunk/task_misc.c b/trunk/task_misc.c index 28aaaad..4abdbb1 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -147,7 +147,14 @@ task_status_immed do_command0( ) wait_ms( 5 ); FCRAM_RST_neg; RESET2_neg; - PM_reset_neg( ); + PM_reset_neg(); + + // CODEC 不定レジスタ初期化 + wait_ms( 100 ); + { + u8 codec_reg_init[3] = { 0,0,0 }; + iic_mcu_write( IIC_SLA_CODEC, CODEC_REG_PM, 3, codec_reg_init ); + } } } diff --git a/trunk/user_define.h b/trunk/user_define.h index 9006213..2bd0847 100644 --- a/trunk/user_define.h +++ b/trunk/user_define.h @@ -66,10 +66,14 @@ // ↓誤代入防止 #define RESET1_n ( P0.0 ) + +#if 0 // PM_RESET1〜を使う #define RESET1_ast { P0.0 = 0; PM0.0 = 0; } #define RESET1_neg { PM0.0 = 1; } -#define RESET2_ast { P0.1 = 0; } -#define RESET2_neg { P0.1 = 1; } +#endif + +#define RESET2_ast { P0.1 = 0; PM0.1 = 0; } +#define RESET2_neg { PM0.1 = 1; } #ifndef _PARRADIUM_ #define SLP_REQ P12.0 diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 00be00b..e98c5c8 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -69,7 +69,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) case ( VREG_C_MCU_STATUS ): vreg_ctr[adrs] = data; - vreg_twl[ REG_TWL_INT_ADRS_MODE ] = ( ( data & 0xC0 ) >> 6); + vreg_twl[ REG_TWL_INT_ADRS_MODE ] = ( ( data & 0xC0 ) >> 6 ); break; case ( VREG_C_VCOM_T ): diff --git a/trunk/vreg_ctr.h b/trunk/vreg_ctr.h index b172810..8a8c940 100644 --- a/trunk/vreg_ctr.h +++ b/trunk/vreg_ctr.h @@ -4,11 +4,14 @@ #include "config.h" -#define REG_BIT_RTC_BLACKOUT 0b00000001 #define REG_BIT__SYS_MODE0 0b01000000 #define REG_BIT_MCU_FIRMBROKEN 0b10000000 +// VREG_C_MCU_STATUS +#define REG_BIT_WDT_RESET ( 1 << 1 ) +#define REG_BIT_RTC_BLACKOUT ( 1 << 0 ) + // VREG_C_STATUS, #define REG_BIT_LCD_POW ( 1 << 7 ) diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index 0ec17ff..0c1f022 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,13 +1,14 @@ 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 -quvjl3wt -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 +"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 -quvjl3wt -sainter_asm -zp -no loader.c +loader.c(111) : 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\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 -quvjl3wt -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\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 +"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 -gb7EFBFFh -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 Object Conversion Complete, 0 error(s) and 0 warning(s) found. @@ -17,4 +18,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 0 +Build Total error(s) : 0 Total warning(s) : 1 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 1a08a6a..9baf85b 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -80,8 +80,8 @@ Kanji=SJIS [Source] Geometry=155, 80, 1012, 920 Window=Normal -DispStart=46 -CaretPos=96,0 +DispStart=68 +CaretPos=69,0 Mode=Normal DispFile= Address1= @@ -142,8 +142,8 @@ Accumulative=ON [Assemble] Geometry=605, 2, 600, 400 Window=Normal -DispStart=655 -CaretPos=655,27 +DispStart=1262 +CaretPos=1262,27 Address1= Address2= Address3= @@ -251,7 +251,7 @@ Destination=0 [I/O Port] Line=0 [Stack] -Geometry=1128, 373, 400, 300 +Geometry=1102, 382, 400, 300 Window=Normal Boundary=13762687 Mode=Proper @@ -855,14 +855,14 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=1225, 6, 354, 910 +Geometry=1232, 6, 354, 910 Window=Normal Boundary=13762700 0=.iic_mcu_busy,P,N,A,+,1 1=.tx_buf,P,N,A,+,1 2=.new_task,P,N,A,+,1 3=.if2h,P,S,A,+,1 -4=.pool,P,N,A,+,1 +4=+pool,P,N,A,-,1 5=.new_task,P,N,A,+,1 6=.vreg_ctr,P,N,A,+,1 7=.cmd_BL,P,N,A,+,1 diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 407108d..5b22700 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -138,257 +138,6 @@ Source19=sw.c Source20=task_debug.c Source21=task_misc.c Source22=task_sys.c -[Options.LK78K0R 0] -Version=100 -O0=bsr_k0r.lmf -O1=bsr.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=1 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 1] -Version=100 -O0=a.lmf -G=0 -E=0 -E0=a.elk -GO=0 -GOValue= -GOStart=FC00 -GOSizeValue=1024 -GI=0 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=1 -MemInfoCheck=0 -P=1 -P0=a.map -MI=0 -GB=0 -GBValue= -KM=1 -KD=1 -KP=0 -KL=0 -LF=0 -LL=0 -S=0 -W=1 -SELFCheck=0 -SELF=0 -ZB= -CommandFile=0 -[Options.LK78K0R 2] -Version=100 -O0=bsr.lmf -O1=bsr_k0r.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -OFILE=C:\78k_data\yav-mcu-basara\bsr.lmf -[Options.LK78K0R 3] -Version=100 -O0=bsr_bsr.lmf -O1=bsr_k0r.lmf -O2=bsr.lmf -O3=flash.lmf -O4=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_bsr.map -P1=bsr_k0r.map -P2=bsr.map -P3=flash.map -P4=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=2 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 4] -Version=100 -O0=bsr_k0r.lmf -O1=bsr.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=1 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 5] -Version=100 -O0=bsr_bsr.lmf -O1=bsr_k0r.lmf -O2=bsr.lmf -O3=flash.lmf -O4=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_bsr.map -P1=bsr_k0r.map -P2=bsr.map -P3=flash.map -P4=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=2 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 [Options.RA78K0R 0] Version=100 G=1 @@ -963,6 +712,293 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= +[IncFile] +Include1=incs_loader.h +Include2=jhl_defs.h +Include3=user_define.h +Include4=config.h +Include5=bsr_system.h +Include6=renge\renge.h +Include7=renge\renge_defs.h +Include8=renge\renge_task_immediate.h +Include9=vreg_ctr.h +Include10=loader.h +Include11=i2c_mcu.h +Include12=WDT.h +Include13=fsl.h +Include14=fsl_user.h +Include15=i2c_ctr.h +Include16=pm.h +Include17=rtc.h +Include18=adc.h +Include19=led.h +Include20=incs.h +Include21=vreg_twl.h +Include22=accero.h +Include23=i2c_twl_defs.h +Include24=renge\renge_task_intval.h +Include25=i2c_twl.h +Include26=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h +Include27=reboot.h +Include28=sw.h +Include29=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h +Include30=batt_params.h +[ToolSet] +ToolSetName=(変更)78K0R Software Package V1.10 +Tool1=CC78K0R|W2.10 +Tool2=RA78K0R|W1.31 +Tool3=ID78K0R-QB|V3.60 +[Options.LK78K0R 0] +Version=100 +O0=bsr_k0r.lmf +O1=bsr.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=1 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 1] +Version=100 +O0=a.lmf +G=0 +E=0 +E0=a.elk +GO=0 +GOValue= +GOStart=FC00 +GOSizeValue=1024 +GI=0 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=1 +MemInfoCheck=0 +P=1 +P0=a.map +MI=0 +GB=0 +GBValue= +KM=1 +KD=1 +KP=0 +KL=0 +LF=0 +LL=0 +S=0 +W=1 +SELFCheck=0 +SELF=0 +ZB= +CommandFile=0 +[Options.LK78K0R 2] +Version=100 +O0=bsr.lmf +O1=bsr_k0r.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=7EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +OFILE=C:\78k_data\yav-mcu-basara\bsr.lmf +[Options.LK78K0R 3] +Version=100 +O0=bsr_bsr.lmf +O1=bsr_k0r.lmf +O2=bsr.lmf +O3=flash.lmf +O4=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_bsr.map +P1=bsr_k0r.map +P2=bsr.map +P3=flash.map +P4=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=2 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 4] +Version=100 +O0=bsr_k0r.lmf +O1=bsr.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=1 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 5] +Version=100 +O0=bsr_bsr.lmf +O1=bsr_k0r.lmf +O2=bsr.lmf +O3=flash.lmf +O4=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_bsr.map +P1=bsr_k0r.map +P2=bsr.map +P3=flash.map +P4=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=2 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 [Options.LCNV78K0R 0] Version=100 LCNV_GO=0 @@ -1004,39 +1040,3 @@ DefaultMode2=1 DefaultMode3=1 DefaultMode4=1 DefaultMode5=1 -[IncFile] -Include1=incs_loader.h -Include2=jhl_defs.h -Include3=user_define.h -Include4=config.h -Include5=bsr_system.h -Include6=renge\renge.h -Include7=renge\renge_defs.h -Include8=renge\renge_task_immediate.h -Include9=vreg_ctr.h -Include10=loader.h -Include11=i2c_mcu.h -Include12=WDT.h -Include13=fsl.h -Include14=fsl_user.h -Include15=i2c_ctr.h -Include16=pm.h -Include17=rtc.h -Include18=adc.h -Include19=led.h -Include20=incs.h -Include21=vreg_twl.h -Include22=accero.h -Include23=i2c_twl_defs.h -Include24=renge\renge_task_intval.h -Include25=i2c_twl.h -Include26=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h -Include27=reboot.h -Include28=sw.h -Include29=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h -Include30=batt_params.h -[ToolSet] -ToolSetName=(変更)78K0R Software Package V1.10 -Tool1=CC78K0R|W2.10 -Tool2=RA78K0R|W1.31 -Tool3=ID78K0R-QB|V3.60 diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 8197ffc..ab22c85 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,17 +1,15 @@ [ProjectManager] FrameMax=0 -FrameX=138 -FrameY=118 +FrameX=64 +FrameY=122 FrameCX=1299 FrameCY=1044 -OpenFile1=task_sys.c,0,521,328,1765,1085,25,250,25,0 -OpenFile2=renge\renge.h,0,502,637,1746,1394,29,16,29,0 -OpenFile3=i2c_twl.c,0,31,261,1010,897,0,1,0,0 -OpenFile4=config.h,0,255,3,1234,639,0,21,20,0 -OpenFile5=OutputWindow -OutputPos=0,421,829,388,1497 -OpenFile6=ProjectWindow +OpenFile1=renge\renge.h,0,502,637,1746,1394,29,16,29,0 +OpenFile2=ProjectWindow PrjPos=0,2,754,3,253 +OpenFile3=config.h,0,22,22,1001,659,21,21,29,0 +OpenFile4=OutputWindow +OutputPos=0,421,829,388,1497 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 69d7eda..3378e94 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4b445f00 +T=4b67cfc9 1=incs_loader.h 2=fsl.h 3=fsl_user.h @@ -23,7 +23,7 @@ T=4b60e64a 1=incs.h 2=accero.h [main.c] -T=4b66ac04 +T=4b677175 1=incs_loader.h 2=WDT.h 3=rtc.h @@ -32,7 +32,7 @@ T=4b66ac04 6=led.h 7=adc.h [magic.c] -T=4b66b228 +T=4b67eda0 1=config.h [WDT.c] T=4afd21ca @@ -92,7 +92,7 @@ T=4b66b29e 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] -T=4b4d743c +T=4b67e6e0 1=incs_loader.h 2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h @@ -148,7 +148,7 @@ T=4b023fdb [user_define.h] T=4b66880a [config.h] -T=4b66a4e1 +T=4b67f2af [bsr_system.h] T=4b3064de [renge\renge.h]