From fbd319fdead31bb9617720a60a511da8f1790d43 Mon Sep 17 00:00:00 2001 From: fujita_ryohei Date: Tue, 15 Dec 2009 02:06:16 +0000 Subject: [PATCH] =?UTF-8?q?BL=E3=81=AEon/off=E3=82=82=E5=89=B2=E3=82=8A?= =?UTF-8?q?=E8=BE=BC=E3=81=BF=E3=83=9E=E3=82=B9=E3=82=AF=E3=81=8C=E8=81=9E?= =?UTF-8?q?=E3=81=8F=E3=82=88=E3=81=86=E3=81=AB=20LCDoff=E6=99=82=E3=80=81?= =?UTF-8?q?BL=E3=81=8C=E3=81=A4=E3=81=84=E3=81=A6=E3=81=84=E3=81=9F?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AF=E5=8B=9D=E6=89=8B=E3=81=AB=E5=88=87?= =?UTF-8?q?=E3=82=8B=E3=80=82=E5=88=87=E3=81=A3=E3=81=9F=E5=A0=B4=E5=90=88?= =?UTF-8?q?=E3=81=AF=E5=89=B2=E3=82=8A=E8=BE=BC=E3=81=BF=E3=82=82=E5=85=A5?= =?UTF-8?q?=E3=82=8C=E3=82=8B=20bin=E3=82=92=E3=83=AA=E3=83=9D=E3=82=B8?= =?UTF-8?q?=E3=83=88=E3=83=AA=E3=81=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@56 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/bin/mcu_C2_0B_1215.bin | Bin 0 -> 14339 bytes trunk/config.h | 4 +- trunk/pm.c | 222 +++++++++++++---------------------- trunk/yav_mcu_bsr.plg | 131 +++++++++++++++++++-- trunk/yav_mcu_bsr.pri | 63 +++++----- trunk/yav_mcu_bsr.prj | 14 +-- trunk/yav_mcu_bsr.sdb | 10 +- 7 files changed, 247 insertions(+), 197 deletions(-) create mode 100644 trunk/bin/mcu_C2_0B_1215.bin diff --git a/trunk/bin/mcu_C2_0B_1215.bin b/trunk/bin/mcu_C2_0B_1215.bin new file mode 100644 index 0000000000000000000000000000000000000000..95154e40cb12f9f1e0d6435f833d58f4dc6a14ec GIT binary patch literal 14339 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 G-u@eT5K4#u literal 0 HcmV?d00001 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]