中間アップデータ

メモリマップ変更のため、アップデータを更新
機能そのものはx.0.Cと同一
バージョン表記はx.F.C
(注)ビルド時にconfig.hを修正してx.F.Cにすること

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

trunk/accero.c

@@ -199,7 +199,7 @@ static void hosu_increment()
         while( !RWST ){;}
         now_year = bcdtob( YEAR );
         now_hour = get_long_hour();
-        // RWAIT = 0;  ↑で行っています
+        // RWAIT = 0;                ↑で行っています
         // EI();             〃
 
         // 歩数計が止まったいた時間を考慮して必要なら進める //

trunk/bsr_mcu.dr

@@ -3,13 +3,12 @@
 MEMORY BCL0:(00000H, 01000H )
 ;MEMORY BCL1:(01000H, 01000H )          ; バックアップ領域
 MEMORY ROM :(02000H, 02800H )
+;MEMORY ROM_DMY :(04800H, 00800H )
 ;MEMORY ROM :(02000H, 04000H )
-;MEMORY ROM_:(04800H, 02800H )          ; バックアップ領域
+;MEMORY ROM_BKUP:(05000H, 03000H )          ; バックアップ領域
-;MEMORY FSL :(07000H, 00C00H )          ;  過去の名残。いらない
 ;MEMORY OCD :(0FC00H, 00400H )          ; OCDが使っているらしい
 
 
-
 ;;; セグメントの割当先設定
 ; ブートブロック0に割り当てる
 MERGE LDR_CODE: =BCL0

trunk/config.h

@@ -6,7 +6,7 @@
 
 
 #define MCU_VER_MAJOR    0x00;
-#define MCU_VER_MINOR    0x0B;
+#define MCU_VER_MINOR    0x1C;
 
 #define _OVERCLOCK_
 

trunk/loader.c

@@ -49,7 +49,6 @@ static fsl_u08 fsl_MK2H_bak_u08;        /*    }
 
 // magic.c の記述と違わないように注意！
 #define MGC_LOAD   0x0FF6
-#define MGC_HEAD   0x2100
 #define MGC_FOOT   0x47F6
 
 
@@ -101,16 +100,10 @@ void main(  )
             u8      comp = 0;
 
             // ローダーと本体は同じバージョンか？
+            /// 次へのアップデートの途中で終わってないか？
             for( i = 0; i < sizeof( __TIME__ ); i++ )      // sizeof( __TIME__ ) = 8 らし
             {
-                comp += ( *( u8 * ) ( MGC_HEAD + i ) == *( __far u8 * ) ( MGC_LOAD + i ) ) ? 0 : 1;
+                comp += ( *( __far u8 * )( MGC_LOAD + i ) == *( u8 * )( MGC_FOOT + i ) ) ? 0 : 1;
-            }
-
-            // 本体は壊れていないか？
-            comp += ( *( u8 * ) ( MGC_HEAD ) == 0xFF ) ? 1 : 0;
-            for( i = 0; i < sizeof( __TIME__ ); i++ )
-            {
-                comp += ( *( u8 * ) ( MGC_HEAD + i ) == *( u8 * ) ( MGC_FOOT + i ) ) ? 0 : 1;
             }
 
             if( comp != 0 )

trunk/pm.c

@@ -361,8 +361,13 @@ err PM_BL_set( u8 dat )
     }
 
 /*
-      SoCがPWMを出すようレジスタをセットしてから遅延が有るため、
+SoCがPWMを出すようレジスタをセットしてから遅延が有るため、ステータスを先に
-    ステータスを先に更新してしまう。
+更新してしまう。
+// 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 << 6 ) | ( blset << 4 )) & 0b01100000 );
@@ -382,10 +387,11 @@ err PM_BL_set( u8 dat )
     }
 
 // Write
-    if( blset != 0x00 ){
+    wait_ms( 10 );
-        wait_ms( 17 );
-    }
     iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL, blset );
+    if( blset != 0x00 ){
+//        wait_ms( 10 );
+    }
 
     return( ERR_SUCCESS );         // ここでは異常チェック不要
 }

trunk/self_flash.c

@@ -28,10 +28,11 @@ const u8 fsl_low_voltage_u08 = 1;
 #define SELF_UPDATE_SPLIT_WRITE_NUM    ( SAM_BLOCK_SIZE / SELF_UPDATE_BUFF_SIZE )
 #define SAM_WORD_SIZE                  4
 
+//                                    ↓ブロック番号（1ブロック＝1kB）
 #define INACTIVE_BOOTSECT_TOP          4
-#define UPDATE_BLOCK_LAST             17
 #define FIRM_TOP                       8
-#define FIRM_SIZE                     10
+#define FIRM_SIZE                     12
+#define UPDATE_BLOCK_LAST             ( FIRM_TOP + FIRM_SIZE - 1 )
 
 
 #ifdef _MCU_BSR_
@@ -79,9 +80,9 @@ static err firm_duplicate( __far u8 * p_rom, u8 block_dest );
 extern u8 pool[];
 
 
-// magic.c の記述と違わないように注意！
+// 0.D以降 新アップデータ向け
 #define N_MGC_L   0x1FF6
-#define N_MGC_T   0x47F6
+#define N_MGC_T   0x4FF6
 
 
 
@@ -107,8 +108,8 @@ err firm_update(  )
        0x2000 - 0x47FF (ブロック  8 - 17) を
        0x4800 - 0x7FFF (ブロック 18 - 27) にコピー
      */
-    firm_duplicate( ( __far u8 * ) 0x2000,
+    firm_duplicate( ( __far u8 * ) ( FIRM_TOP * 0x0400 ),
-                    ( FIRM_TOP + FIRM_SIZE ) );
+                    ( UPDATE_BLOCK_LAST + 1 ) );
 
     // 書き替え //
     /*
@@ -182,7 +183,7 @@ err firm_update(  )
         u8      i;
         u8      comp = 0;
 
-        // 少なくとも、ローダーのマジックと、本文の末尾のマジックは同じか確認
+        // ローダーのマジックと、本文の末尾のマジックは同じか確認
         for( i = 0; i < sizeof( __TIME__ ); i++ )
         {
             comp += ( *( u8 * ) ( N_MGC_L + i ) == *( u8 * ) ( N_MGC_T + i ) ) ? 0 : 1;
@@ -208,10 +209,10 @@ err firm_update(  )
 
 
 /* ========================================================
-  ■ファームをバックアップ領域からリストアします。
+  　■ファームをバックアップ領域からリストアします。
-  0x4800 - 0x7FFF (ブロック 18 - 27)を 0x2000 - 0x47FF (同、8 - 17) にコピーして
+  　チェック後、最後の最後でブートスワップするので、
-  再起動します。
+　ここではブートスワップは不要です。
-  ブートスワップは不要です。
+  
  ======================================================== */
 err firm_restore(  )
 {
@@ -221,7 +222,7 @@ err firm_restore(  )
        0x4800 - 0x7FFF (ブロック 18 - 27) から
        0x2000 - 0x47FF (ブロック  8 - 17) へコピー
      */
-    firm_duplicate( ( __far u8 * ) 0x4800,
+    firm_duplicate( ( __far u8 * )( ( UPDATE_BLOCK_LAST + 1 ) * 0x0400 ),
                     FIRM_TOP );
 
     // todo
@@ -288,8 +289,8 @@ static void FSL_Close( void )
 
 /* ========================================================
 　マイコン内でファームをコピーします。
-  block_dest        コピー元の先頭ブロック
   __far u8 * p_rom  コピー先のアドレス
+  block_dest        コピー元の先頭ブロック
 
   コピー先に書けるようにmy_FSL_Initをあらかじめ実行する必要があります。
  ======================================================== */

trunk/sw.c

@@ -92,7 +92,7 @@ void tsk_sw(  )
         // 電源スイッチの監視 //
         if( SW_POW_n )
         {
-            if( ( CLICK_THRESHOLD < SW_pow_count ) && ( SW_pow_count <= HOLD_THREASHOLD ) )
+            if( ( CLICK_THRESHOLD < SW_pow_count ) && ( SW_pow_count < HOLD_THREASHOLD ) )
             {
                 set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK );
             }

trunk/yav_mcu_bsr.plg

@@ -1,8 +1,128 @@
 C:\WINDOWS\system32\cmd.exe /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 -quvjl3wt -sainter_asm -zp -no loader.c
+loader.c(106) : CC78K0R warning W0401: Conversion may lose significant digits
+Compilation complete,    0 error(s) and    1 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\loader.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no pm.c
+pm.c(190) : CC78K0R warning W0401: Conversion may lose significant digits
+pm.c(202) : CC78K0R warning W0401: Conversion may lose significant digits
+pm.c(206) : CC78K0R warning W0401: Conversion may lose significant digits
+pm.c(257) : CC78K0R warning W0401: Conversion may lose significant digits
+pm.c(294) : CC78K0R warning W0401: Conversion may lose significant digits
+pm.c(373) : CC78K0R warning W0401: Conversion may lose significant digits
+pm.c(381) : CC78K0R warning W0401: Conversion may lose significant digits
+pm.c(854) : CC78K0R warning W0401: Conversion may lose significant digits
+Compilation complete,    0 error(s) and    8 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\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 -quvjl3wt -sainter_asm -zp -no i2c_ctr.c
+Compilation complete,    0 error(s) and    0 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\i2c_ctr.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no main.c
+Compilation complete,    0 error(s) and    0 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\main.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
 "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 -quvjl3wt -sainter_asm -zp -no magic.c
 Compilation complete,    0 error(s) and    0 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\magic.asm
 Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no WDT.c
+Compilation complete,    0 error(s) and    0 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\WDT.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no i2c_mcu.c
+i2c_mcu.c(119) : CC78K0R warning W0401: Conversion may lose significant digits
+i2c_mcu.c(196) : 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\i2c_mcu.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no i2c_twl.c
+Compilation complete,    0 error(s) and    0 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\i2c_twl.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no ini_VECT.c
+Compilation complete,    0 error(s) and    0 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\ini_VECT.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no led.c
+led.c(457) : CC78K0R warning W0401: Conversion may lose significant digits
+Compilation complete,    0 error(s) and    1 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\led.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no rtc.c
+Compilation complete,    0 error(s) and    0 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\rtc.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no vreg_ctr.c
+vreg_ctr.c(72) : CC78K0R warning W0401: Conversion may lose significant digits
+vreg_ctr.c(128) : CC78K0R warning W0401: Conversion may lose significant digits
+vreg_ctr.c(138) : CC78K0R warning W0401: Conversion may lose significant digits
+vreg_ctr.c(139) : CC78K0R warning W0401: Conversion may lose significant digits
+vreg_ctr.c(141) : CC78K0R warning W0401: Conversion may lose significant digits
+vreg_ctr.c(143) : CC78K0R warning W0401: Conversion may lose significant digits
+vreg_ctr.c(144) : CC78K0R warning W0401: Conversion may lose significant digits
+vreg_ctr.c(146) : CC78K0R warning W0401: Conversion may lose significant digits
+vreg_ctr.c(166) : CC78K0R warning W0401: Conversion may lose significant digits
+Compilation complete,    0 error(s) and    9 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_ctr.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -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\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 -quvjl3wt -sainter_asm -zp -no adc.c
+adc.c(73) : CC78K0R warning W0745: Expected function prototype
+adc.c(78) : CC78K0R warning W0401: Conversion may lose significant digits
+adc.c(81) : CC78K0R warning W0401: Conversion may lose significant digits
+adc.c(96) : CC78K0R warning W0401: Conversion may lose significant digits
+adc.c(99) : CC78K0R warning W0401: Conversion may lose significant digits
+adc.c(235) : 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\adc.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no renge\renge.c
+Compilation complete,    0 error(s) and    0 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\renge.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no accero.c
+accero.c(114) : CC78K0R warning W0745: Expected function prototype
+accero.c(123) : 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\accero.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no self_flash.c
+self_flash.c(189) : CC78K0R warning W0401: Conversion may lose significant digits
+Compilation complete,    0 error(s) and    1 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\self_flash.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no reboot.c
+reboot.c(14) : CC78K0R warning W0915: Asm statement found. skip to jump optimize this function 'my_reboot'
+Compilation complete,    0 error(s) and    1 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\reboot.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no sw.c
+Compilation complete,    0 error(s) and    0 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\sw.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no task_debug.c
+Compilation complete,    0 error(s) and    0 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\task_debug.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no task_misc.c
+task_misc.c(48) : CC78K0R warning W0401: Conversion may lose significant digits
+task_misc.c(34) : 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\task_misc.asm
+Assembly complete,     0 error(s) and     0 warning(s) found.
+"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 -quvjl3wt -sainter_asm -zp -no task_sys.c
+task_sys.c(322) : CC78K0R warning W0401: Conversion may lose significant digits
+Compilation complete,    0 error(s) and    1 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\task_sys.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
@@ -13,4 +133,4 @@ intel-HEX to bsr bin converter
  file converted!
 
 
-Build Total error(s) : 0  Total warning(s) : 0 
+Build Total error(s) : 0  Total warning(s) : 36 

trunk/yav_mcu_bsr.pri

@@ -78,10 +78,10 @@ Symbol Type=OFF
 Language=C
 Kanji=SJIS
 [Source]
-Geometry=202, 65, 1025, 1014
+Geometry=173, 84, 1025, 1014
 Window=Normal
-DispStart=32
+DispStart=68
-CaretPos=88,0
+CaretPos=69,0
 Mode=Normal
 DispFile=
 Address1=
@@ -139,11 +139,19 @@ SaveRange=Screen
 SaveStart=
 SaveEnd=
 Accumulative=ON
+[Source1]
+Geometry=0, 0, 1025, 1014
+Window=Normal
+DispStart=159
+CaretPos=1,0
+Mode=Normal
+DispFile=self_flash.c
+Accumulative=ON
 [Assemble]
 Geometry=605, 2, 600, 400
 Window=Normal
-DispStart=686
+DispStart=1138
-CaretPos=686,27
+CaretPos=1138,27
 Address1=
 Address2=
 Address3=
@@ -239,6 +247,32 @@ SaveRange=Screen
 SaveStart=
 SaveEnd=
 Accumulative=ON
+[Memory1]
+Geometry=0, 0, 550, 538
+Window=Normal
+Boundary=163
+Format=Hex
+Mode=Byte
+Endian=Little
+Ascii=OFF
+Idtag=OFF
+Address=
+DispStart=00000ED0
+CaretPosData=0, 237
+CaretPosAscii=0, 237
+[Memory2]
+Geometry=11, 504, 550, 576
+Window=Normal
+Boundary=163
+Format=Hex
+Mode=Byte
+Endian=Little
+Ascii=OFF
+Idtag=OFF
+Address=
+DispStart=00004760
+CaretPosData=0, 1142
+CaretPosAscii=0, 1142
 [Memory fill]
 Scope=0, 0
 Code=0
@@ -251,7 +285,7 @@ Destination=0
 [I/O Port]
 Line=0
 [Stack]
-Geometry=1072, 361, 400, 300
+Geometry=1169, 364, 400, 300
 Window=Normal
 Boundary=13762687
 Mode=Proper
@@ -855,7 +889,7 @@ Detail=OFF
 Last Name=
 Count=0
 [Variable]
-Geometry=1225, 6, 354, 910
+Geometry=1225, 6, 354, 364
 Window=Normal
 Boundary=13762700
 0=.vreg_ctr,P,N,A,+,1
@@ -864,22 +898,22 @@ Boundary=13762700
 3=.p5,B,S,A,+,1
 Line=4
 [Quick Watch]
-0=renge_flg_interval,P,A,1
+0=rtccmk,P,A,1
-1=rtccmk,P,A,1
+1=rtciimk,P,A,1
-2=rtciimk,P,A,1
+2=wdte,P,A,1
-3=wdte,P,A,1
+3=SEC,P,A,1
-4=SEC,P,A,1
+4=rtcif,P,A,1
-5=rtcif,P,A,1
+5=vreg_twl,P,A,1
-6=vreg_twl,P,A,1
+6=pm0,P,A,1
-7=pm0,P,A,1
+7=data,P,A,1
-8=data,P,A,1
+8=P5.3,P,A,1
-9=P5.3,P,A,1
+9=p4.3,P,A,1
-10=p4.3,P,A,1
+10=pu0,P,A,1
-11=pu0,P,A,1
+11=p5,B,A,1
-12=p5,B,A,1
+12=P7,B,A,1
-13=P7,B,A,1
+13=cmd_BL,P,A,1
-14=cmd_BL,P,A,1
+14=vreg_ctr,P,A,1
-15=vreg_ctr,P,A,1
+15=MGC_FOOT,P,A,1
 [Software Break]
 Geometry=1204, 674, 500, 428
 Window=Normal
@@ -896,7 +930,19 @@ Name2=Swb00002
 Address2=task_sys.c#_chk_emergencyExit+0x4
 Window2=ASM
 Status2=ON
-Count=3
+Name3=Swb00005
+Address3=loader.c#_main+0x52
+Window3=ASM
+Status3=ON
+Name4=Swb00007
+Address4=loader.c#_main+0x55
+Window4=ASM
+Status4=ON
+Name5=Swb00001
+Address5=loader.c#_main+0x4e
+Window5=ASM
+Status5=ON
+Count=6
 [Reset]
 Debugger=ON
 Symbol=OFF

trunk/yav_mcu_bsr.prj

@@ -1,12 +1,12 @@
 [ProjectManager]
 Version=6.00
-Path=C:\78k_data\yav-mcu-basara\
+Path=C:\78k_data\yav-mcu_updater\
 Title=yav-mcu
 Series=78K0R.PM
 Device=uPD79F0104
 DeviceVer=E1.00b
 DebugMode=1
-Target=C:\78k_data\yav-mcu-basara\bsr.lmf
+Target=bsr.lmf
 [BuildMode0]
 BuildModeName=Debug Build
 TargetFile=0
@@ -285,7 +285,7 @@ ZB=
 Etcetera0=
 Etcetera1=boot.lmf
 CommandFile=0
-OFILE=C:\78k_data\yav-mcu-basara\bsr.lmf
+OFILE=C:\78k_data\yav-mcu_updater\bsr.lmf
 [Options.LK78K0R 3]
 Version=100
 O0=bsr_bsr.lmf

trunk/yav_mcu_bsr.prk

@@ -1,7 +1,7 @@
 [ProjectManager]
 FrameMax=0
-FrameX=141
+FrameX=132
-FrameY=48
+FrameY=37
 FrameCX=1299
 FrameCY=1043
 OpenFile1=task_sys.c,0,521,328,1765,1085,25,250,25,0
@@ -10,19 +10,20 @@ OpenFile3=loader.c,0,266,31,1510,788,23,43,23,0
 OpenFile4=sw.c,0,132,132,1376,889,0,165,17,0
 OpenFile5=config.h,0,282,262,1526,1019,0,19,0,0
 OpenFile6=vreg_ctr.c,0,159,252,1138,888,30,201,38,0
-OpenFile7=renge\renge_task_immediate.h,0,308,308,1276,933,0,23,0,0
+OpenFile7=ProjectWindow
-OpenFile8=renge\renge_task_intval.h,0,0,0,968,625,37,23,37,0
+PrjPos=0,2,754,3,253
-OpenFile9=renge\renge_defs.h,0,22,22,990,647,0,50,0,0
+OpenFile8=renge\renge_task_immediate.h,0,308,308,1276,933,0,23,0,0
-OpenFile10=adc.c,0,220,220,1199,856,0,73,0,0
+OpenFile9=renge\renge_task_intval.h,0,0,0,968,625,37,23,37,0
+OpenFile10=renge\renge_defs.h,0,22,22,990,647,0,50,0,0
 OpenFile11=accero.c,0,272,165,1516,922,0,114,13,0
 OpenFile12=main.c,0,66,66,1034,691,0,70,0,0
 OpenFile13=renge\renge.c,0,285,287,1264,923,15,225,0,0
 OpenFile14=task_misc.c,0,88,88,1056,713,5,159,5,0
-OpenFile15=ProjectWindow
+OpenFile15=i2c_twl.c,0,44,44,1288,801,34,67,0,0
-PrjPos=0,2,754,3,253
+OpenFile16=pm.c,0,421,154,1400,790,0,694,0,0
-OpenFile16=pm.c,0,421,154,1400,790,0,357,0,0
+OpenFile17=adc.c,0,220,220,1199,856,0,111,0,0
-OpenFile17=OutputWindow
+OpenFile18=OutputWindow
-OutputPos=0,252,660,253,1362
+OutputPos=0,101,509,107,1216
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]
 ProjectWindowDispType=0

trunk/yav_mcu_bsr.sdb

@@ -1,7 +1,7 @@
 [SdbInfo]
 Ver=5
 [loader.c]
-T=4b4451c6
+T=4b445f00
 1=incs_loader.h
 2=fsl.h
 3=fsl_user.h
@@ -11,7 +11,7 @@ T=4b4451c6
 7=rtc.h
 8=reboot.h
 [pm.c]
-T=4b4451c6
+T=4b444213
 1=incs.h
 2=adc.h
 3=led.h
@@ -31,7 +31,7 @@ T=4b3800f0
 6=led.h
 7=adc.h
 [magic.c]
-T=4b445735
+T=4b445c1c
 1=config.h
 [WDT.c]
 T=4afd21ca
@@ -91,7 +91,7 @@ T=4b43f4cd
 1=incs.h
 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
 [self_flash.c]
-T=4b4451c6
+T=4b444f8c
 1=incs_loader.h
 2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
 3=fsl_user.h
@@ -100,7 +100,7 @@ T=4b4451c6
 T=4afd21cb
 1=incs_loader.h
 [sw.c]
-T=4b4451c6
+T=4b383e14
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -147,7 +147,7 @@ T=4b023fdb
 [user_define.h]
 T=4b442a95
 [config.h]
-T=4b4451c6
+T=4b444960
 [bsr_system.h]
 T=4b3064de
 [renge\renge.h]