From 106ef63009caec7d16f93e249195f1a5647d73f9 Mon Sep 17 00:00:00 2001
From: n2232 <n2232@013db118-44a6-b54f-8bf7-843cb86687b1>
Date: Fri, 9 Sep 2011 07:56:52 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E6=BC=8F=E3=82=8C?=
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@409 013db118-44a6-b54f-8bf7-843cb86687b1
---
 trunk/get_ei.asm      |  26 ++++++
 trunk/kanaria_c.c     |  18 +++++
 trunk/yav_mcu_bsr.prk |  23 +++---
 trunk/yav_mcu_bsr.sdb | 184 ++++++++++++++++++++++--------------------
 4 files changed, 154 insertions(+), 97 deletions(-)
 create mode 100644 trunk/get_ei.asm
 create mode 100644 trunk/kanaria_c.c

diff --git a/trunk/get_ei.asm b/trunk/get_ei.asm
new file mode 100644
index 0000000..29f4a6e
--- /dev/null
+++ b/trunk/get_ei.asm
@@ -0,0 +1,26 @@
+$PROCESSOR ( 9F0104 )
+
+PUBLIC _get_ei
+;
+; PSWのEIを読み出します。
+;
+
+
+
+ROM_CODE	CSEG	BASE
+
+_get_ei:
+		set1	CY
+        and1	CY,PSW.7	; check IE bit. if 0, all interrupts are disabled.
+        bnc     $ie_dis
+        mov	    C,#01h
+        ret
+
+ie_dis:
+        mov	    C,#00h
+        ret
+
+
+        end
+        
+
diff --git a/trunk/kanaria_c.c b/trunk/kanaria_c.c
new file mode 100644
index 0000000..bbb5ec7
--- /dev/null
+++ b/trunk/kanaria_c.c
@@ -0,0 +1,18 @@
+/********************************************//**
+ スタックの最後の値を読む
+ 
+ スタック破壊検査のため
+ 
+ $Id$
+ ***********************************************/
+#include "incs.h"
+
+extern unsigned char END_4;
+
+void f()
+{
+    unsigned char *tp;
+
+    tp = &END_4;
+}
+
diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk
index 7d3f78e..dfc5940 100644
--- a/trunk/yav_mcu_bsr.prk
+++ b/trunk/yav_mcu_bsr.prk
@@ -6,18 +6,19 @@ FrameCX=1440
 FrameCY=850
 OpenFile1=i2c_ctr.c,0,655,120,1628,751,0,1,0,0
 OpenFile2=kanaria_c.c,0,68,138,763,769,8,5,8,0
-OpenFile3=ProjectWindow
-PrjPos=0,0,706,0,291
-OpenFile4=pm.c,0,373,197,1346,828,35,374,32,0
-OpenFile5=accero.c,0,200,200,1016,818,109,227,2,0
-OpenFile6=i2c_mcu.h,0,671,375,1487,993,16,7,16,0
-OpenFile7=task_sys.c,0,225,225,1471,947,0,445,0,0
-OpenFile8=loader.c,0,250,250,1841,957,6,157,1,0
-OpenFile9=config.h,0,75,75,902,478,29,6,29,0
-OpenFile10=i2c_mcu.c,0,175,175,1036,939,1,453,1,0
-OpenFile11=main.c,0,402,105,1713,812,0,68,0,0
+OpenFile3=pm.c,0,373,197,1346,828,35,374,32,0
+OpenFile4=accero.c,0,200,200,1016,818,109,227,2,0
+OpenFile5=i2c_mcu.h,0,671,375,1487,993,16,7,16,0
+OpenFile6=task_sys.c,0,225,225,1471,947,0,445,0,0
+OpenFile7=loader.c,0,250,250,1841,957,6,157,1,0
+OpenFile8=i2c_mcu.c,0,175,175,1036,939,1,453,1,0
+OpenFile9=main.c,0,402,105,1713,812,0,68,0,0
+OpenFile10=magic.c,0,192,199,1387,680,19,11,0,0
+OpenFile11=config.h,0,75,75,902,478,0,15,0,0
 OpenFile12=OutputWindow
-OutputPos=0,260,711,278,1155
+OutputPos=0,228,679,379,1256
+OpenFile13=ProjectWindow
+PrjPos=0,0,706,0,291
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]
 ProjectWindowDispType=0
diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb
index 20998a5..051af38 100644
--- a/trunk/yav_mcu_bsr.sdb
+++ b/trunk/yav_mcu_bsr.sdb
@@ -1,7 +1,7 @@
 [SdbInfo]
 Ver=5
 [loader.c]
-T=4e5db4bc
+T=4e647ac1
 1=incs_loader.h
 2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
 3=fsl_user.h
@@ -10,9 +10,10 @@ T=4e5db4bc
 6=pm.h
 7=rtc.h
 8=reboot.h
-9=magic.h
+9=WDT.h
+10=magic.h
 [pm.c]
-T=4e5dbf8d
+T=4e6489a3
 1=incs.h
 2=adc.h
 3=led.h
@@ -21,46 +22,52 @@ T=4e5dbf8d
 6=batt_params.h
 7=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
 8=fsl_user.h
+9=vreg_twl.h
+10=i2c_mcu.h
 [i2c_ctr.c]
-T=4e532b68
-1=config.h
-2=incs.h
+T=4e6493ae
+1=incs.h
+2=rtc.h
+3=pedometer.h
 [main.c]
-T=4e5dbf8d
-1=incs_loader.h
-2=WDT.h
-3=rtc.h
-4=pm.h
-5=accero.h
-6=led.h
-7=adc.h
+T=4e647b08
+1=incs.h
+2=rtc.h
+3=pm.h
+4=accero.h
+5=led.h
+6=adc.h
+7=i2c_mcu.h
 8=pool.h
 [magic.c]
-T=4e5dbfb4
-1=config.h
-2=magic.h
+T=4e68758c
+1=magic.h
+2=config.h
 [WDT.c]
-T=4e424710
+T=4e649146
 1=incs_loader.h
 [i2c_mcu.c]
-T=4e56f834
+T=4e687586
 1=incs_loader.h
 2=i2c_mcu.h
+3=loader.h
+4=util_funcs.h
 [i2c_twl.c]
-T=4e4e1d71
-1=config.h
-2=incs.h
-3=i2c_twl_defs.h
-4=i2c_twl.h
+T=4e6493ad
+1=incs.h
+2=i2c_twl_defs.h
+3=i2c_twl.h
+4=vreg_twl.h
+5=WDT.h
 [led.c]
-T=4e5b390f
+T=4e648659
 1=incs.h
 2=led.h
 [rtc.c]
-T=4e423614
+T=4e647eec
 1=incs.h
 [vreg_ctr.c]
-T=4e5c39a6
+T=4e687272
 1=incs.h
 2=vreg_ctr.h
 3=rtc.h
@@ -68,48 +75,57 @@ T=4e5c39a6
 5=accero.h
 6=pm.h
 7=pool.h
-8=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
-9=fsl_user.h
+8=vreg_twl.h
+9=sw.h
+10=WDT.h
+11=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
+12=fsl_user.h
 [vreg_twl.c]
-T=4e530e07
+T=4e6491f4
 1=incs.h
 2=jhl_defs.h
 3=led.h
 4=vreg_twl.h
-5=vreg_ctr.h
+5=adc.h
 [adc.c]
-T=4e531196
+T=4e648e7a
 1=incs.h
 2=adc.h
 3=pm.h
 4=led.h
 5=vreg_twl.h
+6=i2c_mcu.h
 [renge\renge.c]
-T=4e54a654
+T=4e6872a9
 1=renge\renge.h
 2=renge\renge_task_intval.h
 3=renge\renge_task_immediate.h
 4=WDT.h
 5=config.h
 6=user_define.h
-7=sim\simOnWin.h
-8=bsr_system.h
+7=util_funcs.h
+8=sim\simOnWin.h
+9=bsr_system.h
 [accero.c]
-T=4e5c3a75
-1=config.h
-2=incs.h
-3=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h
+T=4e687584
+1=incs.h
+2=accero.h
+3=i2c_mcu.h
+4=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h
 [self_flash.c]
-T=4e409e18
+T=4e686baa
 1=incs_loader.h
 2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
 3=fsl_user.h
 4=i2c_ctr.h
-5=pool.h
-6=magic.h
-7=pm.h
+5=i2c_mcu.h
+6=pool.h
+7=magic.h
+8=pm.h
+9=WDT.h
+10=util_funcs.h
 [sw.c]
-T=4e54ca66
+T=4e6480e9
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -118,13 +134,13 @@ T=4e54ca66
 6=rtc.h
 7=sw.h
 [task_debug.c]
-T=4e5c398f
+T=4e647e9c
 1=incs_loader.h
 2=renge\renge.h
 3=pm.h
 4=accero.h
 [task_misc.c]
-T=4e5dc039
+T=4e68733b
 1=incs.h
 2=renge\renge.h
 3=pm.h
@@ -134,7 +150,7 @@ T=4e5dc039
 7=led.h
 8=vreg_twl.h
 [task_sys.c]
-T=4e5dbf8d
+T=4e6865dd
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@@ -145,57 +161,64 @@ T=4e5dbf8d
 8=sw.h
 9=adc.h
 10=self_flash.h
+11=i2c_mcu.h
+12=vreg_twl.h
 [pedo_alg_thre_det2.c]
-T=4e522ab6
+T=4e687272
 1=incs.h
 2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h
 3=accero.h
 4=pedometer.h
 5=pool.h
 [ini_VECT.c]
-T=4e409e1a
+T=4e6864d2
 1=config.h
 2=sim\sim_interrupt_decrare.c
 [task_status.c]
-T=4e532a61
+T=4e6495df
 1=incs_loader.h
 2=renge\renge.h
-3=hal.h
-4=pm.h
-5=accero.h
-6=adc.h
-7=i2c_mcu.h
-8=led.h
+3=pm.h
+4=accero.h
+5=adc.h
+6=i2c_mcu.h
+7=led.h
 [led_cam.c]
-T=4e55dd12
+T=4e687272
 1=incs.h
 2=led.h
+3=vreg_twl.h
 [led_pow.c]
-T=4e530e07
+T=4e648b74
 1=incs.h
 2=led.h
+3=pm.h
 [hal.c]
-T=4e532b4c
+T=4e648ec7
 1=incs_loader.h
 [batt_params.c]
-T=4e409e1b
+T=4e648e95
 1=jhl_defs.h
 2=batt_params.h
 [voltable.c]
-T=4e422f23
+T=4e649285
 1=incs.h
 [pedo_lpf_coeff.c]
-T=4e422f1d
+T=4e6489bd
 1=incs.h
 [kanaria.asm]
 T=4e4226a2
 [kanaria_c.c]
-T=4e522dba
+T=4e6489de
 1=incs.h
 [get_ei.asm]
 T=4e5223c3
+[util_funcs.c]
+T=4e68724a
+1=incs_loader.h
+2=WDT.h
 [incs_loader.h]
-T=4e409e1d
+T=4e646cef
 1=sim\simOnWin.h
 2=jhl_defs.h
 3=user_define.h
@@ -204,9 +227,6 @@ T=4e409e1d
 6=renge\renge.h
 7=vreg_ctr.h
 8=vreg_twl.h
-9=loader.h
-10=i2c_mcu.h
-11=WDT.h
 [sim\simOnWin.h]
 T=4e559884
 1=sim\sfrAlias.h
@@ -214,18 +234,17 @@ T=4e559884
 T=4e5b0fa2
 1=config.h
 [config.h]
-T=4e5cbce4
+T=4e686baa
 [jhl_defs.h]
-T=4df82cd1
-1=config.h
+T=4e647343
 [user_define.h]
-T=4e5b1041
+T=4e686ba9
 [hal.h]
 T=4e5229fb
 [bsr_system.h]
 T=4e409e1a
 [renge\renge.h]
-T=4e54e394
+T=4e5e108a
 1=renge\renge_defs.h
 2=renge\renge_task_immediate.h
 [renge\renge_defs.h]
@@ -234,12 +253,12 @@ T=4c073c5a
 T=4e54ab05
 1=renge\renge_defs.h
 [vreg_ctr.h]
-T=4e409e1c
+T=4e5f0c2e
 1=config.h
 [vreg_twl.h]
 T=4d42202e
 [loader.h]
-T=4c318e0f
+T=4e646df6
 [i2c_mcu.h]
 T=4e55a31b
 [WDT.h]
@@ -259,24 +278,15 @@ T=4bf0d1e1
 [magic.h]
 T=4caab849
 [incs.h]
-T=4e409e18
+T=4e646ff5
 1=sim\simOnWin.h
 2=jhl_defs.h
 3=user_define.h
 4=hal.h
 5=bsr_system.h
 6=renge\renge.h
-7=loader.h
-8=vreg_ctr.h
-9=vreg_twl.h
-10=i2c_mcu.h
-11=i2c_twl.h
-12=rtc.h
-13=accero.h
-14=pm.h
-15=sw.h
-16=adc.h
-17=WDT.h
+7=vreg_ctr.h
+8=util_funcs.h
 [i2c_twl.h]
 T=4bf4e29e
 [accero.h]
@@ -310,3 +320,5 @@ T=45f12258
 T=4bf0d1e0
 [sim\sim_interrupt_decrare.c]
 T=4e409e19
+[util_funcs.h]
+T=4e687249