diff --git a/trunk/bin/mcu_C2_0B_1215.bin b/trunk/bin/mcu_C2_0B_1215.bin new file mode 100644 index 0000000..95154e4 Binary files /dev/null and b/trunk/bin/mcu_C2_0B_1215.bin differ diff --git a/trunk/config.h b/trunk/config.h index d2cef04..c2b2c9c 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -14,9 +14,9 @@ //#define _PM_BUG_ //#define _PARRADIUM_ -#define _MODEL_TEG2_ +//#define _MODEL_TEG2_ //#define _MODEL_WM0_ -//#define _MODEL_TS0_ +#define _MODEL_TS0_ //#define _MODEL_CTR_ //#define _SW_HOME_ENABLE_ diff --git a/trunk/pm.c b/trunk/pm.c index bf812d6..2373355 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -227,134 +227,7 @@ task_status_immed PM_bt_temp_update( ) -/* ======================================================== - バックライト周り - ======================================================== */ -#ifdef _PMIC_TWL_ -err PM_LCD_on( ) -{ -// PM_TEG_LCD_dis( 0 ); // 何もしない - wait_ms( DELAY_PM_5V_TO_TCOM ); - wait_ms( DELAY_PM_TCOM_TO_VCS ); - wait_ms( DELAY_PM_VCS_TO_BL ); - vreg_ctr[VREG_C_STATUS] |= REG_BIT_LCD_POW; - set_irq( VREG_C_IRQ3, REG_BIT_LCD_ON ); - return ( PM_chk_LDSW( ) ); -} - -void PM_LCD_off( ) -{ -// PM_TEG_LCD_dis( 1 ); - 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 ); -} - -err PM_BL_set( u8 dat ) -{ - static u8 blset = 0; - u8 regset = 0; - - // Modify - // ue - if(( dat & REG_BIT_CMD_BL_U_ON ) != 0 ) - { - blset |= PM_REG_BIT_BL_U; - regset |= REG_BIT_BL_U_ON; - } - else if(( dat & REG_BIT_CMD_BL_U_OFF ) != 0 ) - { - blset &= ~PM_REG_BIT_BL_U; - regset |= REG_BIT_BL_U_OFF; - } - - // shita - 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_L_OFF; - } - - // Write - 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 ); // ここでは異常チェック不要 -} - - - -/* ======================================================== - ======================================================== */ -err PM_LCD_vcom_set( ) -{ - return ( ERR_SUCCESS ); -} - - -#else -# ifdef _PARRADIUM_ -// パラディウム上のSoCでチェックしたいとき、PMICも液晶もつながってないので -// 異常終了しないようにダミー関数にする -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 ); -} - - -void PM_LCD_off( ) -{ - SND_DEPOP = 1; - vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW; - set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF ); -} - - -err PM_BL_set( u8 ) -{ - wait_ms( 10 ); - 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 - ); - return ( PM_chk_LDSW( ) ); -} - - -err PM_LCD_vcom_set( ) -{ - return ( ERR_SUCCESS ); -} - - - - - - -# else -// PMIC CTR +#ifndef _PARRADIUM_ /* ======================================================== 液晶系の電源制御 　ステータスフラグはすぐに立ててしまう。 @@ -399,6 +272,24 @@ void PM_LCD_off() { SND_DEPOP = 1; + // BLついてたら消す + if( ( iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL ) & 0x03 ) != 0 ) + { + u8 tot; + + PM_BL_set( REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_L_OFF ); + vreg_ctr[VREG_C_STATUS] &= 0b10011111; + + if( (( REG_BIT_BL_U_OFF | REG_BIT_BL_L_OFF ) & vreg_ctr[ VREG_C_IRQ_MASK3 ] ) != 0 ) + { + vreg_ctr[ VREG_C_IRQ3 ] |= ( ( REG_BIT_BL_U_OFF | REG_BIT_BL_L_OFF ) & vreg_ctr[ VREG_C_IRQ_MASK3 ] ); + IRQ0_neg; + tot = 0; + while( !IRQ0 && ( ++tot != 0 ) ){;} + IRQ0_ast; + } + } + PM_TCOM_VCS_off( ); wait_ms( DELAY_PM_LCD_OFF ); @@ -412,11 +303,16 @@ void PM_LCD_off() /* ======================================================== 　バックライトの個別on/off 　現状から　on/off/維持　のフラグなので面倒 +　　例えば、BL on/on の状態で、on/onにしろと言われても、on/on割り込みを入れます。 ======================================================== */ err PM_BL_set( u8 dat ) { +#ifdef _PMIC_TWL_ + static u8 blset; +#else u8 blset; - u8 regset = 0; +#endif + u8 intset = 0; // RMWを行う // Read @@ -427,24 +323,24 @@ err PM_BL_set( u8 dat ) if(( dat & REG_BIT_CMD_BL_U_ON ) != 0 ) { blset |= PM_REG_BIT_BL_U; - regset |= REG_BIT_BL_U_ON; + intset |= REG_BIT_BL_U_ON; } else if(( dat & REG_BIT_CMD_BL_U_OFF ) != 0 ) { blset &= ~PM_REG_BIT_BL_U; - regset |= REG_BIT_BL_U_OFF; + intset |= REG_BIT_BL_U_OFF; } // shita if(( dat & REG_BIT_CMD_BL_L_ON ) != 0 ) { blset |= PM_REG_BIT_BL_L; - regset |= REG_BIT_BL_L_ON; + intset |= 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_L_OFF; + intset |= REG_BIT_BL_L_OFF; } // Write @@ -452,22 +348,26 @@ err PM_BL_set( u8 dat ) if( blset != 0x00 ){ wait_ms( 10 ); } - vreg_ctr[VREG_C_STATUS] = (( vreg_ctr[VREG_C_STATUS] & 0b10011111 ) + ( blset << 5 )); // todo - // いくつかのビットをまとめて操作するのでここで - // マスクは効かない + + vreg_ctr[VREG_C_STATUS] = (( vreg_ctr[VREG_C_STATUS] & 0b10011111 ) + ( blset << 5 )); { u8 tot; - vreg_ctr[ VREG_C_IRQ3 ] |= regset; - IRQ0_neg; - tot = 0; - while( !IRQ0 && ( ++tot != 0 ) ){;} - IRQ0_ast; + if( ( intset & vreg_ctr[ VREG_C_IRQ_MASK3 ] ) != 0 ) + { + vreg_ctr[ VREG_C_IRQ3 ] |= ( intset & vreg_ctr[ VREG_C_IRQ_MASK3 ] ); + IRQ0_neg; + tot = 0; + while( !IRQ0 && ( ++tot != 0 ) ){;} + IRQ0_ast; + } } return( ERR_SUCCESS ); // ここでは異常チェック不要 } + + /* ======================================================== 液晶の対向電圧の設定を行います。 仮想レジスタの内容を送るだけ @@ -481,7 +381,45 @@ err PM_LCD_vcom_set( ) return ( rv ); } -# endif + + +#else + +// パラディウム上のSoCでチェックしたいとき、PMICも液晶もつながってないので +// 異常終了しないようにダミー関数にする +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 ); +} + + +void PM_LCD_off( ) +{ + SND_DEPOP = 1; + vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW; + set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF ); +} + + +err PM_BL_set( u8 ) +{ + wait_ms( 10 ); + 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 + ); + return ( PM_chk_LDSW( ) ); +} + + +err PM_LCD_vcom_set( ) +{ + return ( ERR_SUCCESS ); +} + #endif diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index bf38591..49d6b26 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,16 +1,131 @@ C:\WINDOWS\system32\cmd.exe /c touch magic.c -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -cF100964 -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 +"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 +loader.c(110) : CC78K0R warning W0401: Conversion may lose significant digits +loader.c(113) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 3 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(193) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(205) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(209) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(288) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(882) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 5 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -cF100964 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pm.asm +pm.c(257) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(285) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(352) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(358) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(820) : 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" -cF100964 -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 +"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" -cF100964 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\magic.asm +"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(422) : CC78K0R warning W0401: Conversion may lose significant digits +led.c(423) : 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\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(71) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(118) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(119) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(121) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(123) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(124) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(126) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(145) : 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\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 +renge\renge.c(147) : 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\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(113) : CC78K0R warning W0745: Expected function prototype +accero.c(122) : 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(188) : 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(166) : 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 3 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(310) : 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. @@ -19,4 +134,4 @@ 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) : 5 +Build Total error(s) : 0 Total warning(s) : 40 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 032182e..1dd298c 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -4,7 +4,7 @@ Target=IDK0R32G [Configuration] Chip=uPD78F1009_64 Internal Rom=64KB -Internal Ram=3072KB +Internal Ram=3072B Clock=Target Sub Clock=Target Peripheral Break=0x2 @@ -23,7 +23,7 @@ SubClock=None Count=0 [Main] Geometry=66, 66, 1467, 1110 -Window=Icon +Window=Normal MDI_MAX=OFF Button=ON Mode=Auto @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=135, 77, 764, 1014 +Geometry=135, 77, 904, 1014 Window=Normal -DispStart=31 -CaretPos=87,0 +DispStart=267 +CaretPos=268,0 Mode=Normal DispFile= Address1= @@ -142,8 +142,8 @@ Accumulative=ON [Assemble] Geometry=605, 2, 600, 400 Window=Normal -DispStart=10256 -CaretPos=10256,27 +DispStart=15777 +CaretPos=15777,27 Address1= Address2= Address3= @@ -858,22 +858,23 @@ Count=0 Geometry=1145, 8, 440, 1086 Window=Normal Boundary=13762700 -0=.pool,P,N,A,+,1 -1=.hyst_pedometer,.,N,A,+,1 -2=.P5.3,P,S,A,+,1 -3=.PM5.3,P,S,A,+,1 -4=.RTCEN,P,S,A,+,1 -5=.tasks_immed,P,N,A,+,1 -6=.system_status,.,N,A,+,1 -7=.hyst_pedometer,.,N,A,+,1 -8=.pool,P,N,A,+,1 -9=.last_year,P,N,A,+,1 -10=.last_month,P,N,A,+,1 -11=.last_day,P,N,A,+,1 -12=.last_hour,P,N,A,+,1 -13=.p_record,P,N,A,+,1 -14=.vreg_ctr[0x60],P,N,A,+,1 -Line=15 +0=.blset,P,N,A,+,1 +1=.pool,P,N,A,+,1 +2=.hyst_pedometer,.,N,A,+,1 +3=.P5.3,P,S,A,+,1 +4=.PM5.3,P,S,A,+,1 +5=.RTCEN,P,S,A,+,1 +6=.tasks_immed,P,N,A,+,1 +7=.system_status,.,N,A,+,1 +8=.hyst_pedometer,.,N,A,+,1 +9=.pool,P,N,A,+,1 +10=.last_year,P,N,A,+,1 +11=.last_month,P,N,A,+,1 +12=.last_day,P,N,A,+,1 +13=.last_hour,P,N,A,+,1 +14=.p_record,P,N,A,+,1 +15=.vreg_ctr[0x60],P,N,A,+,1 +Line=16 [Quick Watch] 0=last_hour,P,A,1 1=last_day,P,A,1 @@ -889,7 +890,7 @@ Line=15 11=P5.3,P,A,1 12=hyst_pedometer,P,A,1 13=pool,P,A,1 -14= +14=blset,P,A,1 15= [Software Break] Geometry=25, 25, 500, 428 @@ -900,7 +901,7 @@ Address0=accero.c#_hosu_increment+0x36 Window0=ASM Status0=ON Name1=Swb00002 -Address1=accero.c#_hosu_increment+0x55 +Address1=accero.c#_hosu_increment+0x52 Window1=ASM Status1=ON Name2=Swb00005 @@ -908,18 +909,14 @@ Address2=accero.c#_hosu_read+0xa Window2=ASM Status2=ON Name3=Swb00006 -Address3=pm.c#_PM_init+0x39 +Address3=pm.c#_PM_init+0x38 Window3=ASM Status3=OFF -Name4=Swb00004 -Address4=sw.c#_tsk_sw+0x37 +Name4=Swb00003 +Address4=pm.c#_PM_BL_set+0x5c Window4=ASM Status4=ON -Name5=Swb00003 -Address5=task_sys.c#_tsk_sys+0x9c -Window5=ASM -Status5=ON -Count=6 +Count=5 [Reset] Debugger=ON Symbol=OFF diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 6565206..82b5bd0 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -3,8 +3,8 @@ Version=6.00 Path=C:\78k_data\yav-mcu-basara\ Title=yav-mcu Series=78K0R.PM -Device=uPD78F1009_64 -DeviceVer=V1.11 +Device=uPD79F0104 +DeviceVer=E1.00b DebugMode=1 Target=C:\78k_data\yav-mcu-basara\bsr.lmf [BuildMode0] @@ -993,11 +993,6 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= -[ToolSet] -ToolSetName=(変更)78K0R Software Package V1.10 -Tool1=CC78K0R|W2.10 -Tool2=RA78K0R|W1.31 -Tool3=ID78K0R-QB|V3.60 [Options.LCNV78K0R 0] Version=100 LCNV_GO=0 @@ -1039,3 +1034,8 @@ DefaultMode2=1 DefaultMode3=1 DefaultMode4=1 DefaultMode5=1 +[ToolSet] +ToolSetName=(変更)78K0R Software Package V1.10 +Tool1=CC78K0R|W2.10 +Tool2=RA78K0R|W1.31 +Tool3=ID78K0R-QB|V3.60 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index cdf1dae..df22438 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -11,13 +11,13 @@ T=4b1efd24 7=rtc.h 8=reboot.h [pm.c] -T=4b257ed5 +T=4b26ee13 1=incs.h 2=adc.h 3=led.h 4=pm.h [i2c_ctr.c] -T=4b20aa4e +T=4b2611c9 1=incs.h 2=accero.h [main.c] @@ -30,7 +30,7 @@ T=4b25f14b 6=led.h 7=adc.h [magic.c] -T=4b25f2ac +T=4b261749 1=config.h [WDT.c] T=4afd21ca @@ -85,7 +85,7 @@ T=4b205fce 5=config.h 6=bsr_system.h [accero.c] -T=4b25f461 +T=4b2611c9 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] @@ -146,7 +146,7 @@ T=4b023fdb T=4b1cdaa0 1=config.h [config.h] -T=4b258474 +T=4b2615c6 [bsr_system.h] T=4afd21ca [renge\renge.h]