diff --git a/trunk/config.h b/trunk/config.h index 9e28bfd..db1c07c 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -9,6 +9,7 @@ //#define _PARRADIUM_ + //#define _MODEL_TEG2_ //#define _MODEL_WM0_ #define _MODEL_TS0_ diff --git a/trunk/jhl_defs.h b/trunk/jhl_defs.h index e23de70..65b8946 100644 --- a/trunk/jhl_defs.h +++ b/trunk/jhl_defs.h @@ -9,6 +9,10 @@ typedef short s16; typedef unsigned char err; +#include "config.h" + + + #define set_bit( cond, reg, pos ) \ { \ if( cond ){ \ @@ -31,6 +35,7 @@ typedef unsigned char err; } #endif +#ifndef _PARRADIUM_ // マスクされてたら、フラグも立てず、割り込みも入れない。 #define set_irq( irqreg, bitpos ) \ { \ @@ -42,6 +47,17 @@ typedef unsigned char err; } \ } +#else +#define set_irq( irqreg, bitpos ) \ +{ \ + if( ( vreg_ctr[ irqreg+8 ] & bitpos ) == 0 ){ \ + IRQ0_neg; \ + vreg_ctr[ irqreg ] |= bitpos; \ + IRQ0_ast; \ + } \ +} + +#endif #endif diff --git a/trunk/main.c b/trunk/main.c index 89a3a61..f90e22c 100644 --- a/trunk/main.c +++ b/trunk/main.c @@ -56,7 +56,7 @@ void main_loop( void ) } #ifdef _PARRADIUM_ - system_status.pwr_state = ON_TRIG; + system_status.pwr_state = OFF; #endif vreg_ctr_init( ); vreg_twl_init( ); diff --git a/trunk/task_sys.c b/trunk/task_sys.c index d150658..12b538d 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -39,6 +39,7 @@ void tsk_sys( ) case OFF: //------------------------------------------------------- // スイッチ操作などで割り込みが発生し、スリープが解除されるとここに来ます。 +#ifndef _PARRADIUM_ switch ( system_status.poweron_reason ) { default: @@ -90,6 +91,10 @@ void tsk_sys( ) system_status.pwr_state = OFF_TRIG; return; } +#else + vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_GASGAUGE_ERR; + system_status.poweron_reason = PWSW; +#endif // _PARADDIUM_ PM_LCD_vcom_set( ); // LCDの対向電圧値など書き込み #ifdef _PMIC_TWL_ @@ -249,7 +254,9 @@ void tsk_sys( ) // 割り込み待ちで寝る // RTCIMK = 1; +#ifndef _PARRADIUM_ STOP( ); +#endif RTCIMK = 0; // 起きる // @@ -279,6 +286,7 @@ void tsk_sys( ) PMICが電源異常で止めたか確認 **********************************************************/ static void chk_emergencyExit(){ +#ifndef _PARRADIUM_ if( !RESET1_n ) { if( PM_chk_LDSW( ) == 0 ) @@ -294,6 +302,7 @@ static void chk_emergencyExit(){ renge_task_immed_add( do_command ); } } +#endif } diff --git a/trunk/user_define.h b/trunk/user_define.h index bea71d0..e12c312 100644 --- a/trunk/user_define.h +++ b/trunk/user_define.h @@ -77,7 +77,12 @@ #define RESET2_ast { P0.1 = 0; } #define RESET2_neg { P0.1 = 1; } +#ifndef _PARRADIUM_ #define SLP_REQ P12.0 +#else +#define SLP_REQ 0 +#endif + // FCRAM #ifndef _MODEL_TS0_ #define FCRAM_RST P14.0 diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index b4c1368..42c4638 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,6 +1,127 @@ C:\WINDOWS\system32\cmd.exe /c echo touch magic.c touch magic.c +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no loader.c +loader.c(138) : CC78K0R warning W0401: Conversion may lose significant digits +loader.c(142) : CC78K0R warning W0401: Conversion may lose significant digits +loader.c(145) : 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 -qvjl1wt -sainter_asm -zp -no pm.c +pm.c(189) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(201) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(205) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(611) : 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\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 -qvjl1wt -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 -qvjl1wt -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 -qvjl1wt -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 -qvjl1wt -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 -qvjl1wt -sainter_asm -zp -no i2c_mcu.c +i2c_mcu.c(103) : CC78K0R warning W0401: Conversion may lose significant digits +i2c_mcu.c(180) : 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 -qvjl1wt -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 -qvjl1wt -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 -qvjl1wt -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 -qvjl1wt -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 -qvjl1wt -sainter_asm -zp -no vreg_ctr.c +vreg_ctr.c(60) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(103) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(104) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(106) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(108) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(109) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(111) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 7 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 -qvjl1wt -sainter_asm -zp -no vreg_twl.c +vreg_twl.c(47) : 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\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 -qvjl1wt -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(224) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(44) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 7 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 -qvjl1wt -sainter_asm -zp -no accero.c +accero.c(91) : CC78K0R warning W0745: Expected function prototype +accero.c(93) : 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 -qvjl1wt -sainter_asm -zp -no self_flash.c +self_flash.c(234) : 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 -qvjl1wt -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 -qvjl1wt -sainter_asm -zp -no sw.c +sw.c(66) : 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\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 -qvjl1wt -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 -qvjl1wt -sainter_asm -zp -no task_misc.c +task_misc.c(40) : CC78K0R warning W0401: Conversion may lose significant digits +task_misc.c(32) : 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 -qvjl1wt -sainter_asm -zp -no task_sys.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_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 -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 +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) : 0 +Build Total error(s) : 0 Total warning(s) : 33 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 0a256fe..856ae66 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=50, 50, 863, 1017 +Geometry=284, 93, 863, 998 Window=Normal -DispStart=251 -CaretPos=253,0 +DispStart=69 +CaretPos=70,0 Mode=Normal DispFile= Address1= @@ -894,7 +894,17 @@ Manager=ON Sort by=Unsort Detail=OFF Last Name= -Count=0 +Name0=vreg_001 +Status0=W +Access Size0=B +Address Range0=EQ +Address0= - <> +Mask Address0=00000000 +Data Range0=NC +Data0=<00000000> - <00000000> +Mask Data0=FFFFFFFF +Pass0=0001 +Count=1 [Event Link] Geometry=0, 0, 0, 0 Window=Hide @@ -910,7 +920,10 @@ Manager=ON Sort by=Unsort Detail=OFF Last Name= -Count=0 +Name0=vreg_002 +Element0=vreg_001 +Set0=ON +Count=1 [Trace] Geometry=0, 0, 0, 0 Window=Hide @@ -960,32 +973,37 @@ Count=0 Geometry=1143, 7, 440, 503 Window=Normal Boundary=13762700 -0=.P2,B,S,A,+,1 -1=.PM2,B,S,A,+,1 -2=.raw_adc_temperature,P,N,A,+,1 -3=.vreg_ctr,P,N,A,+,1 -4=.reg1_old,P,N,A,+,1 -5=.reg_shadow,P,N,A,+,1 -Line=6 +0=.SVA0,P,S,A,+,1 +1=.IICA0EN,P,S,A,+,1 +2=.IICAIF1,P,S,A,+,1 +3=.IICAIF0,P,S,A,+,1 +4=.system_status.pwr_state,P,N,A,+,1 +5=.P2,B,S,A,+,1 +6=.PM2,B,S,A,+,1 +7=.raw_adc_temperature,P,N,A,+,1 +8=.vreg_ctr,P,N,A,+,1 +9=.reg1_old,P,N,A,+,1 +10=.reg_shadow,P,N,A,+,1 +Line=11 [Quick Watch] -0=vreg_ctr[VREG_C_IRQ3],P,A,1 -1=vreg_ctr[0x1b],P,A,1 -2=system_status.pwr_state,P,A,1 -3=P12.0,P,A,1 -4=PM12,P,A,1 -5=PM12.0,P,A,1 -6=PMK23,P,A,1 -7=vreg_ctr[0x0e],P,A,1 -8=iic_mcu_bus_status,P,A,1 -9=diff,P,A,1 -10=reg_shadow,P,A,1 -11=reg1_old,P,A,1 -12=vreg_ctr,P,A,1 -13=raw_adc_temperature,P,A,1 -14=PM2,P,A,1 -15=P2,B,A,1 +0=vreg_ctr[0x0e],P,A,1 +1=iic_mcu_bus_status,P,A,1 +2=diff,P,A,1 +3=reg_shadow,P,A,1 +4=reg1_old,P,A,1 +5=vreg_ctr,P,A,1 +6=raw_adc_temperature,P,A,1 +7=PM2,P,A,1 +8=P2,B,A,1 +9=system_status.pwr_state,P,A,1 +10=IICA0IF0,P,A,1 +11=IICA0IF,P,A,1 +12=IICAIF0,P,A,1 +13=IICAIF1,P,A,1 +14=IICA0EN,P,A,1 +15=SVA0,P,A,1 [Software Break] -Geometry=1069, 594, 500, 200 +Geometry=1069, 522, 500, 272 Window=Normal Width=150 30 200 100 Name0=Swb00003 @@ -1005,14 +1023,18 @@ Address3=pm.c#_ntr_pmic_comm+0x30 Window3=ASM Status3=ON Name4=Swb00001 -Address4=pm.c#_ntr_pmic_comm+0xbc +Address4=pm.c#_ntr_pmic_comm+0xb6 Window4=ASM Status4=ON -Name5=Swb00014 -Address5=pm.c#_PM_bt_temp_update+0x96 +Name5=Swb00009 +Address5=task_sys.c#_tsk_sys+0x6e Window5=ASM Status5=ON -Count=6 +Name6=Swb00010 +Address6=task_sys.c#_tsk_sys+0x80 +Window6=ASM +Status6=ON +Count=7 [Reset] Debugger=ON Symbol=OFF