From f1e2149762bbc3b56a4f17af21f6311e5516a5be Mon Sep 17 00:00:00 2001 From: fujita_ryohei Date: Wed, 10 Feb 2010 04:37:35 +0000 Subject: [PATCH] =?UTF-8?q?TWL=20CODEC=E3=83=9C=E3=83=BC=E3=83=89=E6=99=82?= =?UTF-8?q?=E3=80=81Vol=E3=82=B9=E3=83=A9=E3=82=A4=E3=83=80=E3=81=8C?= =?UTF-8?q?=E3=81=B2=E3=81=A3=E3=81=8F=E3=82=8A=E8=BF=94=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= 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@96 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/adc.c | 2 +- trunk/config.h | 4 ++-- trunk/self_flash.c | 35 ++++++++++++++++++++--------------- trunk/vreg_ctr.c | 14 ++++++++++---- trunk/yav_mcu_bsr.plg | 10 +++++++++- trunk/yav_mcu_bsr.pri | 4 ++-- trunk/yav_mcu_bsr.prk | 12 +++++++----- trunk/yav_mcu_bsr.sdb | 8 ++++---- 8 files changed, 55 insertions(+), 34 deletions(-) diff --git a/trunk/adc.c b/trunk/adc.c index 502eb33..a6637e2 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -107,7 +107,7 @@ void tsk_adc( ) // codecに伝える iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL, temp ); - iic_mcu_write_a_byte( IIC_SLA_DCP, 0, temp ); // todo + iic_mcu_write_a_byte( IIC_SLA_DCP, 0, slider_to_codec[ ( 255 - adc_raw_vol ) / 4 ] ); // todo set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE ); } diff --git a/trunk/config.h b/trunk/config.h index 33ffb13..bef0efe 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -17,8 +17,8 @@ //#define _PARRADIUM_ //#define _MODEL_TEG2_ -#define _MODEL_WM0_ -//#define _MODEL_TS0_ +//#define _MODEL_WM0_ +#define _MODEL_TS0_ //#define _MODEL_CTR_ //#define _SW_HOME_ENABLE_ diff --git a/trunk/self_flash.c b/trunk/self_flash.c index 99c481c..4b6859c 100644 --- a/trunk/self_flash.c +++ b/trunk/self_flash.c @@ -101,24 +101,29 @@ err firm_update( ) TOE0 = 0x0000; TOE0 = 0x0020; - // 書き替え前準備 // + // 書き替え前準備 ///////////////////////////////////// my_FSL_Init(); /* ファームのバックアップ - 0x2000 - 0x47FF (ブロック 8 - 17) を - 0x4800 - 0x7FFF (ブロック 18 - 27) にコピー + 0x2000 - 0x4FFF を + 0x5000 - 0x7FFF (ブロック 20 - 31) にコピー */ - firm_duplicate( ( __far u8 * ) ( FIRM_TOP * 0x0400 ), - ( UPDATE_BLOCK_LAST + 1 ) ); + firm_duplicate( ( __far u8 * ) 0x2000, + ( 0x5000 / 0x0400 ) ); - // 書き替え // - /* - ●書き込み中の電源断を判定するため、最初に全クラスタ消去する（フッタを消したい） - ●ストップコンディションが来るまで続ける（結局、0x1000 - 0x47FF まですべて書き替えることにはなる） - ●終わったら、リセットする。WDTリセットなので自分でわかる。 - */ + // 全ブロック削除 ///////////////////////////////////// + // 電源断を判定するため、最初に全クラスタ消去する + //（新ファームが書かれるところに残ってる、以前のファームのフッタを消したい） + for( target_block = INACTIVE_BOOTSECT_TOP; + target_block <= UPDATE_BLOCK_LAST; + target_block += 1 ) + { + FSL_Erase( target_block ); + } - // ブロックの数だけ繰り返し + // 書き替え /////////////////////////////////////////// + // ●ストップコンディションが来るまで続ける + // ●終わったら、スタートアップルーチンに飛ぶ for( target_block = INACTIVE_BOOTSECT_TOP; target_block <= UPDATE_BLOCK_LAST; target_block += 1 ) @@ -222,7 +227,7 @@ err firm_restore( ) 0x4800 - 0x7FFF (ブロック 18 - 27) から 0x2000 - 0x47FF (ブロック 8 - 17) へコピー */ - firm_duplicate( ( __far u8 * )( ( UPDATE_BLOCK_LAST + 1 ) * 0x0400 ), + firm_duplicate( ( __far u8 * ) 0x5000, FIRM_TOP ); // todo @@ -289,8 +294,8 @@ static void FSL_Close( void ) /* ======================================================== 　マイコン内でファームをコピーします。 - __far u8 * p_rom コピー先のアドレス - block_dest コピー元の先頭ブロック + __far u8 * p_rom コピー元の先頭アドレス + block_dest コピー先の先頭ブロック コピー先に書けるようにmy_FSL_Initをあらかじめ実行する必要があります。 ======================================================== */ diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index e98c5c8..4a8be55 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -286,16 +286,22 @@ u8 vreg_ctr_read( u8 adrs ) { rtc_buf_reflesh( ); } - - if( adrs == VREG_C_MCU_STATUS ) + else if( adrs == VREG_C_MCU_STATUS ) { return( vreg_ctr[ VREG_C_MCU_STATUS ] | ( ( vreg_twl[ REG_TWL_INT_ADRS_MODE ] & 0x03 ) << 6 ) ); } - - if( adrs == VREG_C_ACC_HOSU_HIST ) + else if( adrs == VREG_C_ACC_HOSU_HIST ) { return( hosu_read() ); } + else if( adrs == VREG_C_ACC_DBG_E ) + { + return( (u8)( ( RSUBC >> 8 ) & 0xFF ) ); + } + else if( adrs == VREG_C_ACC_DBG_F ) + { + return( (u8)( RSUBC & 0xFF ) ); + } #if 1 if( adrs >= VREG_C_ENDMARK_ ) diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index dc61d1d..631f6d5 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -3,6 +3,14 @@ C:\WINDOWS\system32\cmd.exe /c touch 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 adc.c +adc.c(76) : CC78K0R warning W0745: Expected function prototype +adc.c(78) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(106) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(257) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 4 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\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 -gb7EFBFFh -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 +21,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) : 4 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 15f69f7..4eb02e9 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -4,7 +4,7 @@ Target=IDK0R32G [Configuration] Chip=uPD79F0104 Internal Rom=32KB -Internal Ram=1536B +Internal Ram=1536KB Clock=Target Sub Clock=Target Peripheral Break=0x2 @@ -22,7 +22,7 @@ SubClock=None [Mapping] Count=0 [Main] -Geometry=65, 39, 1467, 1110 +Geometry=113, 17, 1467, 1110 Window=Normal MDI_MAX=OFF Button=ON diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 0f23cf5..53593d4 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,16 +1,18 @@ [ProjectManager] FrameMax=0 -FrameX=26 -FrameY=50 +FrameX=63 +FrameY=123 FrameCX=1299 FrameCY=1044 OpenFile1=renge\renge.h,0,502,637,1746,1394,29,16,29,0 OpenFile2=pm.c,0,154,154,1133,791,0,792,0,0 OpenFile3=adc.c,0,132,132,1111,769,34,98,34,0 -OpenFile4=ProjectWindow +OpenFile4=self_flash.c,0,154,154,1133,791,44,112,0,0 +OpenFile5=config.h,0,289,54,1268,691,0,19,19,0 +OpenFile6=adc.c,0,198,198,1177,835,0,114,0,0 +OpenFile7=ProjectWindow PrjPos=0,2,754,3,253 -OpenFile5=config.h,0,284,54,1263,691,29,9,29,0 -OpenFile6=OutputWindow +OpenFile8=OutputWindow OutputPos=0,421,829,388,1497 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 67f9074..45a404f 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -32,7 +32,7 @@ T=4b68d913 6=led.h 7=adc.h [magic.c] -T=4b6bde17 +T=4b721c34 1=config.h [WDT.c] T=4afd21ca @@ -56,7 +56,7 @@ T=4b4438bb T=4b6a6fa4 1=incs.h [vreg_ctr.c] -T=4b6b8339 +T=4b721c07 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -92,7 +92,7 @@ T=4b6a666a 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] -T=4b67e6e0 +T=4b6fb909 1=incs_loader.h 2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h @@ -148,7 +148,7 @@ T=4b023fdb [user_define.h] T=4b690aa2 [config.h] -T=4b6bde15 +T=4b7217b7 [bsr_system.h] T=4b3064de [renge\renge.h]