From 633829c5981646512775226a045057377c659c19 Mon Sep 17 00:00:00 2001
From: fujita_ryohei <fujita_ryohei@013db118-44a6-b54f-8bf7-843cb86687b1>
Date: Mon, 7 Dec 2009 11:32:27 +0000
Subject: [PATCH] =?UTF-8?q?PM=5FIRQ=20reset=E5=8D=98=E5=93=81=E3=81=A7?=
 =?UTF-8?q?=E3=81=AA=E3=81=8F=E3=81=A6=E3=82=82=E5=8F=8D=E5=BF=9C=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=20?=
 =?UTF-8?q?=E3=80=80=E3=83=90=E3=82=B0=E5=87=BA=E3=81=97=E3=82=92=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=82=82=E3=82=89=E3=81=86=E3=81=9F=E3=82=81?=
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@39 013db118-44a6-b54f-8bf7-843cb86687b1
---
 trunk/pm.c            |  9 +++--
 trunk/yav_mcu_bsr.pri | 78 +++++++++++++++++++++++++++----------------
 2 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/trunk/pm.c b/trunk/pm.c
index 8ba8172..7fbca06 100644
--- a/trunk/pm.c
+++ b/trunk/pm.c
@@ -763,8 +763,11 @@ __interrupt void intp5_shell(  )
  =========================================================*/
 __interrupt void intp6_PM_irq(  )
 {
-    EI();
-    renge_task_immed_add( ntr_pmic_comm );
+    if( system_status.pwr_state == ON )
+    {
+        EI();
+        renge_task_immed_add( ntr_pmic_comm );
+    }
 }
 
 
@@ -823,7 +826,7 @@ task_status_immed ntr_pmic_comm(  )
     {
         // 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 );
         }
diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri
index edddc23..555817a 100644
--- a/trunk/yav_mcu_bsr.pri
+++ b/trunk/yav_mcu_bsr.pri
@@ -58,7 +58,7 @@ Symbol Reset1=ON
 Dir=.
 Filter=Source
 [Debugger Option]
-Source Path=""
+Source Path="renge"
 Symbol Size=Byte
 Symbol Format=Hex
 Register Name=Func
@@ -78,10 +78,10 @@ Symbol Type=OFF
 Language=C
 Kanji=SJIS
 [Source]
-Geometry=84, 31, 600, 1014
+Geometry=167, 56, 600, 1014
 Window=Normal
-DispStart=383
-CaretPos=384,0
+DispStart=53
+CaretPos=109,0
 Mode=Normal
 DispFile=
 Address1=
@@ -139,11 +139,19 @@ SaveRange=Screen
 SaveStart=
 SaveEnd=
 Accumulative=ON
+[Source1]
+Geometry=0, 5, 726, 1048
+Window=Normal
+DispStart=112
+CaretPos=1,0
+Mode=Normal
+DispFile=task_misc.c
+Accumulative=ON
 [Assemble]
 Geometry=605, 2, 600, 400
 Window=Normal
-DispStart=16527
-CaretPos=16527,27
+DispStart=10271
+CaretPos=10271,27
 Address1=
 Address2=
 Address3=
@@ -195,8 +203,8 @@ Ascii=OFF
 Idtag=OFF
 Address=
 DispStart=00000F60
-CaretPosData=26, 269
-CaretPosAscii=50176, 0
+CaretPosData=0, 246
+CaretPosAscii=0, 246
 Address1=
 Address2=
 Address3=
@@ -859,15 +867,17 @@ Geometry=1145, 8, 440, 1086
 Window=Normal
 Boundary=13762700
 0=.RTCEN,P,S,A,+,1
-1=.hyst_pedometer,.,N,A,+,1
-2=.pool,P,N,A,+,1
-3=.last_year,P,N,A,+,1
-4=.last_month,P,N,A,+,1
-5=.last_day,P,N,A,+,1
-6=.last_hour,P,N,A,+,1
-7=.p_record,P,N,A,+,1
-8=.vreg_ctr[0x60],P,N,A,+,1
-Line=9
+1=.tasks_immed,P,N,A,+,1
+2=.system_status,.,N,A,+,1
+3=.hyst_pedometer,.,N,A,+,1
+4=.pool,P,N,A,+,1
+5=.last_year,P,N,A,+,1
+6=.last_month,P,N,A,+,1
+7=.last_day,P,N,A,+,1
+8=.last_hour,P,N,A,+,1
+9=.p_record,P,N,A,+,1
+10=.vreg_ctr[0x60],P,N,A,+,1
+Line=11
 [Quick Watch]
 0=last_hour,P,A,1
 1=last_day,P,A,1
@@ -879,8 +889,8 @@ Line=9
 7=vreg_ctr,P,A,1
 8=vreg_ctr[0x60],P,A,1
 9=RTCEN,P,A,1
-10=
-11=
+10=system_status,P,A,1
+11=tasks_immed,P,A,1
 12=
 13=
 14=
@@ -893,23 +903,35 @@ Name0=Swb00001
 Address0=accero.c#_pedo_increment+0x78
 Window0=ASM
 Status0=ON
-Name1=Swb00002
-Address1=loader.c#_main+0x86
+Name1=Swb00003
+Address1=self_flash.c#_firm_update+0x0
 Window1=ASM
 Status1=ON
-Name2=Swb00003
-Address2=self_flash.c#_firm_update+0x0
+Name2=Swb00005
+Address2=self_flash.c#_firm_update+0xfe
 Window2=ASM
 Status2=ON
-Name3=Swb00005
-Address3=self_flash.c#_firm_update+0xfe
+Name3=Swb00004
+Address3=self_flash.c#_firm_update+0x101
 Window3=ASM
 Status3=ON
-Name4=Swb00004
-Address4=self_flash.c#_firm_update+0x101
+Name4=Swb00007
+Address4=pm.c#_ntr_pmic_comm+0x0
 Window4=ASM
 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]
 Debugger=ON
 Symbol=OFF