diff --git a/trunk/VCProj/bsr_trunk.sdf b/trunk/VCProj/bsr_trunk.sdf
index fda7336..9b0bee7 100644
Binary files a/trunk/VCProj/bsr_trunk.sdf and b/trunk/VCProj/bsr_trunk.sdf differ
diff --git a/trunk/VCProj/bsr_trunk.suo b/trunk/VCProj/bsr_trunk.suo
index edae829..bf9192d 100644
Binary files a/trunk/VCProj/bsr_trunk.suo and b/trunk/VCProj/bsr_trunk.suo differ
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 );
 }