mirror of
https://github.com/rvtr/ctr_mcu.git
synced 2025-10-31 13:51:10 -04:00
PM_IRQ reset単品でなくても反応するようにした
バグ出しをしてもらうため git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@39 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
parent
e0c86ce6f1
commit
633829c598
@ -763,8 +763,11 @@ __interrupt void intp5_shell( )
|
|||||||
=========================================================*/
|
=========================================================*/
|
||||||
__interrupt void intp6_PM_irq( )
|
__interrupt void intp6_PM_irq( )
|
||||||
{
|
{
|
||||||
EI();
|
if( system_status.pwr_state == ON )
|
||||||
renge_task_immed_add( ntr_pmic_comm );
|
{
|
||||||
|
EI();
|
||||||
|
renge_task_immed_add( ntr_pmic_comm );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -823,7 +826,7 @@ task_status_immed ntr_pmic_comm( )
|
|||||||
{
|
{
|
||||||
// CODECバグ回避
|
// CODECバグ回避
|
||||||
// リセット単品でなかったら無視
|
// リセット単品でなかったら無視
|
||||||
if( ( reg1_old ^ reg_shadow ) == REG_BIT_TWL_REQ_RST_REQ )
|
// if( ( reg1_old ^ reg_shadow ) == REG_BIT_TWL_REQ_RST_REQ )
|
||||||
{
|
{
|
||||||
set_irq( VREG_C_IRQ2, REG_BIT_TWL_RESET_REQ );
|
set_irq( VREG_C_IRQ2, REG_BIT_TWL_RESET_REQ );
|
||||||
}
|
}
|
||||||
|
|||||||
@ -58,7 +58,7 @@ Symbol Reset1=ON
|
|||||||
Dir=.
|
Dir=.
|
||||||
Filter=Source
|
Filter=Source
|
||||||
[Debugger Option]
|
[Debugger Option]
|
||||||
Source Path=""
|
Source Path="renge"
|
||||||
Symbol Size=Byte
|
Symbol Size=Byte
|
||||||
Symbol Format=Hex
|
Symbol Format=Hex
|
||||||
Register Name=Func
|
Register Name=Func
|
||||||
@ -78,10 +78,10 @@ Symbol Type=OFF
|
|||||||
Language=C
|
Language=C
|
||||||
Kanji=SJIS
|
Kanji=SJIS
|
||||||
[Source]
|
[Source]
|
||||||
Geometry=84, 31, 600, 1014
|
Geometry=167, 56, 600, 1014
|
||||||
Window=Normal
|
Window=Normal
|
||||||
DispStart=383
|
DispStart=53
|
||||||
CaretPos=384,0
|
CaretPos=109,0
|
||||||
Mode=Normal
|
Mode=Normal
|
||||||
DispFile=
|
DispFile=
|
||||||
Address1=
|
Address1=
|
||||||
@ -139,11 +139,19 @@ SaveRange=Screen
|
|||||||
SaveStart=
|
SaveStart=
|
||||||
SaveEnd=
|
SaveEnd=
|
||||||
Accumulative=ON
|
Accumulative=ON
|
||||||
|
[Source1]
|
||||||
|
Geometry=0, 5, 726, 1048
|
||||||
|
Window=Normal
|
||||||
|
DispStart=112
|
||||||
|
CaretPos=1,0
|
||||||
|
Mode=Normal
|
||||||
|
DispFile=task_misc.c
|
||||||
|
Accumulative=ON
|
||||||
[Assemble]
|
[Assemble]
|
||||||
Geometry=605, 2, 600, 400
|
Geometry=605, 2, 600, 400
|
||||||
Window=Normal
|
Window=Normal
|
||||||
DispStart=16527
|
DispStart=10271
|
||||||
CaretPos=16527,27
|
CaretPos=10271,27
|
||||||
Address1=
|
Address1=
|
||||||
Address2=
|
Address2=
|
||||||
Address3=
|
Address3=
|
||||||
@ -195,8 +203,8 @@ Ascii=OFF
|
|||||||
Idtag=OFF
|
Idtag=OFF
|
||||||
Address=
|
Address=
|
||||||
DispStart=00000F60
|
DispStart=00000F60
|
||||||
CaretPosData=26, 269
|
CaretPosData=0, 246
|
||||||
CaretPosAscii=50176, 0
|
CaretPosAscii=0, 246
|
||||||
Address1=
|
Address1=
|
||||||
Address2=
|
Address2=
|
||||||
Address3=
|
Address3=
|
||||||
@ -859,15 +867,17 @@ Geometry=1145, 8, 440, 1086
|
|||||||
Window=Normal
|
Window=Normal
|
||||||
Boundary=13762700
|
Boundary=13762700
|
||||||
0=.RTCEN,P,S,A,+,1
|
0=.RTCEN,P,S,A,+,1
|
||||||
1=.hyst_pedometer,.,N,A,+,1
|
1=.tasks_immed,P,N,A,+,1
|
||||||
2=.pool,P,N,A,+,1
|
2=.system_status,.,N,A,+,1
|
||||||
3=.last_year,P,N,A,+,1
|
3=.hyst_pedometer,.,N,A,+,1
|
||||||
4=.last_month,P,N,A,+,1
|
4=.pool,P,N,A,+,1
|
||||||
5=.last_day,P,N,A,+,1
|
5=.last_year,P,N,A,+,1
|
||||||
6=.last_hour,P,N,A,+,1
|
6=.last_month,P,N,A,+,1
|
||||||
7=.p_record,P,N,A,+,1
|
7=.last_day,P,N,A,+,1
|
||||||
8=.vreg_ctr[0x60],P,N,A,+,1
|
8=.last_hour,P,N,A,+,1
|
||||||
Line=9
|
9=.p_record,P,N,A,+,1
|
||||||
|
10=.vreg_ctr[0x60],P,N,A,+,1
|
||||||
|
Line=11
|
||||||
[Quick Watch]
|
[Quick Watch]
|
||||||
0=last_hour,P,A,1
|
0=last_hour,P,A,1
|
||||||
1=last_day,P,A,1
|
1=last_day,P,A,1
|
||||||
@ -879,8 +889,8 @@ Line=9
|
|||||||
7=vreg_ctr,P,A,1
|
7=vreg_ctr,P,A,1
|
||||||
8=vreg_ctr[0x60],P,A,1
|
8=vreg_ctr[0x60],P,A,1
|
||||||
9=RTCEN,P,A,1
|
9=RTCEN,P,A,1
|
||||||
10=
|
10=system_status,P,A,1
|
||||||
11=
|
11=tasks_immed,P,A,1
|
||||||
12=
|
12=
|
||||||
13=
|
13=
|
||||||
14=
|
14=
|
||||||
@ -893,23 +903,35 @@ Name0=Swb00001
|
|||||||
Address0=accero.c#_pedo_increment+0x78
|
Address0=accero.c#_pedo_increment+0x78
|
||||||
Window0=ASM
|
Window0=ASM
|
||||||
Status0=ON
|
Status0=ON
|
||||||
Name1=Swb00002
|
Name1=Swb00003
|
||||||
Address1=loader.c#_main+0x86
|
Address1=self_flash.c#_firm_update+0x0
|
||||||
Window1=ASM
|
Window1=ASM
|
||||||
Status1=ON
|
Status1=ON
|
||||||
Name2=Swb00003
|
Name2=Swb00005
|
||||||
Address2=self_flash.c#_firm_update+0x0
|
Address2=self_flash.c#_firm_update+0xfe
|
||||||
Window2=ASM
|
Window2=ASM
|
||||||
Status2=ON
|
Status2=ON
|
||||||
Name3=Swb00005
|
Name3=Swb00004
|
||||||
Address3=self_flash.c#_firm_update+0xfe
|
Address3=self_flash.c#_firm_update+0x101
|
||||||
Window3=ASM
|
Window3=ASM
|
||||||
Status3=ON
|
Status3=ON
|
||||||
Name4=Swb00004
|
Name4=Swb00007
|
||||||
Address4=self_flash.c#_firm_update+0x101
|
Address4=pm.c#_ntr_pmic_comm+0x0
|
||||||
Window4=ASM
|
Window4=ASM
|
||||||
Status4=ON
|
Status4=ON
|
||||||
Count=5
|
Name5=Swb00006
|
||||||
|
Address5=task_misc.c#_do_command+0x15
|
||||||
|
Window5=ASM
|
||||||
|
Status5=ON
|
||||||
|
Name6=Swb00008
|
||||||
|
Address6=task_misc.c#_do_command+0x37
|
||||||
|
Window6=ASM
|
||||||
|
Status6=ON
|
||||||
|
Name7=Swb00009
|
||||||
|
Address7=task_misc.c#_do_command+0x4a
|
||||||
|
Window7=ASM
|
||||||
|
Status7=ON
|
||||||
|
Count=8
|
||||||
[Reset]
|
[Reset]
|
||||||
Debugger=ON
|
Debugger=ON
|
||||||
Symbol=OFF
|
Symbol=OFF
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user