0.10

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@106 013db118-44a6-b54f-8bf7-843cb86687b1
2025-06-19 09:05:48 -04:00 · 2010-03-30 07:41:46 +00:00 · 2010-03-30 07:41:46 +00:00 · cd8c1a1590
commit cd8c1a1590
parent abb4d47511
9 changed files with 73 additions and 105 deletions
--- a/trunk/config.h
+++ b/trunk/config.h
@ -6,7 +6,7 @@


 #define MCU_VER_MAJOR    0x00
-#define MCU_VER_MINOR    0x0F
+#define MCU_VER_MINOR    0x10

 #define _OVERCLOCK_

@ -16,12 +16,12 @@
 //#define _PM_BUG_

 //#define _PARRADIUM_
-#define _MODEL_TEG2_
+//#define _MODEL_TEG2_
 // <20>ªTEG2 CPU <20>{ Type-T
 //#define _MODEL_WM0_
 //#define _MODEL_TS0_
 // <20>ªTEG2 CPU <20>{ Type-C
-//#define _MODEL_CTR_TS_
+#define _MODEL_CTR_TS_
 // <20>ªFINAL SoC <20>{ Type-C
 //#define _MODEL_CTR_JIKKI_

--- a/trunk/loader.c
+++ b/trunk/loader.c
@ -77,8 +77,8 @@ void main(  )
        else if( ( RESF & 0x10 ) != 0)   // WDRF,WDTでリセット
        {
           system_status.reboot = 1;
-           vreg_ctr[ VREG_C_MCU_STATUS ] |= REG_BIT_WDT_RESET;
-           set_irq( VREG_C_IRQ0, REG_BIT_WDT_RESET );
+           vreg_ctr[ VREG_C_MCU_STATUS ] |= REG_BIT_STATUS_WDT_RESET;
+           set_irq( VREG_C_IRQ0, REG_BIT_IRQ_WDT_RESET );
           hdwinit2(  );
        }
        else
--- a/trunk/vreg_ctr.c
+++ b/trunk/vreg_ctr.c
@ -395,9 +395,10 @@ void set_irq( u8 irqreg, u8 irq_flg )
    if( ( vreg_ctr[ irqreg + 8 ] & irq_flg ) == 0 ){
        vreg_ctr[ irqreg ] |= irq_flg;
        IRQ0_neg;   // 一瞬上げて落とし直す。
-        EI();
+//        EI();
        tot = 0;
        while( !IRQ0 && ( ++tot != 0 ) ){;}   // O.D.なのでちゃんとあがるのを待つ ＆ IRQ_mcu がLに縛られてると困る(基板不良)
        IRQ0_ast;
    }
+    EI();
 }
--- a/trunk/vreg_ctr.h
+++ b/trunk/vreg_ctr.h
@ -9,7 +9,7 @@


 // VREG_C_MCU_STATUS
-#define REG_BIT_WDT_RESET           ( 1 << 1 )
+#define REG_BIT_STATUS_WDT_RESET           ( 1 << 1 )
 #define REG_BIT_RTC_BLACKOUT        ( 1 << 0 )


@ -36,8 +36,8 @@


 //  VREG_C_IRQ0
-//#define REG_BIT_VR_SNDVOL_CHANGE    ( 1 << 7 )
-#define REG_BIT_WDT_RESET           ( 1 << 7 )
+#define REG_BIT_VR_SNDVOL_CHANGE    ( 1 << 7 )
+#define REG_BIT_IRQ_WDT_RESET           ( 1 << 7 )
 #define REG_BIT_SHELL_OPEN          ( 1 << 6 )
 #define REG_BIT_SHELL_CLOSE         ( 1 << 5 )
 #define REG_BIT_SW_WIFI_CLICK       ( 1 << 4 )
--- a/trunk/yav_mcu_bsr.plg
+++ b/trunk/yav_mcu_bsr.plg
@ -1,7 +1,7 @@
 C:\WINDOWS\system32\cmd.exe /c touch magic.c
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -cF100964 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl3wt -sainter_asm -zp -no 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 -qvjl3wt -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" -cF100964 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\magic.asm
+"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 -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 pedo_alg_thre_det2.rel 
 Link complete,     0 error(s) and     0 warning(s) found.
--- a/trunk/yav_mcu_bsr.pri
+++ b/trunk/yav_mcu_bsr.pri
@ -22,8 +22,8 @@ SubClock=None
 [Mapping]
 Count=0
 [Main]
-Geometry=-707, 91, 1200, 882
-Window=Normal
+Geometry=-1211, 40, 1200, 882
+Window=Max
 MDI_MAX=OFF
 Button=ON
 Mode=Auto
@ -78,7 +78,7 @@ Symbol Type=OFF
 Language=C
 Kanji=SJIS
 [Source]
-Geometry=11, -10, 871, 684
+Geometry=27, 14, 871, 684
 Window=Normal
 DispStart=68
 CaretPos=69,0
@ -140,10 +140,10 @@ SaveStart=
 SaveEnd=
 Accumulative=ON
 [Assemble]
-Geometry=24, 657, 600, 400
+Geometry=19, 497, 600, 400
 Window=Normal
-DispStart=1208
-CaretPos=1208,27
+DispStart=982958
+CaretPos=982958,27
 Address1=
 Address2=
 Address3=
@ -274,7 +274,7 @@ Address13=
 Address14=
 Address15=
 Address16=
-Boundary=202, 89
+Boundary=0, 0
 Mode=Hex
 Attribute=Show
 Sort=Unsort
@ -866,10 +866,10 @@ SaveRange=Screen
 SaveStart=
 SaveEnd=
 [Register]
-Geometry=471, 434, 250, 400
-Window=Hide
+Geometry=1338, 10, 250, 519
+Window=Normal
 Mode=Hex
-Boundary=62
+Boundary=174
 Pickup=OFF
 Name=Functional
 Register Bank=0
@ -957,66 +957,30 @@ Detail=OFF
 Last Name=
 Count=0
 [Variable]
-Geometry=815, 27, 440, 793
+Geometry=884, 10, 440, 793
 Window=Normal
 Boundary=13762700
-0=.DMAIF1,P,S,A,+,1
-1=.DMAMK1,P,S,A,+,1
-2=.force_update_adc,P,N,A,+,1
-3=.temp,P,N,A,+,1
-4=.iic_mcu_bus_status,P,N,A,+,1
-5=.adc_raw_vol,P,N,A,+,1
-6=.P12.0,P,S,A,+,1
-7=.PM12.0,P,S,A,+,1
-8=.PM7.5,P,S,A,+,1
-9=.P7.5,P,S,A,+,1
-10=.TRC1,P,S,A,+,1
-11=.IICA1,P,S,A,+,1
-12=.temp,P,N,A,+,1
-13=.p12.0,P,S,A,+,1
-14=.pm12.0,P,S,A,+,1
-15=.SPD1,P,S,A,+,1
-16=.STD1,P,S,A,+,1
-17=.pr10,B,S,A,+,1
-18=.pr00,B,S,A,+,1
-19=.pr11,B,S,A,+,1
-20=.pr01,B,S,A,+,1
-21=.iics1,P,S,A,+,1
-22=.iicf1,P,S,A,+,1
-23=.P3.3,P,S,A,+,1
-24=.PU3.3,P,S,A,+,1
-25=.PM3.3,P,S,A,+,1
-26=.SW_home_mask,P,N,A,+,1
-27=.SW_home_mask,P,N,A,+,1
-28=.SW_home_count,P,N,A,+,1
-29=.PU20,B,S,A,+,1
-30=.P2.0,P,S,A,+,1
-31=.PM2.0,P,S,A,+,1
-32=.P20.4,B,S,A,+,1
-33=.PM20.4,B,S,A,+,1
-34=.PM3,B,S,A,+,1
-35=.P3,B,S,A,+,1
-36=.adc_raw_vol,P,N,A,+,1
-37=.vol_old,P,N,A,+,1
-38=.iic_burst_state,P,N,A,+,1
-Line=39
+0=.list_id,P,N,A,+,1
+1=.psw,P,R,A,+,1
+2=.tasks_immed,P,N,A,+,1
+Line=3
 [Quick Watch]
-0=IICA,P,A,1
-1=pm12.0,P,A,1
-2=p12.0,P,A,1
-3=IICA1,P,A,1
-4=TRC1,P,A,1
-5=P7.5,P,A,1
-6=PM7.6,P,A,1
-7=PM7.5,P,A,1
-8=PM12.0,P,A,1
-9=P12.0,P,A,1
-10=iic_mcu_bus_status,P,A,1
-11=temp,P,A,1
-12=adc_raw_vol,P,A,1
-13=force_update_adc,P,A,1
-14=DMAMK1,P,A,1
-15=DMAIF1,P,A,1
+0=IICA1,P,A,1
+1=TRC1,P,A,1
+2=P7.5,P,A,1
+3=PM7.6,P,A,1
+4=PM7.5,P,A,1
+5=PM12.0,P,A,1
+6=P12.0,P,A,1
+7=iic_mcu_bus_status,P,A,1
+8=temp,P,A,1
+9=adc_raw_vol,P,A,1
+10=force_update_adc,P,A,1
+11=DMAMK1,P,A,1
+12=DMAIF1,P,A,1
+13=tasks_immed,P,A,1
+14=list_id,P,A,1
+15=psw,P,A,1
 [Software Break]
 Geometry=1085, 803, 500, 296
 Window=Normal
@ -1045,24 +1009,24 @@ Name5=Swb00015
 Address5=pm.c#_ntr_pmic_comm+0x32
 Window5=ASM
 Status5=ON
-Name6=Swb00008
-Address6=pm.c#_ntr_pmic_comm+0x3e
+Name6=Swb00007
+Address6=adc.c#es_F0076+0xf0
 Window6=ASM
 Status6=ON
-Name7=Swb00012
-Address7=pm.c#_ntr_pmic_comm+0x51
+Name7=Swb00009
+Address7=adc.c#es_F0076+0xd4
 Window7=ASM
 Status7=ON
-Name8=Swb00013
-Address8=pm.c#_ntr_pmic_comm+0x59
+Name8=Swb00010
+Address8=adc.c#es_F0076+0xd1
 Window8=ASM
 Status8=ON
-Name9=Swb00014
-Address9=pm.c#_ntr_pmic_comm+0x65
+Name9=Swb00011
+Address9=loader.c#_main+0x1b
 Window9=ASM
 Status9=ON
-Name10=Swb00006
-Address10=pm.c#_PM_init+0x38
+Name10=Swb00008
+Address10=rtc.c#_RTC_init+0x1
 Window10=ASM
 Status10=ON
 Count=11
--- a/trunk/yav_mcu_bsr.prj
+++ b/trunk/yav_mcu_bsr.prj
@ -3,8 +3,8 @@ Version=6.00
 Path=C:\78k_data\yav-mcu-basara\
 Title=yav-mcu
 Series=78K0R.PM
-Device=uPD78F1009_64
-DeviceVer=V1.11
+Device=uPD79F0104
+DeviceVer=E1.00b
 DebugMode=1
 Target=C:\78k_data\yav-mcu-basara\bsr.lmf
 [BuildMode0]
--- a/trunk/yav_mcu_bsr.prk
+++ b/trunk/yav_mcu_bsr.prk
@ -1,5 +1,5 @@
 [ProjectManager]
-FrameMax=0
+FrameMax=1
 FrameX=255
 FrameY=34
 FrameCX=1299
@ -8,16 +8,19 @@ OpenFile1=renge\renge.h,0,502,637,1746,1394,29,16,29,0
 OpenFile2=jhl_defs.h,0,250,539,1494,1265,0,10,8,0
 OpenFile3=renge\\renge_defs.h,0,293,307,1537,1033,18,37,18,0
 OpenFile4=renge\renge_defs.h,0,667,22,1514,748,0,16,0,0
-OpenFile5=adc.c,0,286,286,1530,1012,24,134,50,0
-OpenFile6=task_sys.c,0,330,330,1574,1056,0,172,37,0
-OpenFile7=loader.c,0,296,307,1286,923,20,214,20,0
-OpenFile8=pm.h,0,254,446,1244,1062,0,115,0,0
-OpenFile9=ProjectWindow
+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
 PrjPos=0,2,754,3,253
-OpenFile10=config.h,0,257,193,1501,919,0,19,22,0
-OpenFile11=sw.c,0,266,96,1510,822,43,36,43,0
-OpenFile12=OutputWindow
-OutputPos=0,438,904,19,1077
+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
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]
 ProjectWindowDispType=0
--- a/trunk/yav_mcu_bsr.sdb
+++ b/trunk/yav_mcu_bsr.sdb
@ -1,7 +1,7 @@
 [SdbInfo]
 Ver=5
 [loader.c]
-T=4bab1d9d
+T=4bb14c33
 1=incs_loader.h
 2=fsl.h
 3=fsl_user.h
@ -32,7 +32,7 @@ T=4bab2e2f
 6=led.h
 7=adc.h
 [magic.c]
-T=4bab34a0
+T=4bb18e09
 1=config.h
 [WDT.c]
 T=4afd21ca
@ -73,7 +73,7 @@ T=4b8b5f7f
 4=vreg_ctr.h
 5=renge\renge_task_intval.h
 [adc.c]
-T=4bab215d
+T=4bb14dcc
 1=incs.h
 2=adc.h
 3=pm.h
@ -157,7 +157,7 @@ T=4b90c1b8
 [user_define.h]
 T=4bab22c9
 [config.h]
-T=4bab347f
+T=4bb18f66
 [bsr_system.h]
 T=4bab22a2
 [renge\renge.h]
@ -170,7 +170,7 @@ T=4b90c2bc
 T=4ba9a2e8
 1=renge\renge_defs.h
 [vreg_ctr.h]
-T=4ba3395f
+T=4bb14df4
 1=config.h
 [loader.h]
 T=4afd21ca