From 218a5e322f733fe22cbc2b7441d06b2e71dcee88 Mon Sep 17 00:00:00 2001 From: fujita_ryohei Date: Tue, 15 Dec 2009 12:23:31 +0000 Subject: [PATCH] =?UTF-8?q?LCD=20OFF=E3=81=A8BL=20OFF=20=E3=81=8C=E5=90=8C?= =?UTF-8?q?=E6=99=82=E3=81=AB=E6=9D=A5=E3=81=9F=E9=9A=9B=E3=80=81BL=20OFF?= =?UTF-8?q?=E5=89=B2=E3=82=8A=E8=BE=BC=E3=81=BF=E3=82=92=E4=BA=8C=E5=BA=A6?= =?UTF-8?q?=E5=85=A5=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=200.B=E3=81=A8=E3=81=97=E3=81=A6Horizon?= =?UTF-8?q?=E3=83=AA=E3=83=9D=E3=82=B8=E3=83=88=E3=83=AA=E3=81=AB=E3=83=AA?= =?UTF-8?q?=E3=83=AA=E3=83=BC=E3=82=B9?= 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@65 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/pm.c | 3 ++ trunk/vreg_ctr.h | 3 +- trunk/yav_mcu_bsr.pri | 69 +++++++++++++++++++++++-------------------- 3 files changed, 41 insertions(+), 34 deletions(-) diff --git a/trunk/pm.c b/trunk/pm.c index 5d0bdc5..d8ec29a 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -300,6 +300,7 @@ void PM_LCD_off() while( !IRQ0 && ( ++tot != 0 ) ){;} IRQ0_ast; } + vreg_ctr[VREG_C_COMMAND2] &= ~( REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_L_OFF ); } #ifdef _PMIC_TWL_ @@ -312,6 +313,8 @@ void PM_LCD_off() PM_VDDLCD_off( ); // 残ってたの全部止めます。 vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW; + + set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF ); } diff --git a/trunk/vreg_ctr.h b/trunk/vreg_ctr.h index f2c3b0d..5354c41 100644 --- a/trunk/vreg_ctr.h +++ b/trunk/vreg_ctr.h @@ -245,8 +245,7 @@ enum VREG_C VREG_C_ACC_HOSU_L = 0x4B, VREG_C_ACC_HOSU_M, VREG_C_ACC_HOSU_H, - VREG_C_ACC_HOSU_LENGTH = 0x4E, - VREG_C_ACC_HOSU_HIST, + VREG_C_ACC_HOSU_HIST = 0x4F, // VREG_C_AMBIENT_BRIGHTNESS = 0x60, diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 1dd298c..4520422 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -23,7 +23,7 @@ SubClock=None Count=0 [Main] Geometry=66, 66, 1467, 1110 -Window=Normal +Window=Max MDI_MAX=OFF Button=ON Mode=Auto @@ -80,8 +80,8 @@ Kanji=SJIS [Source] Geometry=135, 77, 904, 1014 Window=Normal -DispStart=267 -CaretPos=268,0 +DispStart=31 +CaretPos=87,0 Mode=Normal DispFile= Address1= @@ -139,11 +139,19 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON +[Source1] +Geometry=0, 0, 904, 1014 +Window=Normal +DispStart=320 +CaretPos=1,0 +Mode=Normal +DispFile=pm.c +Accumulative=ON [Assemble] Geometry=605, 2, 600, 400 Window=Normal -DispStart=15777 -CaretPos=15777,27 +DispStart=674 +CaretPos=674,27 Address1= Address2= Address3= @@ -859,22 +867,23 @@ Geometry=1145, 8, 440, 1086 Window=Normal Boundary=13762700 0=.blset,P,N,A,+,1 -1=.pool,P,N,A,+,1 -2=.hyst_pedometer,.,N,A,+,1 -3=.P5.3,P,S,A,+,1 -4=.PM5.3,P,S,A,+,1 -5=.RTCEN,P,S,A,+,1 -6=.tasks_immed,P,N,A,+,1 -7=.system_status,.,N,A,+,1 -8=.hyst_pedometer,.,N,A,+,1 -9=.pool,P,N,A,+,1 -10=.last_year,P,N,A,+,1 -11=.last_month,P,N,A,+,1 -12=.last_day,P,N,A,+,1 -13=.last_hour,P,N,A,+,1 -14=.p_record,P,N,A,+,1 -15=.vreg_ctr[0x60],P,N,A,+,1 -Line=16 +1=.blset,P,N,A,+,1 +2=.pool,P,N,A,+,1 +3=.hyst_pedometer,.,N,A,+,1 +4=.P5.3,P,S,A,+,1 +5=.PM5.3,P,S,A,+,1 +6=.RTCEN,P,S,A,+,1 +7=.tasks_immed,P,N,A,+,1 +8=.system_status,.,N,A,+,1 +9=.hyst_pedometer,.,N,A,+,1 +10=.pool,P,N,A,+,1 +11=.last_year,P,N,A,+,1 +12=.last_month,P,N,A,+,1 +13=.last_day,P,N,A,+,1 +14=.last_hour,P,N,A,+,1 +15=.p_record,P,N,A,+,1 +16=.vreg_ctr[0x60],P,N,A,+,1 +Line=17 [Quick Watch] 0=last_hour,P,A,1 1=last_day,P,A,1 @@ -904,19 +913,15 @@ Name1=Swb00002 Address1=accero.c#_hosu_increment+0x52 Window1=ASM Status1=ON -Name2=Swb00005 -Address2=accero.c#_hosu_read+0xa +Name2=Swb00006 +Address2=pm.c#es_F0132+0x38 Window2=ASM -Status2=ON -Name3=Swb00006 -Address3=pm.c#_PM_init+0x38 +Status2=OFF +Name3=Swb00003 +Address3=pm.c#_PM_BL_set+0x51 Window3=ASM -Status3=OFF -Name4=Swb00003 -Address4=pm.c#_PM_BL_set+0x5c -Window4=ASM -Status4=ON -Count=5 +Status3=ON +Count=4 [Reset] Debugger=ON Symbol=OFF