diff --git a/trunk/loader.c b/trunk/loader.c index caeb091..d90dd5d 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -80,10 +80,10 @@ void main( ) #ifdef _PMIC_TWL_ // 暴走してしまうので再起動させる PM_reset_ast(); -#else + /// hdwinit2ないでリセット解除される。続きに続行してよい(頭痛が痛い的) +#endif vreg_ctr[ VREG_C_MCU_STATUS ] |= REG_BIT_STATUS_WDT_RESET; set_irq( VREG_C_IRQ0, REG_BIT_IRQ_WDT_RESET ); -#endif hdwinit2( ); } else diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index ed0129b..fdbac9a 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=27, 14, 871, 684 +Geometry=4, 9, 871, 684 Window=Normal -DispStart=68 -CaretPos=69,0 +DispStart=387 +CaretPos=388,0 Mode=Normal DispFile= Address1= @@ -142,8 +142,8 @@ Accumulative=ON [Assemble] Geometry=19, 497, 600, 400 Window=Normal -DispStart=982958 -CaretPos=982958,27 +DispStart=18910 +CaretPos=18910,27 Address1= Address2= Address3= @@ -185,18 +185,18 @@ SaveRange=Screen SaveStart= SaveEnd= [Memory] -Geometry=0, 0, 0, 0 -Window=Hide -Boundary=0 +Geometry=373, 24, 550, 682 +Window=Normal +Boundary=163 Format=Hex Mode=Byte -Endian= +Endian=Little Ascii=OFF Idtag=OFF Address= -DispStart=FFFFFFFF -CaretPosData=0, 0 -CaretPosAscii=0, 0 +DispStart=00004F70 +CaretPosData=20, 255 +CaretPosAscii=53248, 256 Address1= Address2= Address3= @@ -990,15 +990,15 @@ Address0=task_misc.c#_tski_mcu_info_read+0x3d Window0=ASM Status0=ON Name1=Swb00002 -Address1=task_misc.c#_tski_mcu_info_read+0x5a +Address1=task_misc.c#_tski_mcu_info_read+0x56 Window1=ASM Status1=ON Name2=Swb00003 -Address2=task_misc.c#_tski_mcu_info_read+0x5a +Address2=task_misc.c#_tski_mcu_info_read+0x56 Window2=ASM Status2=ON Name3=Swb00005 -Address3=task_misc.c#_tski_mcu_info_read+0x5a +Address3=task_misc.c#_tski_mcu_info_read+0x56 Window3=ASM Status3=ON Name4=Swb00004 @@ -1009,27 +1009,23 @@ Name5=Swb00015 Address5=pm.c#_ntr_pmic_comm+0x32 Window5=ASM Status5=ON -Name6=Swb00007 -Address6=adc.c#es_F0076+0xf0 +Name6=Swb00011 +Address6=loader.c#_main+0x1b Window6=ASM Status6=ON -Name7=Swb00009 -Address7=adc.c#es_F0076+0xd4 +Name7=Swb00008 +Address7=rtc.c#_RTC_init+0x1 Window7=ASM Status7=ON -Name8=Swb00010 -Address8=adc.c#es_F0076+0xd1 +Name8=Swb00006 +Address8=loader.c#_main+0x74 Window8=ASM Status8=ON -Name9=Swb00011 -Address9=loader.c#_main+0x1b +Name9=Swb00007 +Address9=loader.c#_main+0x71 Window9=ASM Status9=ON -Name10=Swb00008 -Address10=rtc.c#_RTC_init+0x1 -Window10=ASM -Status10=ON -Count=11 +Count=10 [Reset] Debugger=ON Symbol=OFF diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 5e9cd20..64f7b5f 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -1,12 +1,12 @@ [ProjectManager] Version=6.00 -Path=C:\78k_data\yav-mcu-basara\ +Path=C:\78k_data\yav-mcu-basara_sdk0.9\ Title=yav-mcu Series=78K0R.PM Device=uPD79F0104 DeviceVer=E1.00b DebugMode=1 -Target=C:\78k_data\yav-mcu-basara\bsr.lmf +Target=bsr.lmf [BuildMode0] BuildModeName=Debug Build TargetFile=0 @@ -395,7 +395,7 @@ ZB= Etcetera0= Etcetera1=boot.lmf CommandFile=0 -OFILE=C:\78k_data\yav-mcu-basara\bsr.lmf +OFILE=C:\78k_data\yav-mcu-basara_sdk0.9\bsr.lmf [Options.LK78K0R 3] Version=100 O0=bsr_bsr.lmf diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index d86ce4f..ea3e85b 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -12,15 +12,16 @@ OpenFile5=task_sys.c,0,330,330,1574,1056,0,172,37,0 OpenFile6=loader.c,0,296,307,1286,923,20,214,20,0 OpenFile7=pm.h,0,254,446,1244,1062,0,115,0,0 OpenFile8=sw.c,0,574,367,1818,1093,43,36,43,0 -OpenFile9=config.h,0,288,71,1532,797,0,22,20,0 -OpenFile10=ProjectWindow +OpenFile9=vreg_ctr.h,0,632,184,1876,910,8,40,25,0 +OpenFile10=pedo_alg_thre_det2.c,0,132,132,1376,858,0,12,0,0 +OpenFile11=adc.c,0,286,286,1530,1012,0,145,0,0 +OpenFile12=self_flash.c,0,154,154,1398,880,7,365,7,0 +OpenFile13=ProjectWindow PrjPos=0,2,754,3,253 -OpenFile11=vreg_ctr.h,0,632,184,1876,910,8,40,25,0 -OpenFile12=pedo_alg_thre_det2.c,0,132,132,1376,858,0,12,0,0 -OpenFile13=self_flash.c,0,154,154,1398,880,0,375,0,0 -OpenFile14=adc.c,0,286,286,1530,1012,0,145,0,0 -OpenFile15=OutputWindow -OutputPos=0,496,962,19,1077 +OpenFile14=magic.c,0,323,248,1567,974,0,17,0,0 +OpenFile15=config.h,0,288,71,1532,797,18,2,21,0 +OpenFile16=OutputWindow +OutputPos=0,572,1038,46,1104 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 971d54c..7c65392 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4bb14c33 +T=4bb92f33 1=incs_loader.h 2=fsl.h 3=fsl_user.h @@ -11,19 +11,21 @@ T=4bb14c33 7=rtc.h 8=reboot.h [pm.c] -T=4bab30ef +T=4bb92f33 1=incs.h 2=adc.h 3=led.h 4=pm.h 5=renge\renge.h 6=batt_params.h +7=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h +8=fsl_user.h [i2c_ctr.c] -T=4ba9a43e +T=4bb92f33 1=incs.h 2=accero.h [main.c] -T=4bab2e2f +T=4bb92f33 1=incs_loader.h 2=WDT.h 3=rtc.h @@ -32,31 +34,31 @@ T=4bab2e2f 6=led.h 7=adc.h [magic.c] -T=4bb18e09 +T=4bb930dc 1=config.h [WDT.c] -T=4afd21ca +T=4bb92f33 1=incs_loader.h [i2c_mcu.c] -T=4ba9c16c +T=4bb92f33 1=incs.h 2=i2c_mcu.h [i2c_twl.c] -T=4b6a657d +T=4bb92f33 1=incs.h 2=i2c_twl_defs.h [ini_VECT.c] -T=4afd21ca +T=4bb92f33 1=config.h [led.c] -T=4b4438bb +T=4bb92f33 1=incs.h 2=led.h [rtc.c] -T=4b6a6fa4 +T=4bb92f33 1=incs.h [vreg_ctr.c] -T=4bab215d +T=4bb92f33 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -66,20 +68,20 @@ T=4bab215d 7=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 8=fsl_user.h [vreg_twl.c] -T=4b8b5f7f +T=4bb92f33 1=incs.h 2=jhl_defs.h 3=vreg_twl.h 4=vreg_ctr.h 5=renge\renge_task_intval.h [adc.c] -T=4bb14dcc +T=4bb92f33 1=incs.h 2=adc.h 3=pm.h 4=led.h [renge\renge.c] -T=4b5d73b9 +T=4bb92f32 1=renge\renge.h 2=renge\renge_task_intval.h 3=renge\renge_task_immediate.h @@ -88,20 +90,20 @@ T=4b5d73b9 6=user_define.h 7=bsr_system.h [accero.c] -T=4b8f1c98 +T=4bb92f33 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] -T=4ba9a066 +T=4bb92f33 1=incs_loader.h 2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h 4=i2c_ctr.h [reboot.c] -T=4afd21cb +T=4bb92f33 1=incs_loader.h [sw.c] -T=4bab34a0 +T=4bb92f33 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -110,13 +112,13 @@ T=4bab34a0 6=pm.h 7=rtc.h [task_debug.c] -T=4bab1d9d +T=4bb92f33 1=incs.h 2=renge\renge.h 3=pm.h 4=accero.h [task_misc.c] -T=4bab22ef +T=4bb92f33 1=incs.h 2=renge\renge.h 3=pm.h @@ -124,7 +126,7 @@ T=4bab22ef 5=adc.h 6=i2c_mcu.h [task_sys.c] -T=4ba9e3a5 +T=4bb92f33 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -135,13 +137,13 @@ T=4ba9e3a5 8=sw.h 9=adc.h [pedo_alg_thre_det2.c] -T=4ba33e23 +T=4bb92f33 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h 3=accero.h 4=pedometer.h [incs_loader.h] -T=4b25f1a9 +T=4bb92f33 1=jhl_defs.h 2=user_define.h 3=bsr_system.h @@ -152,50 +154,50 @@ T=4b25f1a9 8=i2c_mcu.h 9=WDT.h [jhl_defs.h] -T=4b90c1b8 +T=4bb92f33 1=config.h [user_define.h] -T=4bab22c9 +T=4bb92f33 [config.h] -T=4bb18f66 +T=4bb92f33 [bsr_system.h] -T=4bab22a2 +T=4bb92f33 [renge\renge.h] -T=4b32c168 +T=4bb92f32 1=renge\renge_defs.h 2=renge\renge_task_immediate.h [renge\renge_defs.h] -T=4b90c2bc +T=4bb92f32 [renge\renge_task_immediate.h] -T=4ba9a2e8 +T=4bb92f32 1=renge\renge_defs.h [vreg_ctr.h] -T=4bb14df4 +T=4bb92f33 1=config.h [loader.h] -T=4afd21ca +T=4bb92f33 1=jhl_defs.h [i2c_mcu.h] -T=4b04c691 +T=4bb92f33 [WDT.h] -T=4afd21ca +T=4bb92f33 [fsl.h] -T=4afd21cb +T=4bb92f33 [fsl_user.h] -T=4afd21cb +T=4bb92f33 [i2c_ctr.h] -T=4ba9a39e +T=4bb92f33 [pm.h] -T=4bab215d +T=4bb92f33 [rtc.h] -T=4b6a6fa4 +T=4bb92f33 [adc.h] -T=4baae7c3 +T=4bb92f33 1=jhl_defs.h [led.h] -T=4b4438a1 +T=4bb92f33 [incs.h] -T=4b8f2e8c +T=4bb92f33 1=jhl_defs.h 2=user_define.h 3=bsr_system.h @@ -206,27 +208,27 @@ T=4b8f2e8c 8=rtc.h 9=accero.h [vreg_twl.h] -T=4b8b6b9b +T=4bb92f33 [accero.h] -T=4b8f11ef +T=4bb92f33 1=jhl_defs.h 2=pedometer.h [i2c_twl_defs.h] -T=4afd21ca +T=4bb92f33 [renge\renge_task_intval.h] -T=4b4418e6 +T=4bb92f32 1=renge\renge_defs.h [i2c_twl.h] -T=4b309c28 +T=4bb92f33 [..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h] T=49a3bd4e [reboot.h] -T=4afd21ca +T=4bb92f33 [sw.h] -T=4afd21cb +T=4bb92f33 [..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h] T=45f12258 [batt_params.h] -T=4b663897 +T=4bb92f33 [pedometer.h] -T=4ba1d482 +T=4bb92f33