From f77e630f7fb2b51da5c6cbb8a8db155294674fc6 Mon Sep 17 00:00:00 2001
From: n2232 <n2232@013db118-44a6-b54f-8bf7-843cb86687b1>
Date: Wed, 13 Jun 2012 01:49:44 +0000
Subject: [PATCH] =?UTF-8?q?i2c=5Fctr.c[ctr/twl]=20=E5=88=9D=E6=9C=9F?=
 =?UTF-8?q?=E5=8C=96=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AE=E3=83=9D=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E8=A8=AD=E5=AE=9A=E3=80=81=E8=AA=A4=E3=81=A3=E3=81=A6?=
 =?UTF-8?q?=E3=81=9F=EF=BC=88=E5=AE=9F=E5=AE=B3=E3=81=AF=E3=81=AA=E3=81=97?=
 =?UTF-8?q?=EF=BC=89=20TSKI=E3=82=BF=E3=82=B9=E3=82=AF=E3=81=AE=E8=BF=94?=
 =?UTF-8?q?=E5=80=A4=E3=80=81=E5=90=8D=E5=89=8D=E5=A4=89=E6=9B=B4=EF=BC=86?=
 =?UTF-8?q?typo=E4=BF=AE=E6=AD=A3?=
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@459 013db118-44a6-b54f-8bf7-843cb86687b1
---
 trunk/VCProj/bsr_trunk.sdf | Bin 2248704 -> 2248704 bytes
 trunk/VCProj/bsr_trunk.suo | Bin 72192 -> 74752 bytes
 trunk/accero.c             |  16 ++++++++--------
 trunk/adc.c                |   4 ++--
 trunk/i2c_ctr.c            |   6 +++++-
 trunk/i2c_twl.c            |   5 ++++-
 trunk/pm.c                 |  14 +++++++-------
 trunk/renge/renge.c        |   2 +-
 trunk/renge/renge_defs.h   |   4 ++--
 trunk/task_debug.c         |   6 +++---
 trunk/task_misc.c          |   4 ++--
 11 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/trunk/VCProj/bsr_trunk.sdf b/trunk/VCProj/bsr_trunk.sdf
index fda7336b18bff077bedd98a8a7fd4c570a9157bb..9b0bee7a66d50edd40248862dee200c7ccef411e 100644
GIT binary patch
delta 11281
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

delta 8816
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

diff --git a/trunk/VCProj/bsr_trunk.suo b/trunk/VCProj/bsr_trunk.suo
index edae82972b95b5a60727f62ff80b74a678be246a..bf9192d509f9177522831321357f2b069eea51d8 100644
GIT binary patch
delta 1990
zcmZWqdr(wm6u;-*-OF8e7r8u^XM`&Q2B9k|4k-$;SXv`UBub|8SO`mAv!(WODK%3f
zm!n?6Vq|kjCZm<RiVlpdK#ut&LZ?Br#xeddXRK*86qUZa56tz>{O<j}-#O=Z&OPVb
zy(XK?bXsQhXJ8fb%p7<f7ctL58kRBBVI4LwdH#>a$HygXrYOopP%nGOkNTzbkRtOu
zFcP<3d|!5f1s`l)5{S=mp=eZQu|OimIS(Z|lvy-p1f`<MFT-V1du-_N>z7O386Jk+
zL}ZgA#ru;M$yiX3jnZR6V^9|M%4VP==pqYKi7C)y5*@)SfdBg1+??5!i$yL+(;0hU
z)^UIH(m=5)B$?*FONg)gIcM)SVRnDtV89!Va>;TwY!oCtSSa3!*u(O=l#7qrUeOCp
z-IdWt(-yB;WnLPA9oi9o<QuAE_tLF1x^!LV?gi!kqmiOdP8p>6<wu+Hj|CgT0+UWX
z@MR(jdC77-b|u5lx?B;+9LZK~<kno=PJONplq@OnZ2$?<YAhkghv)v#+PdcbR3dDC
zb*wEd<zSd(shWA6_Fw+O%u;h-b8G+TOF!0yH0EIq28$b#3#Ras_SfAn-!td!yDJk0
z&iwsvixh(oS1e?yXws0liG~>SzYXFW%IEHmcu&!=ohs>!PS4w@loBkc*rJfDh_mm6
zvtvUp1DO+B<A?o>b1G{eQ>H9XQy-8hX<E{SJQpK6YHYN*xKA+*6m^y0k-1=pWh>Wy
zD3TT<civzuHd*`L(=_J_aRs5H(K$xZxUZJBoS@OF2p7Y9Mxfr(i@p1j#5)!xW9g&O
zWYVJcU^5F<ByF{)6m%TSR=w$6h_SVnZa*buZHuGTFv-h~Mk_g%rG(9UtRqp22~{~k
z84u^eiiw@$aKCDqmyqaaR{>V{1z_b_P7FUY0%+<^M&&@bn0>(t^~d_;%SlL<M?`cS
z%Odr#UNUIx%wnCbEbw@uqqAS0PyE(+7}3$Cg7!KsEo$x80DE@K7w7NlVNlnXEoL`a
zNoI!@5A2K-=b!EY%YGVP<dRWm^A*$1*}>96r`Hg*PY6CG*g~*_U@O6A1ltI<6TC%G
zOCbHqzaY;#f-ebnN}LE^bwm4riEck+BI!(8QG2<CfkmDQm8oRr>xn11aMSlS_%f#x
zb+&9kdbbvJ4V)N1d|8d!hA6S=$aS#XB17#k;pmZhXtnuaf1ONRav}*Vf3Y~AApy2<
z?CRFL4@9gC?f31NcFJUVAXE5Kx=4x&qEM(&Kmn%RlM7KAm<DF&-lr_7XmydXS~%<j
z@otWlIOBRWKTLo|$!i@`Y$y@Pzg+^R4i!og@?t~byQR(`Ong{~@wYVfmqLVA77CTs
zhVoLwO6T3_Ak1Z;kS!=GGE`T%i1UO{R2qsa))|b3YJq1UUQ(f}jlyINNz!^LZ;uZs
zxw7)I)ypz7awqbLHwQH!nMe&uV(L&Y;O|3I>N{gPVtip3(0nCH_`wIBcNRi?Sm8Gf
zOvlhao51_^gN0!qnBhh1`H#t5JXa!Fgks|D60bKF`~yIX(`B4+QVlKWKdO>8wBEZ{
z)-jD*<`JU;?4d#x4{M+9k4FylSa9WuP9c%dxQ_`DinE)^J(xi6dL6GOIt%mlbEnk1
zCd`m&wgdsqkdX>i9HeW`xgDg(4T3-dxAPOnLCVf^|7*x|(pos7h7$Lv(lwccab0nC
zD_J;;tCtSVG%^+;CKO`8;yLw#F%-xLsG0bsKjy-q7AN1G={0RBx7;mF=}h(oWF6(q
zjW-7qT_c!!`&X>Ek}F*EBVVG%yRkB%F$D5)Xe@RYT$LB66zD!eP`!r!D*aQ4=A!-s
Djmf=U

delta 2130
zcmZ{ldr%Ws6o>b0HZg<{vqB;-iy&2efB`FDr)UhRBTOq5U+7qA(vC=l5iv8``ifIw
z#!BUJforwC(y7%JDP$2)d_+-;qJU_%I%>sM{iD@s$LLrK+OtU(YCF9%-`+dt{Px^?
z&b@cn-p1J*xH_#2rV(D21o<RQ76FS$u53IQ$>*|p+Vu>>Jb&@x#YSIW!R2YRW&1N?
zOcy|gHs&MYW3EF1O0s80AQ`3%CN}>JlDaQJc<eueRlp#W%pLG)GDs^IPu!X=xdT0^
zl1K3kFwBks;o0Ccj-+Z*h&?D(0e&b^OA_J^>I`5;p$V7cX@pls3vS(f;32U&ZTgA6
z2i^6Pmbdyp&}hqN1`5lECbE1Hr*xUGKfLPf&bl5l?tZvj^t6XO1qBSoP+3xRm?Jz6
zt5)zwie??%UG%}2W1pBVPc74}T2wwWj5I~v<F{T}yfWsp@tN+9uBNOsN2e15ofvVM
z<pZme);%iP8FsLH%I(I|PkRGJ&!LeEWqiZ*p*xBr&-UDZ5*@$b@S`S=XVREjfYGAn
zud$hfv@xpk%pCr;;7y6f&91w1e<hKbI-zhv534=8_H^e7|N6|JO8L_4<L#kj1JMbq
z5-lUN*Sgki&+D`vHFc0u<Dx7(z7s_H=1)_=aLg%C%1N*-_&SKM+IIKh{#xhgSJ(9w
zjkC(L{KcuKEGzPp`=eOZFLtk*EmOW!THBf~nLHguANGrE_6)4tYP8Mox4Abou<O6Y
z{i{I^AhpPMNF7p-I1vG9Kn@~}NE6bG96}BwEyxk%C~^!rj<}E$$VsFXIfa}?&LH0-
zZOB>V957a<9S7%;3rGjjiF6?sk#6J?avAvnxq@6penhSz*O6Pu4df;w9{8WIzm4=D
zcaWdSo{cLV#Y*R~C{~CnyCrj+<eXdESV)r!LEPIi0$@4T=H)7GFJT>LSjRcG!qFN4
z@BQ2FcBo}!NT5M5baVl++oMR-zCGSsvhN+a7;1qugJ9cV!aBEvvqE_7DAuE~)%k9e
zuea6DhIx{nxa+&*3Y@S&vIuUc8c5-;bRoU6QC87>N*;smi~)CZhA(bQh5~ZXXOVow
z-O?q07cFl}7QuZ4gWaiqgVa@ONY^n=n6c9d4i`(TG*sC3WF#jTYi@uL-u4U5xpxRD
zIH(jt8}0!yDHDmIQY9GAyTH-N@>0R1elwm?za==AXm~Eb7ni`<ZD*A#h6XT<A4AJR
zp_ESc11rrB2Lml0gh^xRgs3ZfWl$(BP@RGsw-UpMjn0UG6q?O~wP}qKEa14Iq2)4|
zLwCOd<C+$!VIsh1G#(($@f%AmLm`~DD_}IJ=x7bZH{pz%!123+UIdukgtO*x#P!Uj
zSeS3g$$g(%BEU!^BH?vMFGuG`!cCRIV3?MiG%;zCnRdz{#IXfv4+~#HHLX{IH6S;C
z;flqDQ}c2yE8>>Wp5YMlk9-brn3+or@~UMJC)z9MV>Og}R!?#D)m%Zo^cJq%8ep~9
zY}o~tLQB3BO@pa>KF|zPR$wd<6SH_y1>Td8H&+WO?Te*#gF&yec*`U{U2E|XhnQ)d
z61I5!`maQfuN}fZ0x|EP<)OIL<2<MWvu&0YOIO6%R@v69S)FW}kerZQ(GuMht%4gc
zEFn2IF~N`!8y|0uk4;WaGQ?ti`U~_253%&3+?%w5W=DWYKU<m%`#ePalb8qcFzJg~
zNfGJVgk!BJ@a&+4rf4CRe;Z36wOKe0rfY}6V)4XG)9;cTjM~+PWAPf8t2|XAPkSeN
zQs%|;?`tmcn>R=d&`id2O4eNIt!Pacr0a)CDrT(9<Qw~f{dZ?3Q@a+_Dn05#5cB_?
zhsk>J`|NFMR}c=wo9wGV|Nc+b^F9reT;(eFjm<<{-SoXdz*fzKx4awprzB)Jmp_(6
z{JZ*ADV{ZN&frHPxj?#dI2=)W^|?mUdpL$h2SYSWm2MWb1w*HT*@KdR0b2-^{0(E)
Bo4Wu2

diff --git a/trunk/accero.c b/trunk/accero.c
index 16819dc..0cc91f7 100644
--- a/trunk/accero.c
+++ b/trunk/accero.c
@@ -103,7 +103,7 @@ task_status_immed tski_cbk_accero(  )
         {
 	        acc_retry_count ++;
             // リトライ
-            return( ERR_CONTINUE );
+            return( TSKI_CONTINUE );
         }
         else
         {
@@ -111,7 +111,7 @@ task_status_immed tski_cbk_accero(  )
             vreg_ctr[ VREG_C_ACC_CONFIG ] &= ~( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ );
             tski_acc_setup();
             vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR;
-            return ( ERR_FINISED ); // タスクの削除は必要
+            return ( TSKI_FINISHED ); // タスクの削除は必要
         }
     }
     else
@@ -143,7 +143,7 @@ task_status_immed tski_cbk_accero(  )
             pedometer();    // 歩数計
         }
     }
-    return ( ERR_FINISED );
+    return ( TSKI_FINISHED );
 }
 
 
@@ -157,7 +157,7 @@ task_status_immed tski_acc_read(  )
 {
     vreg_ctr[VREG_C_ACC_W_BUF] = iic_mcu_read_a_byte( IIC_SLA_ACCEL, vreg_ctr[VREG_C_ACC_R_ADRS] );
 	set_irq( VREG_C_IRQ1, REG_BIT_ACC_ACK );
-    return ( ERR_FINISED );
+    return ( TSKI_FINISHED );
 }
 
 
@@ -169,7 +169,7 @@ task_status_immed tski_acc_write(  )
 {
     iic_mcu_write_a_byte( IIC_SLA_ACCEL, vreg_ctr[VREG_C_ACC_W_ADRS], vreg_ctr[VREG_C_ACC_W_BUF] );
 	set_irq( VREG_C_IRQ1, REG_BIT_ACC_ACK );
-    return ( ERR_FINISED );
+    return ( TSKI_FINISHED );
 }
 
 
@@ -222,7 +222,7 @@ task_status_immed tski_acc_setup(  )
 		{
 			// センサ反応無し。タスクは削除しなくてはならない。
 			vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR;
-		    return ( ERR_FINISED );
+		    return ( TSKI_FINISHED );
 			// おしまい
 		}
 		// else
@@ -247,12 +247,12 @@ task_status_immed tski_acc_setup(  )
 				( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ )))
 		{
 			// DI状態のまま帰る
-			return ( ERR_CONTINUE );	// ちょっと間をおいて再度書きにくる // もっとよい実装？
+			return ( TSKI_CONTINUE );	// ちょっと間をおいて再度書きにくる // もっとよい実装？
 		}
 	}
 
 	// DI状態のまま帰る
-    return ( ERR_FINISED );
+    return ( TSKI_FINISHED );
 }
 
 
diff --git a/trunk/adc.c b/trunk/adc.c
index 2cea7a5..94920c7 100644
--- a/trunk/adc.c
+++ b/trunk/adc.c
@@ -165,7 +165,7 @@ task_status_immed tski_vol_update()
 
     if( !( system_status.pwr_state == ON ) || 
         ( system_status.pwr_state == SLEEP )){
-        return( ERR_FINISED );
+        return( TSKI_FINISHED );
     }
 
     // どの音量にするの？ //
@@ -216,7 +216,7 @@ task_status_immed tski_vol_update()
     iic_mcu_write_a_byte_codec( CODEC_REG_VOL, slider_to_codec[ sent_index ] );
 
     //    set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE );  // 割り込み廃止
-    return( ERR_FINISED );
+    return( TSKI_FINISHED );
 }
 
 
diff --git a/trunk/i2c_ctr.c b/trunk/i2c_ctr.c
index d17daa0..a56fb98 100644
--- a/trunk/i2c_ctr.c
+++ b/trunk/i2c_ctr.c
@@ -47,6 +47,9 @@
 #define SMC         SMC1
 #define DFC         DFC1
 #define IICS		IICS1
+#define PortMode	PM20
+#define Port		P20
+
 #endif
 
 
@@ -290,7 +293,8 @@ void IIC_ctr_Init( void )
 
     IICE = 1;
 
-    PM20 &= ~0x3;                /* set clock pin for IICA */	// *twlと*ctrで違いますよ！
+	PortMode &= ~0x03;
+	Port     &= ~0x03;
 
 	state = IIC_IDLE;
 }
diff --git a/trunk/i2c_twl.c b/trunk/i2c_twl.c
index 2bd82b5..fef7ac2 100644
--- a/trunk/i2c_twl.c
+++ b/trunk/i2c_twl.c
@@ -53,6 +53,8 @@
 #define SMC        SMC0
 #define TRC        TRC0
 #define DFC		   DFC0
+#define PortMode	PM6
+#define Port		P6
 
 #endif // _MCU_BSR_
 
@@ -224,7 +226,8 @@ void IIC_twl_Init( void )
 
     IICE = 1;
 
-    PM3 &= ~0x3;               /* set clock pin for IICA */	// *twlと*ctrで違いますよ！
+	PortMode &= ~0x03;
+	Port     &= ~0x03;
 
     LREL = 1;
 }
diff --git a/trunk/pm.c b/trunk/pm.c
index eeca098..829e9e8 100644
--- a/trunk/pm.c
+++ b/trunk/pm.c
@@ -633,7 +633,7 @@ task_status_immed tski_BT_temp_update(  )
             }
         }
     }
-    return ( ERR_FINISED );
+    return ( TSKI_FINISHED );
 }
 
 
@@ -1002,7 +1002,7 @@ void PM_LCD_vcom_set(  )
 task_status_immed tski_vcom_set(  )
 {
     PM_LCD_vcom_set(  );
-    return ( ERR_FINISED );
+    return ( TSKI_FINISHED );
 }
 
 
@@ -1148,7 +1148,7 @@ task_status_immed tski_ntr_pmic_comm(  )
     ntr_pm_reg_shadow = iic_mcu_read_a_byte( IIC_SLA_CODEC, CODEC_REG_PM );
     if( iic_mcu_result != ERR_SUCCESS )
     {
-        return ( ERR_FINISED );
+        return ( TSKI_FINISHED );
     }
 
 //    DI(  );
@@ -1218,7 +1218,7 @@ task_status_immed tski_ntr_pmic_comm(  )
         ntr_pm_reg_shadow &= ~( REG_BIT_TWL_REQ_OFF_REQ | REG_BIT_TWL_REQ_RST_REQ );
         iic_mcu_write_a_byte_codec( CODEC_REG_PM, ntr_pm_reg_shadow );
     }
-    return ( ERR_FINISED );
+    return ( TSKI_FINISHED );
 }
 
 
@@ -1231,13 +1231,13 @@ task_status_immed tski_ntr_pmic_comm(  )
 task_status_immed tski_PM_LCD_on()
 {
     PM_LCD_on();
-    return( ERR_FINISED );
+    return( TSKI_FINISHED );
 }
 
 task_status_immed tski_PM_LCD_off()
 {
     PM_LCD_off();
-    return( ERR_FINISED );
+    return( TSKI_FINISHED );
 }
 
 task_status_immed tski_PM_BL_set()
@@ -1252,7 +1252,7 @@ task_status_immed tski_PM_BL_set()
     while( cmd_BL != vreg_ctr[VREG_C_COMMAND2] );  // <- PM_BL_setが更新する
     vreg_ctr[VREG_C_COMMAND2] = 0;
 
-    return( ERR_FINISED );
+    return( TSKI_FINISHED );
 }
 
 
diff --git a/trunk/renge/renge.c b/trunk/renge/renge.c
index bab45cc..19bee20 100644
--- a/trunk/renge/renge.c
+++ b/trunk/renge/renge.c
@@ -126,7 +126,7 @@ __callt err renge_task_interval_run(){
  ●システムtick、何らかの割り込み（I2C通信完了など）で
  スリープから復帰したタイミングで実行されます。
 
-■返値　ERR_FINISED　タスクを削除
+■返値　TSKI_FINISHED　タスクを削除
 　　　　それ以外     次のタイミングでまた実行
 
  *****************************************************************************/
diff --git a/trunk/renge/renge_defs.h b/trunk/renge/renge_defs.h
index 0199d76..03c98a6 100644
--- a/trunk/renge/renge_defs.h
+++ b/trunk/renge/renge_defs.h
@@ -33,8 +33,8 @@ typedef enum _ERR
 
 typedef enum _IMMED_TASK_ERR
 {
-  ERR_FINISED = 0,
-  ERR_CONTINUE
+  TSKI_FINISHED = 0,
+  TSKI_CONTINUE
 }IMMED_TASK_ERR;
 
 
diff --git a/trunk/task_debug.c b/trunk/task_debug.c
index 0fd66a7..e5b502c 100644
--- a/trunk/task_debug.c
+++ b/trunk/task_debug.c
@@ -112,9 +112,9 @@ task_interval tsk_hina(  )
  ***********************************************/
 task_status_immed tski_hina( u8 * arg )
 {
-    return ( ERR_FINISED );
-    // ERR_FINISED タスクを削除
-    // ERR_CONTINUE 次になんか割り込みなり、ユーザー操作なり、システムチックが
+    return ( TSKI_FINISHED );
+    // TSKI_FINISHED タスクを削除
+    // TSKI_CONTINUE 次になんか割り込みなり、ユーザー操作なり、システムチックが
     //             来たときに再度実行
 }
 
diff --git a/trunk/task_misc.c b/trunk/task_misc.c
index 80afe55..7c01f14 100644
--- a/trunk/task_misc.c
+++ b/trunk/task_misc.c
@@ -300,10 +300,10 @@ task_status_immed tski_do_command0(  )
     スリープ要求直後に電源OFF・リセットコマンドは来まい
     if( vreg_ctr[VREG_C_COMMAND0] != 0 )
     {
-        return ( ERR_CONTINUE );
+        return ( TSKI_CONTINUE );
     }
 */
-    return ( ERR_FINISED );
+    return ( TSKI_FINISHED );
 }