git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@30 013db118-44a6-b54f-8bf7-843cb86687b1

trunk/accero.c

@@ -16,7 +16,6 @@
 #include "incs.h"
 #include <math.h>
 
-
 // ========================================================
 // レジスタ名
 #define ACC_REG_WHOAMI 0x0F
@@ -73,9 +72,7 @@ task_status_immed tsk_cbk_accero(  )
         // 加速度センサデータレジスタへの反映
         iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), 6, &vreg_ctr[VREG_C_ACC_XL] );
 
-
+        if( ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_ACQ  ) != 0 )
-        if( ( vreg_ctr[VREG_C_ACC_CONFIG] &
-              ( VREG_BITMASK_ACC_CONF_ACQ | VREG_BITMASK_ACC_CONF_HOSU ) ) != 0 )
         {
             set_irq( VREG_C_IRQ1, REG_BIT_ACC_DAT_RDY );
         }
@@ -258,6 +255,7 @@ task_status_immed acc_hosu_set(  )
  ======================================================== */
 __interrupt void intp23_ACC_ready(  )
 {
+    EI();
     if( ( vreg_ctr[VREG_C_ACC_CONFIG] & 0x03 ) != 0x00 )
     {
         if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) )

trunk/adc.c

@@ -251,9 +251,7 @@ u8 get_adc( u8 ch )
     ADCS = 1;                   // AD開始。                     /// ここまで↑　に、1us以上開ける
 
     ADMK = 0;
-    while( ADIF == 0 )
+    while( ADIF == 0 ){;}
-    {;
-    }
     temp = ADCRH;
     ADCEN = 0;
 

trunk/config.h

@@ -7,8 +7,9 @@
 
 
 #define MCU_VER_MAJOR    0;
-#define MCU_VER_MINOR    8;
+#define MCU_VER_MINOR    9;
 
+//#define _OVERCLOCK_
 
 //#define _PARRADIUM_
 //#define _MODEL_TEG2_
@@ -25,13 +26,13 @@
 #ifdef _MODEL_TEG2_
 #define _PMIC_TWL_
 #define _MCU_KE3_
+#undef _CODEC_CTR_
 #endif
 
 
 #ifdef _MODEL_WM0_
 #define _PMIC_TWL_
 #define _MCU_BSR_
-
 #undef _CODEC_CTR_
 #define _SW_HOME_ENABLE_
 #endif

trunk/i2c_mcu.c

@@ -384,6 +384,8 @@ __interrupt void int_dma1(  )
 {
     u16     i = 0;
 
+    EI();
+
     DMAMK1 = 1;
     DEN1 = 0;
     while( ( SSR02L & TSF0 ) != 0 )
@@ -403,11 +405,25 @@ __interrupt void int_dma1(  )
         NOP(  );
         NOP(  );
         NOP(  );
+#ifdef _OVERCLOCK_
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+#endif
         SO0 = 0x0400 | TAUS_MASK;       // SCL
         NOP(  );
         NOP(  );
         NOP(  );
         NOP(  );
+#ifdef _OVERCLOCK_
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+#endif
         SO0 = 0x0404 | TAUS_MASK;
     }
     IICMK10 = 1;
@@ -424,6 +440,7 @@ __interrupt void int_dma1(  )
  ======================================================== */
 __interrupt void int_iic10(  )
 {
+    EI();
     if( iic_send_wo_dma_len != 0 )
     {
         SIO10 = *p_iic_send_wo_dma_dat;
@@ -443,11 +460,25 @@ __interrupt void int_iic10(  )
         NOP(  );
         NOP(  );
         NOP(  );
+#ifdef _OVERCLOCK_
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+#endif
         SO0 = 0x0400 | TAUS_MASK;       // SCL
         NOP(  );
         NOP(  );
         NOP(  );
         NOP(  );
+#ifdef _OVERCLOCK_
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+#endif
         SO0 = 0x0404 | TAUS_MASK;
     }
     iic_mcu_wo_dma = 0;
@@ -512,6 +543,13 @@ static void iic_mcu_send_st(  )
     NOP(  );
     NOP(  );
     NOP(  );
+#ifdef _OVERCLOCK_
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+#endif
     SO0 &= ~0x0400;             // SCL
     SOE0 = 0x0004;              // ハード制御へ
 
@@ -532,11 +570,25 @@ static void iic_mcu_send_re_st(  )
     NOP(  );
     NOP(  );
     NOP(  );
+#ifdef _OVERCLOCK_
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+#endif
     SOE0 &= ~0x0004;            // ( SCL = H ), SDA -> L
     NOP(  );
     NOP(  );
     NOP(  );
     NOP(  );
+#ifdef _OVERCLOCK_
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+#endif
     iic_mcu_send_st(  );
 }
 
@@ -555,11 +607,25 @@ static void iic_mcu_send_sp(  )
     NOP(  );
     NOP(  );
     NOP(  );
+#ifdef _OVERCLOCK_
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+#endif
     SO0 = 0x0400 | TAUS_MASK;   // SCL
     NOP(  );
     NOP(  );
     NOP(  );
     NOP(  );
+#ifdef _OVERCLOCK_
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+#endif
     SO0 = 0x0404 | TAUS_MASK;
 }
 
@@ -581,9 +647,20 @@ void iic_mcu_start(  )
     NOP(  );
     NOP(  );
     NOP(  );
+#ifdef _OVERCLOCK_
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+    NOP(  );
+#endif
     SPS0 = 0x0000;              // シリアルユニットのクロック０。(8M/2)/1
-    SMR02 = bSMR0n_FIXEDBIT | bMD0n2;	// I2Cとそのクロックなど設定
+    SMR02 = bSMR0n_FIXEDBIT | bMD0n2;	// 簡易I2Cに設定
+#ifdef _OVERCLOCK_
+    SDR02 = 12 << 9;             // ボーレート設定 (8M/2)/1/(x+1)/2
+#else
     SDR02 = 5 << 9;             // ボーレート設定 (8M/2)/1/(x+1)/2
+#endif
 
     SO0 = 0x0404 | TAUS_MASK;   // 最初はHH
     iic_mcu_busy = 0;
@@ -597,10 +674,7 @@ void iic_mcu_start(  )
     iic_mcu_send_st();
 
     SIO10 = 0xFF;
-    while( IICIF10 == 0 )
+    while( IICIF10 == 0 ){}                           // 通信中
-    {
-        NOP(  );
-    }                           // 通信中
     iic_mcu_send_sp();
 
     iic_mcu_initialized = 1;

trunk/i2c_mcu.h

@@ -30,4 +30,5 @@ err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat );
 void iic_mcu_start(  );
 void iic_mcu_stop(  );
 
+
 #endif

trunk/i2c_twl.c

@@ -82,7 +82,7 @@ u16     tot;
 __interrupt void int_iic_twl(  )
 {
     u8      temp;
-    u16     tot = 0;
+    u16     tot;
 
 //  WDT_Restart();
     // フラグ１回目    スレーブアドレス,R/W

trunk/led.c

@@ -469,11 +469,14 @@ void tsk_led_cam(  )
     static u8 task_interval;
     static u8 state_led_cam_twl;
 
-    if( task_interval-- != 0 )
+    if( task_interval != 0 )
     {
+        task_interval -= 1;
         return;
     }
 
+    // ブリンクのように待たせたいとき以外は毎週起動する
+    //  (レジスタの変更にすぐに反応する)
 
     switch ( vreg_ctr[VREG_C_LED_CAM] )
     {
@@ -559,3 +562,4 @@ void tsk_led_cam(  )
     }
     return;
 }
+

trunk/loader.c

@@ -165,10 +165,6 @@ void main(  )
  ======================================================== */
 __interrupt void int_kr(  )
 {
-    if( system_status.pwr_state == OFF )
-    {
-        // 電源onのカウント。特にすることはない
-    }
 }
 
 
@@ -197,8 +193,12 @@ void hdwinit( void )
 
     CMC = 0b00010110;          /* X1発振せず(入力ポート)、XT1使用、推奨の推奨で超低電力発振 */
     CSC = 0b10000000;          /* X1発振なし、XT1発振あり、高速内蔵発振動作 */
-    //    OSMC = 0x00;                    /* フラッシュ・メモリの高速動作用昇圧回路 */
+//    OSMC = 0x00;                    /* フラッシュ・メモリの高速動作用昇圧回路 */
-    CKC = 0b00001001;          /* CPU/周辺クロック=fMAIN、fMAIN=fMX、fCLK=fMX */
+#ifdef _OVERCLOCK_
+    CKC = 0b00001000;          /* CPU/周辺クロック=fMAIN、fMAIN=fMX、fCLK=fMX */
+#else
+    // CKC デフォルトでよい
+#endif
 
   /*--- 低電圧検出回路の設定 ---*/
     /* リセット解除時のデフォルトは、オプション・バイトにて指定される */

trunk/pm.c

@@ -240,46 +240,63 @@ err PM_LCD_on(  )
     wait_ms( DELAY_PM_TSS_50B_AND_VCOM );
     wait_ms( DELAY_PM_VCOM_TO_BL );
     vreg_ctr[VREG_C_STATUS] |= REG_BIT_LCD_POW;
-
+    set_irq( VREG_C_IRQ3, REG_BIT_LCD_ON );
     return ( PM_chk_LDSW(  ) );
 }
 
-err PM_LCD_off(  )
+void PM_LCD_off(  )
 {
 //  PM_TEG_LCD_dis( 1 );
     wait_ms( 1 + 50 );
     PM_VDDLCD_off(  );          // 残ってたの全部止めます。
     vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW;
-    return ( ERR_SUCCESS );
+    set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF );
 }
 
-err PM_BL_on(  )
+err PM_BL_set( u8 dat )
 {
+    static u8 blset = 0;
+
+    // Modify
+    // ue
+    if(( dat & REG_BIT_CMD_BL_U_ON ) != 0 )
+    {
+        blset |= PM_REG_BIT_BL_U;
+    }
+    else if(( dat & REG_BIT_CMD_BL_U_OFF ) != 0 )
+    {
+        blset &= ~PM_REG_BIT_BL_U;
+    }
+
+    // shita
+    if(( dat & REG_BIT_CMD_BL_L_ON ) != 0 )
+    {
+        blset |= PM_REG_BIT_BL_L;
+    }
+    else if(( dat & REG_BIT_CMD_BL_L_OFF ) != 0 )
+    {
+        blset &= ~PM_REG_BIT_BL_L;
+    }
+
+    // Write
+
+    if( blset != 0x00 ){
         wait_ms( 10 );
-    vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL;
+    }
-    return ( PM_chk_LDSW(  ) );
+    vreg_ctr[VREG_C_STATUS] = (( vreg_ctr[VREG_C_STATUS] & 0b10011111 ) + ( blset << 5 ));  // todo
-}
+    // いくつかのビットをまとめて操作するのでここで
+    // マスクは効かない
+    {
+        u8 tot;
 
-err PM_BL_off(  )
+        vreg_ctr[ VREG_C_IRQ3 ] |= blset;
-{
+        IRQ0_neg;
-    vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL;
+        tot = 0;
-    return ( ERR_SUCCESS );
+        while( !IRQ0 && ( ++tot != 0 ) ){;}
-}
+        IRQ0_ast;
+    }
 
-
+    return( ERR_SUCCESS );         // ここでは異常チェック不要
-err PM_BL_set(  )
-{
-    // 何もしない
-    wait_ms( 10 );
-#ifdef _VREG_C_NEW_
-        vreg_ctr[VREG_C_STATUS] = ( vreg_ctr[VREG_C_STATUS] & ~( REG_BIT_BL_U | REG_BIT_BL_L )
-        | ( command_bl_set & REG_BIT_CMD_BL_U_ON )? REG_BIT_BL_U
-        | ( command_bl_set & REG_BIT_CMD_BL_L_ON )? REG_BIT_BL_L
-        );
-#else
-    vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL;
-#endif
-    return ( PM_chk_LDSW(  ) );
 }
 
 
@@ -296,34 +313,21 @@ err PM_LCD_vcom_set(  )
 err PM_LCD_on(  )
 {
     vreg_ctr[VREG_C_STATUS] |= REG_BIT_LCD_POW;
+    set_irq( VREG_C_IRQ3, REG_BIT_LCD_ON );
     SND_DEPOP = 0;   // 1でミュート
     return ( ERR_SUCCESS );
 }
 
 
-err PM_LCD_off(  )
+void PM_LCD_off(  )
 {
-    vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW;
     SND_DEPOP = 1;
-    return ( ERR_SUCCESS );
+    vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW;
+    set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF );
 }
 
 
-err PM_BL_on(  )
+err PM_BL_set( u8 )
-{
-    vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL;
-    return ( ERR_SUCCESS );
-}
-
-
-err PM_BL_off(  )
-{
-    vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL;
-    return ( ERR_SUCCESS );
-}
-
-
-err PM_BL_set(  )
 {
     wait_ms( 10 );
 #ifdef _VREG_C_NEW_
@@ -331,6 +335,8 @@ err PM_BL_set(  )
         | ( command_bl_set & REG_BIT_CMD_BL_U_ON )? REG_BIT_BL_U
         | ( command_bl_set & REG_BIT_CMD_BL_L_ON )? REG_BIT_BL_L
         );
+
+
 #else
     vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL;
 #endif
@@ -350,9 +356,6 @@ err PM_LCD_vcom_set(  )
 
 # else
 // PMIC CTR
-
-
-
 /* ========================================================
   液晶系の電源制御
   　ステータスフラグはすぐに立ててしまう。
@@ -362,6 +365,8 @@ err PM_LCD_vcom_set(  )
  ======================================================== */
 err PM_LCD_on(  )
 {
+    u8 rv;
+
     PM_VDDLCD_on(  );
 
     wait_ms( DELAY_PM_TSS_50B_AND_VCOM );
@@ -371,46 +376,31 @@ err PM_LCD_on(  )
     wait_ms( DELAY_PM_VCOM_TO_BL );
 
     iic_mcu_write_a_byte( IIC_SLA_PMIC, 0x22, 0x4A );   // バグ持ちPMIC対策
+
+    rv = PM_chk_LDSW(  );
+
+    if( rv != 0 )
+    {
+        // 電源起動エラーなら電源も切れてしまいます
         vreg_ctr[VREG_C_STATUS] |= REG_BIT_LCD_POW;
+        set_irq( VREG_C_IRQ3, REG_BIT_LCD_ON );
 
         SND_DEPOP = 0;   // 1でミュート
-
+    }
-    return ( PM_chk_LDSW(  ) );
+    return ( rv );
 }
 
 
-
+void PM_LCD_off()
-err PM_LCD_off(  )
 {
+    SND_DEPOP = 1;
+
     PM_TCOM_VCS_off(  );
     wait_ms( DELAY_PM_LCD_OFF );
 
     PM_VDDLCD_off(  ); // 残ってたの全部止めます。
     vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW;
-
+    set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF );
-    SND_DEPOP = 1;
-
-    return ( ERR_SUCCESS );
-}
-
-
-
-err PM_BL_on(  )
-{
-    PM_set_BL( 0x03 );
-    wait_ms( 10 );
-
-    vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL;
-    return ( PM_chk_LDSW(  ) );
-}
-
-
-
-err PM_BL_off(  )
-{
-    PM_set_BL( 0x00 );
-    vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL;
-    return ( ERR_SUCCESS );
 }
 
 
@@ -419,39 +409,62 @@ err PM_BL_off(  )
 　バックライトの個別on/off
 　現状から　on/off/維持　のフラグなので面倒
 ======================================================== */
-err PM_BL_set(  )
+err PM_BL_set( u8 dat )
 {
-    // まじめにRMW
+    u8 blset;
-    //    temp = iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL );
+    u8 regset = 0;
+    // RMWを行う
 
-    // キャッシュ(マイコン内のステータスレジスタ）を信じる
+    // Read
-    // 今のバックライトの状態
+    blset = iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL ) ;
-    if( command_bl_set & REG_BIT_CMD_BL_U_ON )
+
+    // Modify
+    // ue
+    if(( dat & REG_BIT_CMD_BL_U_ON ) != 0 )
     {
-        vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL_U;
+        blset |= PM_REG_BIT_BL_U;
+        regset |= REG_BIT_BL_U_ON;
     }
-    else if( command_bl_set & REG_BIT_CMD_BL_U_OFF ){
+    else if(( dat & REG_BIT_CMD_BL_U_OFF ) != 0 )
-        vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL_U;
-    }
-
-    if( command_bl_set & REG_BIT_CMD_BL_L_ON )
     {
-        vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL_L;
+        blset &= ~PM_REG_BIT_BL_U;
-    }
+        regset |= REG_BIT_BL_U_OFF;
-    else if( command_bl_set & REG_BIT_CMD_BL_L_OFF ){
-        vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL_L;
     }
 
-    iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL,
+    // shita
-        ( vreg_ctr[VREG_C_STATUS] & ( REG_BIT_BL_U | REG_BIT_BL_L ) >> 5 ) );
+    if(( dat & REG_BIT_CMD_BL_L_ON ) != 0 )
+    {
+        blset |= PM_REG_BIT_BL_L;
+        regset |= REG_BIT_BL_L_ON;
+    }
+    else if(( dat & REG_BIT_CMD_BL_L_OFF ) != 0 )
+    {
+        blset &= ~PM_REG_BIT_BL_L;
+        regset |= REG_BIT_BL_U_ON;
+    }
 
-    if( command_bl_set != 0x00 ){
+    // Write
+    iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL, blset );
+
+    if( blset != 0x00 ){
         wait_ms( 10 );
     }
+    vreg_ctr[VREG_C_STATUS] = (( vreg_ctr[VREG_C_STATUS] & 0b10011111 ) + ( blset << 5 ));  // todo
+    // いくつかのビットをまとめて操作するのでここで
+    // マスクは効かない
+    {
+        u8 tot;
+
+        vreg_ctr[ VREG_C_IRQ3 ] |= regset;
+        IRQ0_neg;
+        tot = 0;
+        while( !IRQ0 && ( ++tot != 0 ) ){;}
+        IRQ0_ast;
+    }
+    
     return( ERR_SUCCESS );         // ここでは異常チェック不要
 }
 
-
 /* ========================================================
   液晶の対向電圧の設定を行います。
   仮想レジスタの内容を送るだけ
@@ -482,48 +495,6 @@ task_status_immed tski_vcom_set(  )
 
 
 
-/* ========================================================
-  ↑の、I2Cコマンドでの実行の場合の為の、ラッパー的な物
-  実仕様上は大丈夫だろうけど、同じ関数がキューに2つ以上
-  乗らないようにしてあるし、ばらばらにしておく。
- ======================================================== */
-task_status_immed tski_PM_LCD_on(  )
-{
-    PM_LCD_on(  );
-    set_irq( VREG_C_IRQ3, REG_BIT_LCD_ON );
-    return ( ERR_FINISED );
-}
-
-task_status_immed tski_PM_LCD_off(  )
-{
-    PM_LCD_off(  );
-    set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF );
-    return ( ERR_FINISED );
-}
-
-task_status_immed tski_PM_BL_on(  )
-{
-    PM_BL_on(  );
-    return ( ERR_FINISED );
-}
-
-task_status_immed tski_PM_BL_off(  )
-{
-    PM_BL_off(  );
-    return ( ERR_FINISED );
-}
-
-task_status_immed tski_PM_BL_set(  )
-{
-    PM_BL_set(  );
-    set_irq( VREG_C_IRQ3, command_bl_set );
-    return ( ERR_FINISED );
-}
-
-
-
-
-
 /* ========================================================
   シーケンスの通り電源を立ち上げてゆきます。
   返値 0 最後まで正常に完了した。
@@ -630,7 +601,7 @@ err PM_sys_pow_on(  )
 err PM_sys_pow_off(  )
 {
 #ifdef _PMIC_CTR_
-    PM_BL_set(  );
+    PM_BL_set(  REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_L_OFF );
     PM_LCD_off(  );             //     TCOM,VCS OFF も消してきます。
 
     PM_reset_ast(  );
@@ -685,6 +656,7 @@ void tsk_batt(  )
 {
     static u8 task_interval = 0;
     static u8 charge_hys = 0;   // ヒステリシスで上限下限を拡張するとき１
+    static bit pm_extdc_old;
 
     if( task_interval-- != 0 )
     {
@@ -695,10 +667,23 @@ void tsk_batt(  )
         task_interval = (u8)( INTERVAL_TSK_BATT / SYS_INTERVAL_TICK );
     }
 
-    // 電源周りのステータスが変化？ ///
+
-    set_bit( !PM_EXTDC_n, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
+    // アダプタ？ //
-    set_bit( !BT_CHG_n, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE );
+    if( pm_extdc_old != !PM_EXTDC_n )
-    // →割り込み。miscの中でよろしくやってくれている。
+    {
+        pm_extdc_old = !PM_EXTDC_n;
+        if( pm_extdc_old )
+        {
+            set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
+            set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_CONNECT );
+        }
+        else
+        {
+            set_bit( 0, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
+            set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_DISC );
+        }
+    }
+
 
     // 充電 ///////////////////////////
     // 温度付きヒステリシス
@@ -733,22 +718,14 @@ void tsk_batt(  )
         BT_CHG_EN_n = 0; // /WL_RSTなのです
 #endif
 
-
+    // 充電 //
-    // 充電LED
+    // →割り込み。miscの中でよろしくやってくれている。
+    set_bit( !BT_CHG_n, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE );
     LED_duty_CHARGE = !BT_CHG_n ? vreg_ctr[VREG_C_LED_BRIGHT] : 0;
 
-    // 電池残量
-    PM_get_batt_left();
 
-    // PMIC-NTRに電池残量を教えてあげる
+    // 電池残量 //
-    if( vreg_ctr[ VREG_C_BT_REMAIN ] < 5 )
+    PM_get_batt_left();
-    {
-        iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_BT, 1 );  // 1で電池切れ
-    }
-    else
-    {
-        iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_BT, 0 );
-    }
 
     // dubug monitor
     vreg_ctr[ VREG_C_FREE0 ] = vreg_ctr[ VREG_C_BT_REMAIN ];
@@ -787,6 +764,7 @@ __interrupt void intp5_shell(  )
  =========================================================*/
 __interrupt void intp6_PM_irq(  )
 {
+    EI();
     renge_task_immed_add( ntr_pmic_comm );
 }
 
@@ -810,16 +788,15 @@ task_status_immed ntr_pmic_comm(  )
     }
     DI(  );
 
-#ifdef _VREG_C_NEW_
     if( ( ( reg1_old ^ reg_shadow ) & REG_BIT_TWL_REQ_BL_U ) != 0 )
     {
         if( ( reg_shadow & REG_BIT_TWL_REQ_BL_U ) == 0 )             // 消えた
         {
-            set_irq( VREG_C_IRQ4, REG_BIT_TWL_BL_U_OFF );
+            set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_U_OFF );
         }
         else
         {
-            set_irq( VREG_C_IRQ4, REG_BIT_TWL_BL_U_ON );
+            set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_U_ON );
         }
     }
 
@@ -828,30 +805,13 @@ task_status_immed ntr_pmic_comm(  )
     {
         if( ( reg_shadow & REG_BIT_TWL_REQ_BL_L ) == 0 )             // 消えた
         {
-            set_irq( VREG_C_IRQ4, REG_BIT_TWL_BL_L_OFF );
+            set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_L_OFF );
         }
         else
         {
-            set_irq( VREG_C_IRQ4, REG_BIT_TWL_BL_L_OFF );
+            set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_L_ON );
         }
     }
-#else
-
-    if( ( ( reg1_old ^ reg_shadow ) & REG_BIT_TWL_REQ_BL ) != 0 )  // バックライトの2ビットが何らか変化して、
-    {
-        if( ( reg_shadow & REG_BIT_TWL_REQ_BL ) == 0x00 )          // 00になった
-        {
-            // 両方消された
-            set_irq( VREG_C_IRQ3, REG_BIT_TWL_BL_OFF );
-        }
-        else if( ( reg_shadow & REG_BIT_TWL_REQ_BL ) == REG_BIT_TWL_REQ_BL )
-        {
-            // 両方ついた
-            set_irq( VREG_C_IRQ3, REG_BIT_TWL_BL_ON );
-        }
-    }
-
-#endif
 
     else
 
@@ -859,29 +819,21 @@ task_status_immed ntr_pmic_comm(  )
 // offリクエスト
     if( ( reg_shadow & REG_BIT_TWL_REQ_OFF_REQ ) != 0 )
     {
-#ifdef _VREG_C_NEW_
+        set_irq( VREG_C_IRQ2, REG_BIT_TWL_OFF_REQ );
-        set_irq( VREG_C_IRQ4, REG_BIT_TWL_OFF_REQ );
-#else
-        set_irq( VREG_C_IRQ3, REG_BIT_TWL_OFF_REQ );
-#endif
     }
 
     else
 
-    // リセットリクエスト
+// リセットリクエスト
     if( ( reg_shadow & REG_BIT_TWL_REQ_RST_REQ ) != 0 )
     {
         // CODECバグ回避
         // リセット単品でなかったら無視
         if( ( reg1_old ^ reg_shadow ) == REG_BIT_TWL_REQ_RST_REQ )
         {
-#ifdef _VREG_C_NEW_
+            set_irq( VREG_C_IRQ2, REG_BIT_TWL_RESET_REQ );
-            set_irq( VREG_C_IRQ4, REG_BIT_TWL_RESET_REQ );
-#else
-            set_irq( VREG_C_IRQ3, REG_BIT_TWL_RESET_REQ );
         }
     }
-#endif
 
     // バックライトが...
     EI(  );
@@ -917,4 +869,13 @@ static void PM_get_batt_left(){
     {
         vreg_ctr[ VREG_C_BT_REMAIN ] = 99;
     }
+
+
+    // PMIC-NTRに電池残量を教えてあげる
+    iic_mcu_write_a_byte( IIC_SLA_CODEC,
+                            CODEC_REG_BT,
+                            ( vreg_ctr[ VREG_C_BT_REMAIN ] < 5 ) );  // 1で電池切れ
+
+
+
 }

trunk/pm.h

@@ -7,6 +7,18 @@
 
 
 //=========================================================
+enum PMIC_REG_ADRS
+{
+  PM_REG_ADRS_VER = 0x00,       // verinfo など
+  PM_REG_ADRS_VDD_SYS,          // システムが使用する電源
+  PM_REG_ADRS_VDD_LCD,          // 液晶電源
+  PM_REG_ADRS_CONT,             // /RESET1, LoadSwitch
+  PM_REG_ADRS_BL,               // バックライト on/off
+  PM_REG_ADRS_POW_SAVE,         // 省電力設定
+  PM_REG_ADRS_POW_DAC1,
+  PM_REG_ADRS_POW_DAC2
+};
+
 enum BT_GAUGE_REG_ADRS
 {
   BT_GAUGE_REG_VCELL    = 0x02,    // それぞれ16ビットのため
@@ -20,18 +32,6 @@ enum BT_GAUGE_REG_ADRS
   BT_GAUGE_REG_COMMAND  = 0xFE
 };
 
-enum PMIC_REG_ADRS
-{
-  PM_REG_ADRS_VER = 0x00,       // verinfo など
-  PM_REG_ADRS_VDD_SYS,          // システムが使用する電源
-  PM_REG_ADRS_VDD_LCD,          // 液晶電源
-  PM_REG_ADRS_CONT,             // /RESET1, LoadSwitch
-  PM_REG_ADRS_BL,               // バックライト on/off
-  PM_REG_ADRS_POW_SAVE,         // 省電力設定
-  PM_REG_ADRS_POW_DAC1,
-  PM_REG_ADRS_POW_DAC2
-};
-
 
 
 
@@ -62,8 +62,10 @@ enum PMIC_REG_ADRS
 #define PM_REG_BIT_LCD_ANALOG ( 0x03 << 3 )
 
 // 0x04 bl cnt
-#define PM_REG_BIT_BL_U         0x02
+#define PM_REG_BIT_BL_U         0x01
-#define PM_REG_BIT_BL_L         0x01
+#define PM_REG_BIT_BL_L         0x02
+
+
 
 
 #define DELAY_PM_TW_PWUP               16
@@ -82,21 +84,17 @@ extern u8 command_bl_set;
 //=========================================================
 err PM_sys_pow_on(  );
 err PM_sys_pow_off(  );
-err PM_LCD_on(  );
 err PM_bt_auth(  );
-task_status_immed PM_bt_temp_update(  );
 void PM_init(  );
 err PM_LCD_vcom_set(  );
+
+err PM_LCD_on(  );
+void PM_LCD_off(  );
+err PM_BL_set( u8 );
+
+task_status_immed PM_bt_temp_update(  );
 task_status_immed tski_vcom_set(  );
 
-err PM_BL_on(  );
-err PM_BL_off(  );
-
-task_status_immed tski_PM_BL_on(  );
-task_status_immed tski_PM_BL_off(  );
-task_status_immed tski_PM_LCD_on(  );
-task_status_immed tski_PM_LCD_off(  );
-
 
 
 //  　これを呼ぶ前に、現在温度を教えておく必要があります。

trunk/rtc.c

@@ -71,6 +71,7 @@ void RTC_init( void )
  ======================================================== */
 __interrupt void int_rtc(  )
 {
+    EI();
     // 日付も指定日で
     if( ( vreg_ctr[VREG_C_RTC_ALARM_DAY] == DAY )
         && ( vreg_ctr[VREG_C_RTC_ALARM_MONTH] == MONTH )

trunk/self_flash.c

@@ -166,7 +166,10 @@ err firm_update(  )
 
         }
         // 1ブロック書き込み完了。内部ベリファイを行う
-        while( FSL_IVerify( target_block ) != FSL_OK ){;}
+        if( FSL_IVerify( target_block ) != FSL_OK ){
+            // todo 再度消去→書き込み ベリファイを繰り返すだけじゃダメでした...
+            NOP();
+        }
 
         if( SPD )
         {

trunk/sw.c

@@ -131,7 +131,7 @@ void tsk_sw(  )
         }
 
         // wifi sw //
-        if( SW_wifi_count == HOLD_THREASHOLD )
+        if( SW_wifi_count == CLICK_THRESHOLD )
         {
             set_irq( VREG_C_IRQ0, REG_BIT_SW_WIFI_CLICK );
         }

trunk/task_debug.c

@@ -26,9 +26,6 @@ void tsk_debug(  )
         iic_mcu_write_a_byte( IIC_SLA_DCP, 0x08, 0x80 );     // ACR←0x80 揮発モードへ
 
         if( !SW_SEL_n ){
-            command_bl_set = REG_BIT_CMD_BL_U_ON | REG_BIT_CMD_BL_L_ON;
-            PM_LCD_on();
-            PM_BL_on();
         }
 
 //        vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x03;

trunk/task_misc.c

@@ -12,7 +12,6 @@
 #define INTERVAL_TSK_MISC_STAT 4
 
 
-
 /* ========================================================
  ステータスレジスタなど
  ======================================================== */
@@ -20,6 +19,9 @@ void tsk_misc_stat(  )
 {
     static u8 interval_task_misc_stat = 0;
     static u8 state_old;        // ステータス変化検出→割り込み の為
+#ifdef _BL_INDEPENDENT_
+    static u8 state2_old;
+#endif
     u8      diff;
 
     if( interval_task_misc_stat != 0 )
@@ -37,95 +39,27 @@ void tsk_misc_stat(  )
     // ステータスレジスタ関係 → 割り込み //
     if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) )
     {
+        // pm.c で、その場で行います。
+        // REG_BIT_LCD_ON/OFF
+        // REG_BIT_BL_ON/OFF
+        // REG_BIT_BT_DC_CONNECT/DISC
+
+
         diff = vreg_ctr[VREG_C_STATUS] ^ state_old;
         if( diff != 0 )
         {
             state_old = vreg_ctr[VREG_C_STATUS];
 
-            if( diff & REG_BIT_LCD_POW )
-            {
-                // 液晶電源セット完了
-                if( vreg_ctr[VREG_C_STATUS] & REG_BIT_LCD_POW )
-                {
-                    // on
-                    set_irq( VREG_C_IRQ3, REG_BIT_LCD_ON );
-                }
-                else
-                {
-                    // off
-                    set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF );
-                }
-            }
-
-            if( diff & REG_BIT_BL )
-            {
-                // バックライトに変化有り
-                if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BL )
-                {
-                    // ついた
-                    set_irq( VREG_C_IRQ3, REG_BIT_BL_ON );
-                }
-                else
-                {
-                    // 消えた
-                    set_irq( VREG_C_IRQ3, REG_BIT_BL_OFF );
-                }
-            }
-#if 0
-            todo
-                    if( diff & REG_BIT_BL_U )
-            {
-                // バックライトに変化有り
-                if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BL_U )
-                {
-                    // ついた
-                    set_irq( VREG_C_IRQ4, REG_BIT_BL_U_ON );
-                }
-                else
-                {
-                    // 消えた
-                    set_irq( VREG_C_IRQ4, REG_BIT_BL_U_OFF );
-                }
-            }
-
-            if( diff & REG_BIT_BL_L )
-            {
-                // バックライトに変化有り
-                if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BL_L )
-                {
-                    // ついた
-                    set_irq( VREG_C_IRQ4, REG_BIT_BL_L_ON );
-                }
-                else
-                {
-                    // 消えた
-                    set_irq( VREG_C_IRQ4, REG_BIT_BL_L_OFF );
-                }
-            }
-#endif
             if( diff & REG_BIT_BATT_CHARGE )
             {
                 // 充電状態に以下略
                 if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BATT_CHARGE )
                 {
-                    set_irq( VREG_C_IRQ2, REG_BIT_BT_CHG_START );
+                    set_irq( VREG_C_IRQ1, REG_BIT_BT_CHG_START );
                 }
                 else
                 {
-                    set_irq( VREG_C_IRQ2, REG_BIT_BT_CHG_STOP );
+                    set_irq( VREG_C_IRQ1, REG_BIT_BT_CHG_STOP );
-                }
-            }
-
-            if( diff & REG_BIT_POW_SUPPLY )
-            {
-                // 電源供給
-                if( vreg_ctr[VREG_C_STATUS] & REG_BIT_POW_SUPPLY )
-                {
-                    set_irq( VREG_C_IRQ2, REG_BIT_BT_DC_CONNECT );
-                }
-                else
-                {
-                    set_irq( VREG_C_IRQ2, REG_BIT_BT_DC_DISC );
                 }
             }
 
@@ -134,15 +68,16 @@ void tsk_misc_stat(  )
                 // 蓋の開け閉め
                 if( vreg_ctr[VREG_C_STATUS] & REG_BIT_ST_SHELL_OPEN )
                 {
-                    set_irq( VREG_C_IRQ2, REG_BIT_SHELL_OPEN );
+                    set_irq( VREG_C_IRQ0, REG_BIT_SHELL_OPEN );
                 }
                 else
                 {
-                    set_irq( VREG_C_IRQ2, REG_BIT_SHELL_CLOSE );
+                    set_irq( VREG_C_IRQ0, REG_BIT_SHELL_CLOSE );
                 }
             }
         }
 
+
 //#ifdef _MCU_KE3_
         // KE3では必須です。
         /* ========================================================
@@ -186,7 +121,7 @@ void tsk_misc_stat(  )
 task_status_immed do_command(  )
 {
 
-    // 本体電源など
+    // command0 本体電源など
     if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_OFF_REQ )
     {
         system_status.pwr_state = OFF_TRIG;
@@ -200,41 +135,43 @@ task_status_immed do_command(  )
             FCRAM_RST_ast;
             wait_ms( 5 );
         }
-        if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_RESET2_REQ )
+        else
         {
-            RESET2_ast;
-            wait_ms( 5 );
-        }
             if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_FCRAM_RESET_REQ )
             {
                 FCRAM_RST_ast;
                 wait_ms( 5 );
             }
+            else if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_RESET2_REQ )
+            {
+                RESET2_ast;
+                wait_ms( 5 );
+            }
+        }
         PM_reset_neg(  );
         RESET2_neg;
         FCRAM_RST_neg;
     }
 
-    // 液晶電源など
+    // command2 液晶系
-    if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_BL_ON )
+    // こちらからの完了割り込みを待ってくれることを前提にしています。
+    if(( vreg_ctr[VREG_C_COMMAND2] & REG_BIT_CMD_LCD_ON ) != 0 )
     {
-        renge_task_immed_add( tski_PM_BL_on );
+        PM_LCD_on();
-    }
-    else if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_BL_OFF )
-    {
-        renge_task_immed_add( tski_PM_BL_off );
     }
 
-    if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_LCD_ON )
+    // バックライトの個別on/off
+    if(( vreg_ctr[VREG_C_COMMAND2] & REG_BITS_CMD_BL ) != 0 )
     {
-        renge_task_immed_add( tski_PM_LCD_on );
+        PM_BL_set( vreg_ctr[VREG_C_COMMAND2] & REG_BITS_CMD_BL );
-    }
-    else if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_LCD_OFF )
-    {
-        renge_task_immed_add( tski_PM_LCD_off );
     }
 
+    if(( vreg_ctr[VREG_C_COMMAND2] & REG_BIT_CMD_LCD_OFF ) != 0 )
+    {
+        PM_LCD_off();
+    }
     vreg_ctr[VREG_C_COMMAND0] = 0;
+    vreg_ctr[VREG_C_COMMAND2] = 0;
     return ( ERR_FINISED );
 }
 

trunk/vreg_ctr.c

@@ -85,6 +85,7 @@ void vreg_ctr_write( u8 adrs, u8 data )
         break;
 
     case ( VREG_C_COMMAND0 ):
+    case ( VREG_C_COMMAND2 ):
         vreg_ctr[adrs] = data;
         if( data != 0 )
         {
@@ -96,17 +97,17 @@ void vreg_ctr_write( u8 adrs, u8 data )
         vreg_ctr[adrs] = data;
         if( data != 0 )
         {
-            // renge_task_immed_add( do_command1 );
+            // TWLに割り込みを入れる
-            /// Ž<EFBFBD>‚Á‚Ä‚«‚Ü‚µ‚½
+            /// 実際に割り込みを入れるのはSoC
-            vreg_twl[REG_TWL_INT_ADRS_IRQ] = ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_PWSW_DET ) != 0 ) ? REG_BIT_TWL_IRQ_PWSW_DET : 0x00;   //pwsw_det
+            vreg_twl[REG_TWL_INT_ADRS_IRQ]  = ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_IRQ_PWSW_DET ) != 0 ) ? REG_BIT_TWL_IRQ_PWSW_DET : 0x00;   //pwsw_det
-            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_RESET ) != 0 ) ? REG_BIT_TWL_IRQ_RESET : 0x00;        //reset_req
+            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_IRQ_PWSW_DET ) != 0 ) ? REG_BIT_TWL_IRQ_RESET : 0x00;        //reset_req
 
-            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_OFF ) != 0 ) ? REG_BIT_TWL_IRQ_OFF : 0x00;    //off_req
+            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_IRQ_OFF ) != 0 ) ? REG_BIT_TWL_IRQ_OFF : 0x00;    //off_req
 
-            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_BT_LOW ) != 0 ) ? REG_BIT_TWL_IRQ_BT_LOW : 0x00;      //batt_low
+            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_IRQ_BT_LOW ) != 0 ) ? REG_BIT_TWL_IRQ_BT_LOW : 0x00;      //batt_low
-            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_BT_EMPTY ) != 0 ) ? REG_BIT_TWL_IRQ_BT_EMPTY : 0x00;  //batt_empty
+            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_IRQ_BT_EMPTY ) != 0 ) ? REG_BIT_TWL_IRQ_BT_EMPTY : 0x00;  //batt_empty
 
-            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_VOL_CHANGE ) != 0 ) ? REG_BIT_TWL_IRQ_VOL_CHANGE : 0x00;      //vol_changed
+            vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_IRQ_VOL_CHANGE ) != 0 ) ? REG_BIT_TWL_IRQ_VOL_CHANGE : 0x00;      //vol_changed
         }
         break;
 

trunk/vreg_ctr.h

@@ -4,16 +4,38 @@
 
 #include "config.h"
 
-#if MCU_VER_MINOR >= 4
-
 #define REG_BIT_RTC_BLACKOUT        0b00000001
 #define REG_BIT__SYS_MODE0          0b01000000
 #define REG_BIT_MCU_FIRMBROKEN      0b10000000
 
 
+
+//  VREG_C_STATUS,
+#define REG_BIT_LCD_POW             ( 1 << 7 )
+#define REG_BIT_BL_U                ( 1 << 6 )
+#define REG_BIT_BL_L                ( 1 << 5 )
+#define REG_BIT_BATT_CHARGE         ( 1 << 4 )
+#define REG_BIT_POW_SUPPLY          ( 1 << 3 )
+//                           未使用 ( 1 << 2 )
+#define REG_BIT_ST_SHELL_OPEN       ( 1 << 1 )
+//                           未使用 ( 1 << 0 )
+
+
+//  VREG_C_STATUS_X
+//                           未使用 ( 1 << 6 )
+//                           未使用 ( 1 << 5 )
+//                           未使用 ( 1 << 4 )
+//                           未使用 ( 1 << 3 )
+//                           未使用 ( 1 << 2 )
+#define REG_BIT_ACCERO_ERR          ( 1 << 1 )
+#define REG_BIT_GASGAUGE_ERR        ( 1 << 0 )
+
+
+
 //  VREG_C_IRQ0
-#define REG_BIT_VR_TUNE_CHANGE      ( 1 << 7 )
+#define REG_BIT_VR_SNDVOL_CHANGE    ( 1 << 7 )
-#define REG_BIT_VR_SNDVOL_CHANGE    ( 1 << 6 )
+#define REG_BIT_SHELL_OPEN          ( 1 << 6 )
+#define REG_BIT_SHELL_CLOSE         ( 1 << 5 )
 #define REG_BIT_SW_WIFI_CLICK       ( 1 << 4 )
 #define REG_BIT_SW_POW_HOLD         ( 1 << 3 )
 #define REG_BIT_SW_POW_CLICK        ( 1 << 2 )
@@ -21,32 +43,16 @@
 #define REG_BIT_SW_HOME_CLICK       ( 1 << 0 )
 
 //  VREG_C_IRQ1
-#define REG_BIT_WDT_DET             ( 1 << 5 )
+#define REG_BIT_BT_CHG_START        ( 1 << 7 )
+#define REG_BIT_BT_CHG_STOP         ( 1 << 6 )
+#define REG_BIT_BT_REMAIN           ( 1 << 5 )
 #define REG_BIT_ACC_DAT_RDY         ( 1 << 4 )
 #define REG_BIT_ACC_ACK             ( 1 << 3 )
 #define REG_BIT_RTC_ALARM           ( 1 << 2 )
-#define REG_BIT_BT_REMAIN           ( 1 << 1 )
+#define REG_BIT_BT_DC_CONNECT       ( 1 << 1 )
+#define REG_BIT_BT_DC_DISC          ( 1 << 0 )
 
 //  VREG_C_IRQ2
-#define REG_BIT_BT_CHG_START        ( 1 << 7 )
-#define REG_BIT_BT_CHG_STOP         ( 1 << 6 )
-#define REG_BIT_BT_DC_CONNECT       ( 1 << 5 )
-#define REG_BIT_BT_DC_DISC          ( 1 << 4 )
-#define REG_BIT_EXTOPT_OPEN         ( 1 << 3 )
-#define REG_BIT_EXTOPT_LOCK         ( 1 << 2 )
-#define REG_BIT_SHELL_OPEN          ( 1 << 1 )
-#define REG_BIT_SHELL_CLOSE         ( 1 << 0 )
-
-#ifdef _VREG_C_NEW_
-//  VREG_C_IRQ3
-#define REG_BIT_LCD_ON              ( 1 << 5 )
-#define REG_BIT_LCD_OFF             ( 1 << 4 )
-#define REG_BIT_BL_U_ON             ( 1 << 3 )
-#define REG_BIT_BL_U_OFF            ( 1 << 2 )
-#define REG_BIT_BL_L_ON             ( 1 << 1 )
-#define REG_BIT_BL_L_OFF            ( 1 << 0 )
-
-//  VREG_C_IRQ4
 #define REG_BIT_TWL_BL_U_ON         ( 1 << 5 )
 #define REG_BIT_TWL_BL_U_OFF        ( 1 << 4 )
 #define REG_BIT_TWL_BL_L_ON         ( 1 << 3 )
@@ -54,80 +60,64 @@
 #define REG_BIT_TWL_OFF_REQ         ( 1 << 1 )
 #define REG_BIT_TWL_RESET_REQ       ( 1 << 0 )
 
-#else
 //  VREG_C_IRQ3
-#define REG_BIT_TWL_BL_ON           ( 1 << 7 )
+#define REG_BIT_BL_U_ON             ( 1 << 5 )
-#define REG_BIT_TWL_BL_OFF          ( 1 << 6 )
+#define REG_BIT_BL_U_OFF            ( 1 << 4 )
-#define REG_BIT_TWL_OFF_REQ         ( 1 << 5 )
+#define REG_BIT_BL_L_ON             ( 1 << 3 )
-#define REG_BIT_TWL_RESET_REQ       ( 1 << 4 )
+#define REG_BIT_BL_L_OFF            ( 1 << 2 )
-#define REG_BIT_LCD_ON              ( 1 << 3 )
+#define REG_BIT_LCD_ON              ( 1 << 1 )
-#define REG_BIT_LCD_OFF             ( 1 << 2 )
+#define REG_BIT_LCD_OFF             ( 1 << 0 )
-#define REG_BIT_BL_ON               ( 1 << 1 )
-#define REG_BIT_BL_OFF              ( 1 << 0 )
-
-#endif
-
-//  VREG_C_STATUS,
-#define REG_BIT_LCD_POW             ( 1 << 7 )
-#define REG_BIT_BL                  ( 1 << 6 )
-#define REG_BIT_BATT_CHARGE         ( 1 << 4 )
-#define REG_BIT_POW_SUPPLY          ( 1 << 3 )
-#define REG_BIT_ST_SHELL_OPEN       ( 1 << 1 )
-
-#define REG_BIT_BL_U                ( 1 << 6 )
-#define REG_BIT_BL_L                ( 1 << 5 )
 
 
-//  VREG_C_STATUS_1
+// そのうちどこかに...
-#define REG_BIT_GASGAUGE_ERR        ( 1 << 0 )
+//#define REG_BIT_VR_TUNE_CHANGE      ( 1 << 7 )
-#define REG_BIT_ACCERO_ERR          ( 1 << 1 )
 
 
-#ifdef _VREG_C_NEW_
-#define REG_BIT_FCRAM_RESET_REQ     ( 1 << 3 )
-#define REG_BIT_RESET2_REQ          ( 1 << 2 )
-#define REG_BIT_RESET1_REQ          ( 1 << 1 )
-#define REG_BIT_OFF_REQ             ( 1 << 0 )
-
-// VREG_C_COMMAND1
-#define REG_BIT_CMD_LCD_ON          ( 1 << 5 )
-#define REG_BIT_CMD_LCD_OFF         ( 1 << 4 )
-#define REG_BIT_CMD_BL_U_ON         ( 1 << 3 )
-#define REG_BIT_CMD_BL_U_OFF        ( 1 << 2 )
-#define REG_BIT_CMD_BL_L_ON         ( 1 << 1 )
-#define REG_BIT_CMD_BL_L_OFF        ( 1 << 0 )
-
-// VREG_C_COMMAND2
-#define REG_BIT_SEND_TWL_BATT_EMPTY ( 1 << 4 )
-#define REG_BIT_SEND_TWL_BATT_LOW   ( 1 << 3 )
-#define REG_BIT_SEND_TWL_OFF_REQ    ( 1 << 2 )
-#define REG_BIT_SEND_TWL_RESET_REQ  ( 1 << 1 )
-#define REG_BIT_SEND_TWL_PWSW_DET   ( 1 << 0 )
-#else
-
-// 暫定　コンパイルを通すため
-#define REG_BIT_CMD_BL_U_ON         ( 1 << 3 )
-#define REG_BIT_CMD_BL_U_OFF        ( 1 << 2 )
-#define REG_BIT_CMD_BL_L_ON         ( 1 << 1 )
-#define REG_BIT_CMD_BL_L_OFF        ( 1 << 0 )
 
 // VREG_C_COMMAND0
-#define REG_BIT_CMD_LCD_ON              ( 1 << 7 )
+//#define REG_BIT_CMD_LCD_ON              ( 1 << 7 )
-#define REG_BIT_CMD_LCD_OFF             ( 1 << 6 )
+//#define REG_BIT_CMD_LCD_OFF             ( 1 << 6 )
-#define REG_BIT_CMD_BL_ON               ( 1 << 5 )
+//#define REG_BIT_CMD_BL_ON               ( 1 << 5 )
-#define REG_BIT_CMD_BL_OFF              ( 1 << 4 )
+//#define REG_BIT_CMD_BL_OFF              ( 1 << 4 )
 #define REG_BIT_FCRAM_RESET_REQ     ( 1 << 3 )
 #define REG_BIT_RESET2_REQ          ( 1 << 2 )
 #define REG_BIT_RESET1_REQ          ( 1 << 1 )
 #define REG_BIT_OFF_REQ             ( 1 << 0 )
 
-// VREG_C_COMMAND1
+// VREG_C_COMMAND1 (TWLに割り込みを入れる)
+//                           未使用 ( 1 << 7 )
+//                           未使用 ( 1 << 6 )
+#define REG_BIT_SEND_TWL_VOL_CLICK  ( 1 << 5 )
 #define REG_BIT_SEND_TWL_BATT_EMPTY ( 1 << 4 )
 #define REG_BIT_SEND_TWL_BATT_LOW   ( 1 << 3 )
-#define REG_BIT_SEND_TWL_OFF_REQ    ( 1 << 2 )
+#define REG_BIT_SEND_TWL_OFF_DET    ( 1 << 2 )
-#define REG_BIT_SEND_TWL_RESET_REQ  ( 1 << 1 )
+#define REG_BIT_SEND_TWL_RESET_DET  ( 1 << 1 )
 #define REG_BIT_SEND_TWL_PWSW_DET   ( 1 << 0 )
-#endif
+
+// VREG_C_COMMAND2 液晶関係
+#define REG_BIT_CMD_BL_U_ON         ( 1 << 5 )
+#define REG_BIT_CMD_BL_U_OFF        ( 1 << 4 )
+#define REG_BIT_CMD_BL_L_ON         ( 1 << 3 )
+#define REG_BIT_CMD_BL_L_OFF        ( 1 << 2 )
+#define REG_BIT_CMD_LCD_ON          ( 1 << 1 )
+#define REG_BIT_CMD_LCD_OFF         ( 1 << 0 )
+#define REG_BITS_CMD_BL             ( REG_BIT_CMD_BL_U_ON | REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_L_ON | REG_BIT_CMD_BL_L_OFF )
+
+
+// ↑TWLに通知するIRQレジスタ
+#define REG_BIT_TWL_IRQ_PWSW_DET 0x08
+#define REG_BIT_TWL_IRQ_RESET    0x01
+#define REG_BIT_TWL_IRQ_OFF      0x02
+#define REG_BIT_TWL_IRQ_BT_LOW   0x20
+#define REG_BIT_TWL_IRQ_BT_EMPTY 0x10
+#define REG_BIT_TWL_IRQ_VOL_CHANGE 0x40
+
+
+// CODEC上のPMIC NTR の代理レジスタ
+#define REG_BIT_TWL_REQ_OFF            ( 1 << 6 )
+#define REG_BIT_TWL_REQ_BL_U           ( 1 << 3 )
+#define REG_BIT_TWL_REQ_BL_L           ( 1 << 2 )
+#define REG_BIT_TWL_REQ_RESET          ( 1 << 0 )
 
 
 // VREG_C_WIFI_LED
@@ -153,23 +143,6 @@ enum
 };
 
 
-// TWLに送るコマンド
-// command2
-#define REG_BIT_TWL_CMD_PWSW_DET 0x01
-#define REG_BIT_TWL_CMD_RESET    0x02
-#define REG_BIT_TWL_CMD_OFF      0x04
-#define REG_BIT_TWL_CMD_BT_LOW   0x08
-#define REG_BIT_TWL_CMD_BT_EMPTY 0x10
-#define REG_BIT_TWL_CMD_VOL_CHANGE 0x20
-
-// ↑TWL側
-#define REG_BIT_TWL_IRQ_PWSW_DET 0x08
-#define REG_BIT_TWL_IRQ_RESET    0x01
-#define REG_BIT_TWL_IRQ_OFF      0x02
-#define REG_BIT_TWL_IRQ_BT_LOW   0x20
-#define REG_BIT_TWL_IRQ_BT_EMPTY 0x10
-#define REG_BIT_TWL_IRQ_VOL_CHANGE 0x40
-
 
 /*
   ƒeƒ“ƒvƒŒ
@@ -286,10 +259,6 @@ enum VREG_C
    VREG_C_BT_INFO,  // –¢Žg—p
 */
 
-#else
-
-・@"がらっと変えてしまったので、旧版のディレクトリを使用して下さい。"
-#endif
 /*============================================================================*/
 void vreg_ctr_init(  );
 void vreg_ctr_write( u8 adrs, u8 data );

trunk/vreg_twl.c

@@ -8,7 +8,7 @@ TWL
 #include "vreg_twl.h"
 
 #include "vreg_ctr.h"
-
+#include "renge\renge_task_intval.h"
 
 // ========================================================
 #define TWL_REG_VER_INFO               0x35
@@ -43,8 +43,12 @@ void vreg_twl_write( u8 adrs, u8 data )
         }
 
       case ( REG_TWL_INT_ADRS_MODE ):
+        vreg_twl[adrs] = ( data & 0x03 );
+        break;
+
       case ( REG_TWL_INT_ADRS_CAM ):
         vreg_twl[adrs] = ( data & 0x03 );
+        tsk_led_cam();  // todo 大丈夫？
         break;
 
       case ( REG_TWL_INT_ADRS_WIFI ):
@@ -53,17 +57,19 @@ void vreg_twl_write( u8 adrs, u8 data )
         break;
 
       case ( REG_TWL_INT_ADRS_COMMAND ):
+          if( data <= 2 ){
             if( ( data & REG_BIT_TWL_OFF_REQ ) != 0 )
             {
-            set_irq( VREG_C_IRQ3, REG_BIT_TWL_OFF_REQ );      // OFFも実装していたらしい。
+                set_irq( VREG_C_IRQ2, REG_BIT_TWL_OFF_REQ );      // OFFも実装していたらしい。
                 break;
             }
             else if( ( data & REG_BIT_TWL_RESET_REQ ) != 0 )
             {
-            set_irq( VREG_C_IRQ3, REG_BIT_TWL_RESET_REQ );      //リセットしかない。他のは、SPIから来ます。
+                set_irq( VREG_C_IRQ2, REG_BIT_TWL_RESET_REQ );      //リセットしかない。他のは、SPIから来ます。
                 break;
             }
           }
+    }
     return;
 }
 

trunk/yav_mcu_bsr.plg

@@ -1,16 +1,26 @@
 C:\WINDOWS\system32\cmd.exe /c echo touch magic.c
 touch magic.c
-"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no i2c_mcu.c
+"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no pm.c
-i2c_mcu.c(119) : CC78K0R warning W0401: Conversion may lose significant digits
+pm.c(196) : CC78K0R warning W0401: Conversion may lose significant digits
-i2c_mcu.c(196) : CC78K0R warning W0401: Conversion may lose significant digits
+pm.c(208) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    2 warning(s) found.
+pm.c(212) : CC78K0R warning W0401: Conversion may lose significant digits
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_mcu.asm
+pm.c(380) : CC78K0R warning W0401: Conversion may lose significant digits
+pm.c(452) : CC78K0R warning W0401: Conversion may lose significant digits
+pm.c(877) : CC78K0R warning W0401: Conversion may lose significant digits
+Compilation complete,    0 error(s) and    6 warning(s) found.
+"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pm.asm
 Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel"  -go85h,0FC00h,1024 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -kp -gb6EFFFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0  loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel ini_VECT.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel reboot.rel sw.rel task_debug.rel task_misc.rel task_sys.rel 
+"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no vreg_twl.c
+vreg_twl.c(46) : CC78K0R warning W0401: Conversion may lose significant digits
+vreg_twl.c(50) : CC78K0R warning W0401: Conversion may lose significant digits
+Compilation complete,    0 error(s) and    2 warning(s) found.
+"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_twl.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel"  -go85h,0FC00h,1024 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -kp -gb6EFBFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0  loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel ini_VECT.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel reboot.rel sw.rel task_debug.rel task_misc.rel task_sys.rel 
 Link complete,     0 error(s) and     0 warning(s) found.
 "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\oc78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -o.\bsr.hex -nu -ki  bsr.lmf
 Object Conversion Complete,      0 error(s) and     0 warning(s) found.
 C:\WINDOWS\system32\cmd.exe /c ruby C:\Cygwin\home\fujita_ryohei\ctr\nec_s_2_bsrbin.rb bsr.hex
 C:/Cygwin/home/fujita_ryohei/ctr/nec_s_2_bsrbin.rb:2: warning: variable $KCODE is no longer effective; ignored
 
-Build Total error(s) : 0  Total warning(s) : 2 
+Build Total error(s) : 0  Total warning(s) : 8 

trunk/yav_mcu_bsr.prj

@@ -246,36 +246,6 @@ Source19=sw.c
 Source20=task_debug.c
 Source21=task_misc.c
 Source22=task_sys.c
-[IncFile]
-Include1=incs_loader.h
-Include2=jhl_defs.h
-Include3=user_define.h
-Include4=config.h
-Include5=bsr_system.h
-Include6=renge\renge.h
-Include7=renge\renge_defs.h
-Include8=renge\renge_task_immediate.h
-Include9=vreg_ctr.h
-Include10=loader.h
-Include11=i2c_mcu.h
-Include12=WDT.h
-Include13=fsl.h
-Include14=fsl_user.h
-Include15=i2c_ctr.h
-Include16=pm.h
-Include17=rtc.h
-Include18=adc.h
-Include19=led.h
-Include20=incs.h
-Include21=vreg_twl.h
-Include22=accero.h
-Include23=i2c_twl_defs.h
-Include24=renge\renge_task_intval.h
-Include25=i2c_twl.h
-Include26=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
-Include27=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
-Include28=reboot.h
-Include29=sw.h
 [Options.CC78K0R 0]
 Version=210
 Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
@@ -472,7 +442,89 @@ Preprocess=0
 Prenocomment=0
 Predefine=0
 Preifdef=1
-Preinclude=0
+Preinclude=1
+Preline=1
+Prenumber=1
+Formfeed=0
+Columns=132
+Lines=0
+Tablength=8
+Ansi=0
+Cpraspras=1
+Commentnest=0
+Intunexpand=0
+Kanjicode=1210
+Verbose=0
+CommandFile=0
+Warninglevel=1
+Startupchk=1
+Fixation=0
+FarROMization=0
+Objectsel=1305
+Librarychk=1
+Floatingpoint=0
+Muldivunit=1
+Mulunit=1
+Startup=s0rm.rel
+Library1=cl0rdm.lib
+Library2=cl0rm.lib
+Library3=cl0rmf.lib
+VfiFileBoot0=
+VfiFileBoot1=boot.vfi
+VF78K0Rchk=0
+VF78K0Rvs=
+[Options.CC78K0R 2 i2c_twl.c]
+Version=210
+Define0=
+Define1=_debug_,_TEG_,proc_is_ke3
+Define2=_debug_,_TEG_,proc_is_ke3,%time%
+Undefine0=
+Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
+Include1=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
+Include2=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
+Include3=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
+Memorymodel=1
+Flashobj=0
+FlashStartadr=
+FlashBranchStartadr=
+Mirror=0
+Saddrglobalchk=0
+Saddrglobal=1066
+Saddrstaticchk=0
+Saddrstatic=1072
+Bitfieldmsb=0
+Onebytechk=0
+Pacstructchk=0
+AssignROMchk=0
+AssignROM=0
+Maxoptimizechk=1
+Maxoptimize=1103
+Charunexpandchk=1
+Unsignedchar=0
+Usesaddrchk=0
+Autoallocationchk=1
+Jumpoptimize=1
+Librarycallchk=0
+Librarycall=1128
+Aggressivechk=1
+Relativebranchchk=0
+Debugoptchk=0
+Outdebugchk=1
+Outdebug=1153
+Outasmsrccmb0=inter_asm
+Outasmsrccmb1=bsr.asm
+Outasmsrcchk=1
+Outasmsrc=1158
+Outasmoptall=1
+Common=0
+Outerrlistchk=0
+Outerrlist=1174
+Xreference=0
+Preprocess=0
+Prenocomment=0
+Predefine=0
+Preifdef=1
+Preinclude=1
 Preline=1
 Prenumber=1
 Formfeed=0
@@ -742,11 +794,36 @@ VfiFileBoot0=
 VfiFileBoot1=boot.vfi
 VF78K0Rchk=0
 VF78K0Rvs=
-[ToolSet]
+[IncFile]
-ToolSetName=(•Ï<E280A2>X)78K0R Software Package V1.10
+Include1=incs_loader.h
-Tool1=CC78K0R|W2.10
+Include2=jhl_defs.h
-Tool2=RA78K0R|W1.31
+Include3=user_define.h
-Tool3=ID78K0R-QB|V3.60
+Include4=config.h
+Include5=bsr_system.h
+Include6=renge\renge.h
+Include7=renge\renge_defs.h
+Include8=renge\renge_task_immediate.h
+Include9=vreg_ctr.h
+Include10=loader.h
+Include11=i2c_mcu.h
+Include12=WDT.h
+Include13=fsl.h
+Include14=fsl_user.h
+Include15=i2c_ctr.h
+Include16=pm.h
+Include17=rtc.h
+Include18=adc.h
+Include19=led.h
+Include20=incs.h
+Include21=vreg_twl.h
+Include22=accero.h
+Include23=i2c_twl_defs.h
+Include24=renge\renge_task_intval.h
+Include25=i2c_twl.h
+Include26=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
+Include27=reboot.h
+Include28=sw.h
+Include29=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
 [Options.LK78K0R 0]
 Version=100
 O0=bsr_k0r.lmf
@@ -846,7 +923,7 @@ P2=flash.map
 P3=a.map
 MI=0
 GB=1
-GBValue=6EFFFF
+GBValue=6EFBFF
 KM=1
 KD=0
 KP=1
@@ -1038,3 +1115,8 @@ DefaultMode2=1
 DefaultMode3=1
 DefaultMode4=1
 DefaultMode5=1
+[ToolSet]
+ToolSetName=(•Ï<E280A2>X)78K0R Software Package V1.10
+Tool1=CC78K0R|W2.10
+Tool2=RA78K0R|W1.31
+Tool3=ID78K0R-QB|V3.60

trunk/yav_mcu_bsr.prk

@@ -6,30 +6,31 @@ FrameCX=1022
 FrameCY=766
 OpenFile1=renge\\renge_defs.h,0,330,330,1574,1087,0,47,0,0
 OpenFile2=user_define.h,0,176,176,1420,933,0,33,20,0
-OpenFile3=rtc.c,0,308,308,1491,934,0,31,17,0
+OpenFile3=magic.c,0,242,242,1486,999,3,8,0,0
-OpenFile4=magic.c,0,242,242,1486,999,3,8,0,0
+OpenFile4=inter_asm\self_flash.asm,0,118,281,1362,1038,0,933,0,0
-OpenFile5=inter_asm\self_flash.asm,0,118,281,1362,1038,0,933,0,0
+OpenFile5=led.c,0,286,286,1469,912,45,278,46,0
-OpenFile6=led.c,0,286,286,1469,912,45,278,46,0
+OpenFile6=i2c_twl.c,0,110,110,1354,867,0,156,0,0
-OpenFile7=task_debug.c,0,22,22,1266,779,0,21,0,0
+OpenFile7=reboot.c,0,110,110,1354,867,5,14,14,0
-OpenFile8=task_sys.c,0,88,88,1332,845,44,294,44,0
+OpenFile8=sw.c,0,198,198,1442,955,12,137,19,0
-OpenFile9=i2c_twl.c,0,110,110,1354,867,0,156,0,0
+OpenFile9=vreg_ctr.h,0,154,154,1398,911,9,108,0,0
-OpenFile10=loader.c,0,186,351,1369,977,0,145,0,0
+OpenFile10=i2c_mcu.c,0,330,330,1204,1087,16,484,15,0
-OpenFile11=vreg_twl.c,0,314,110,1264,895,12,63,19,0
+OpenFile11=led.h,0,176,176,1420,933,0,16,0,0
-OpenFile12=reboot.c,0,110,110,1354,867,5,14,14,0
+OpenFile12=main.c,0,198,198,1442,955,0,10,0,0
-OpenFile13=sw.c,0,198,198,1442,955,12,137,19,0
+OpenFile13=vreg_twl.c,0,314,110,1264,895,0,141,19,0
-OpenFile14=vreg_ctr.c,0,66,66,1310,823,5,261,14,0
+OpenFile14=vreg_ctr.c,0,220,220,1464,977,16,296,16,0
-OpenFile15=main.c,0,124,87,1368,844,0,1,0,0
+OpenFile15=loader.c,0,186,351,1369,977,0,23,36,0
-OpenFile16=task_misc.c,0,130,277,1374,1034,58,30,58,0
+OpenFile16=task_sys.c,0,88,88,1332,845,0,28,44,0
-OpenFile17=pm.c,0,563,282,1807,1039,0,423,0,0
+OpenFile17=task_misc.c,0,130,277,1374,1034,0,151,0,0
-OpenFile18=vreg_ctr.h,0,154,154,1398,911,9,108,0,0
+OpenFile18=task_debug.c,0,22,22,1266,779,0,7,0,0
-OpenFile19=adc.c,0,275,163,1065,610,0,96,75,0
+OpenFile19=rtc.c,0,308,308,1491,934,0,1,17,0
-OpenFile20=accero.c,0,176,176,1420,933,55,97,63,0
+OpenFile20=accero.c,0,176,176,1420,933,73,5,73,0
-OpenFile21=ProjectWindow
+OpenFile21=pm.c,0,437,355,1681,1112,44,260,0,0
+OpenFile22=adc.c,0,275,163,1065,610,28,73,28,0
+OpenFile23=config.h,0,257,50,1147,671,0,17,21,0
+OpenFile24=ProjectWindow
 PrjPos=0,2,754,3,253
-OpenFile22=config.h,0,225,465,1115,1086,0,1,0,0
+OpenFile25=OutputWindow
-OpenFile23=i2c_mcu.c,0,330,330,1204,1087,10,500,48,0
+OutputPos=0,82,1026,747,1547
-OpenFile24=OutputWindow
-OutputPos=0,76,1020,758,1558
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]
 ProjectWindowDispType=0

trunk/yav_mcu_bsr.sdb

@@ -1,7 +1,7 @@
 [SdbInfo]
 Ver=5
 [loader.c]
-T=4afd21ca
+T=4b03c375
 1=incs_loader.h
 2=fsl.h
 3=fsl_user.h
@@ -11,7 +11,7 @@ T=4afd21ca
 7=rtc.h
 8=reboot.h
 [pm.c]
-T=4b033701
+T=4b05239f
 1=incs.h
 2=adc.h
 3=led.h
@@ -20,7 +20,7 @@ T=4b033701
 T=4b024862
 1=incs.h
 [main.c]
-T=4b026384
+T=4b039541
 1=incs.h
 2=WDT.h
 3=rtc.h
@@ -34,25 +34,25 @@ T=4afd21ca
 T=4afd21ca
 1=incs_loader.h
 [i2c_mcu.c]
-T=4b0272b2
+T=4b03c7d8
 1=incs.h
 2=i2c_mcu.h
 [i2c_twl.c]
-T=4afd21ca
+T=4b03aa74
 1=incs.h
 2=i2c_twl_defs.h
 [ini_VECT.c]
 T=4afd21ca
 1=config.h
 [led.c]
-T=4b026f97
+T=4b0499ab
 1=incs.h
 2=led.h
 [rtc.c]
-T=4b026f97
+T=4b03bbe1
 1=incs.h
 [vreg_ctr.c]
-T=4b0254a4
+T=4b04f66b
 1=incs.h
 2=vreg_ctr.h
 3=rtc.h
@@ -60,13 +60,14 @@ T=4b0254a4
 5=accero.h
 6=pm.h
 [vreg_twl.c]
-T=4b0245c3
+T=4b049a03
 1=incs.h
 2=jhl_defs.h
 3=vreg_twl.h
 4=vreg_ctr.h
+5=renge\renge_task_intval.h
 [adc.c]
-T=4b026f96
+T=4b04e9f8
 1=incs.h
 2=adc.h
 3=pm.h
@@ -79,11 +80,11 @@ T=4b024862
 4=WDT.h
 5=bsr_system.h
 [accero.c]
-T=4b026036
+T=4b04cee4
 1=incs.h
 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
 [self_flash.c]
-T=4b024862
+T=4b03c375
 1=incs_loader.h
 2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
 3=fsl_user.h
@@ -92,7 +93,7 @@ T=4b024862
 T=4afd21cb
 1=incs_loader.h
 [sw.c]
-T=4b026f96
+T=4b04cee4
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -101,13 +102,13 @@ T=4b026f96
 6=pm.h
 7=rtc.h
 [task_debug.c]
-T=4b0265df
+T=4b04c0e8
 1=incs.h
 2=renge\renge.h
 3=pm.h
 4=accero.h
 [task_misc.c]
-T=4b024578
+T=4b050b3d
 1=incs.h
 2=renge\renge.h
 3=pm.h
@@ -139,7 +140,7 @@ T=4b023fdb
 T=4afd21cb
 1=config.h
 [config.h]
-T=4b0253bf
+T=4b0b21c6
 [bsr_system.h]
 T=4afd21ca
 [renge\renge.h]
@@ -152,13 +153,13 @@ T=4b024862
 T=4afa8168
 1=renge\renge_defs.h
 [vreg_ctr.h]
-T=4b025567
+T=4b04fb02
 1=config.h
 [loader.h]
 T=4afd21ca
 1=jhl_defs.h
 [i2c_mcu.h]
-T=4afd21cb
+T=4b04c691
 [WDT.h]
 T=4afd21ca
 [fsl.h]
@@ -168,14 +169,14 @@ T=4afd21cb
 [i2c_ctr.h]
 T=4afd21cb
 [pm.h]
-T=4b024ba8
+T=4b04fd61
 [rtc.h]
 T=4afd21cb
 [adc.h]
 T=4afd21cb
 1=jhl_defs.h
 [led.h]
-T=4afd21cb
+T=4b038a57
 [incs.h]
 T=4afd21ca
 1=jhl_defs.h
@@ -200,9 +201,9 @@ T=4ac9ab84
 T=4afd21ca
 [..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h]
 T=49a3bd4e
-[..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h]
-T=45f12258
 [reboot.h]
 T=4afd21ca
 [sw.h]
 T=4afd21cb
+[..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h]
+T=45f12258