rvtr/ctr_mcu
1
Fork 0
mirror of https://github.com/rvtr/ctr_mcu.git synced 2025-10-31 13:51:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

□スタンドアロン試遊台ファーム統合

Browse Source 
大型リファクタリング前バックアップ的な
1をtrueにするような変更
絶対に使われないifdefの整理


git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@335 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
n2232 2011-06-08 01:12:53 +00:00
parent 9d533dcf48
commit 01684ac6a9
15 changed files with 862 additions and 873 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
trunk/bsr.lmf
View File

Binary file not shown.

426
trunk/bsr_k0r.map
View File

@ -1,7 +1,7 @@
78K0R Linker W1.33 Date:26 May 2011 Page: 1 78K0R Linker W1.33 Date: 8 Jun 2011 Page: 1
Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff -
obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C
@ -9,12 +9,14 @@ Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff -
_k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Electro _k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Electro
nics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0r nics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0r
m.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronics T m.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronics T
ools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w0 loader.rel pm ools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w0 obj\loader.re
.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_t l obj\pm.rel obj\i2c_ctr.rel obj\main.rel obj\magic.rel obj\W
wl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel reng DT.rel obj\i2c_mcu.rel obj\i2c_twl.rel obj\led.rel obj\rtc.re
e.rel accero.rel self_flash.rel sw.rel task_debug.rel task_mi l obj\vreg_ctr.rel obj\vreg_twl.rel obj\adc.rel obj\renge.rel
sc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_ obj\accero.rel obj\self_flash.rel obj\sw.rel obj\task_debug.
status.rel led_cam.rel led_pow.rel rel obj\task_misc.rel obj\task_sys.rel obj\pedo_alg_thre_det2
.rel obj\ini_VECT.rel obj\task_status.rel obj\led_cam.rel obj
\led_pow.rel
Para-file: Para-file:
Out-file: bsr.lmf Out-file: bsr.lmf
Map-file: bsr_k0r.map Map-file: bsr_k0r.map
@ -24,8 +26,8 @@ Direc-file:bsr_mcu.dr
*** Link information *** *** Link information ***
65 output segment(s) 65 output segment(s)
3E40H byte(s) real data 3E70H byte(s) real data
5756 symbol(s) defined 5778 symbol(s) defined
*** Memory map *** *** Memory map ***
@ -186,7 +188,7 @@ Direc-file:bsr_mcu.dr
02266H 00000H 02266H 00000H
@@CNST led_cam 02266H 00000H @@CNST led_cam 02266H 00000H
@@CNST led_pow 02266H 00020H @@CNST led_pow 02266H 00020H
ROM_CODE 02286H 02780H CSEG ROM_CODE 02286H 027B0H CSEG
ROM_CODE pm 02286H 00A93H ROM_CODE pm 02286H 00A93H
ROM_CODE i2c_ctr 02D19H 00060H ROM_CODE i2c_ctr 02D19H 00060H
ROM_CODE i2c_twl 02D79H 0005EH ROM_CODE i2c_twl 02D79H 0005EH
@ -197,239 +199,239 @@ Direc-file:bsr_mcu.dr
ROM_CODE adc 03697H 002FCH ROM_CODE adc 03697H 002FCH
ROM_CODE renge 03993H 00190H ROM_CODE renge 03993H 00190H
ROM_CODE accero 03B23H 0013DH ROM_CODE accero 03B23H 0013DH
ROM_CODE sw 03C60H 0013DH ROM_CODE sw 03C60H 00178H
ROM_CODE task_misc ROM_CODE task_misc
03D9DH 0017FH 03DD8H 0017FH
ROM_CODE task_sys 03F1CH 0038BH ROM_CODE task_sys 03F57H 00380H
ROM_CODE pedo_alg_thre_det2 ROM_CODE pedo_alg_thre_det2
042A7H 00502H 042D7H 00502H
ROM_CODE led_cam 047A9H 000DBH ROM_CODE led_cam 047D9H 000DBH
ROM_CODE led_pow 04884H 00182H ROM_CODE led_pow 048B4H 00182H
@@BASE 04A06H 004C6H CSEG BASE @@BASE 04A36H 004C6H CSEG BASE
@@BASE loader 04A06H 00000H @@BASE loader 04A36H 00000H
@@BASE pm 04A06H 0003FH @@BASE pm 04A36H 0003FH
@@BASE i2c_ctr 04A45H 0018DH @@BASE i2c_ctr 04A75H 0018DH
@@BASE main 04BD2H 00000H @@BASE main 04C02H 00000H
@@BASE magic 04BD2H 00000H @@BASE magic 04C02H 00000H
@@BASE WDT 04BD2H 00000H @@BASE WDT 04C02H 00000H
@@BASE i2c_mcu 04BD2H 0009CH @@BASE i2c_mcu 04C02H 0009CH
@@BASE i2c_twl 04C6EH 000CBH @@BASE i2c_twl 04C9EH 000CBH
@@BASE led 04D39H 00000H @@BASE led 04D69H 00000H
@@BASE rtc 04D39H 0005EH @@BASE rtc 04D69H 0005EH
@@BASE vreg_ctr 04D97H 00000H @@BASE vreg_ctr 04DC7H 00000H
@@BASE vreg_twl 04D97H 00000H @@BASE vreg_twl 04DC7H 00000H
@@BASE adc 04D97H 000B3H @@BASE adc 04DC7H 000B3H
@@BASE renge 04E4AH 00000H @@BASE renge 04E7AH 00000H
@@BASE accero 04E4AH 0004AH @@BASE accero 04E7AH 0004AH
@@BASE self_flash @@BASE self_flash
04E94H 00000H 04EC4H 00000H
@@BASE sw 04E94H 00000H @@BASE sw 04EC4H 00000H
@@BASE task_debug @@BASE task_debug
04E94H 00000H 04EC4H 00000H
@@BASE task_misc @@BASE task_misc
04E94H 00000H 04EC4H 00000H
@@BASE task_sys 04E94H 00000H @@BASE task_sys 04EC4H 00000H
@@BASE pedo_alg_thre_det2 @@BASE pedo_alg_thre_det2
04E94H 00000H 04EC4H 00000H
@@BASE ini_VECT 04E94H 00038H @@BASE ini_VECT 04EC4H 00038H
@@BASE task_status @@BASE task_status
04ECCH 00000H 04EFCH 00000H
@@BASE led_cam 04ECCH 00000H @@BASE led_cam 04EFCH 00000H
@@BASE led_pow 04ECCH 00000H @@BASE led_pow 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL @cstart 04ECCH 00000H @@CNSTL @cstart 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL pm 04ECCH 00000H @@CNSTL pm 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04ECCH 00000H @@CNSTL i2c_ctr 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL i2c_twl 04ECCH 00000H @@CNSTL i2c_twl 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL led 04ECCH 00000H @@CNSTL led 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL rtc 04ECCH 00000H @@CNSTL rtc 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04ECCH 00000H @@CNSTL vreg_ctr 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04ECCH 00000H @@CNSTL vreg_twl 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL adc 04ECCH 00000H @@CNSTL adc 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL renge 04ECCH 00000H @@CNSTL renge 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL accero 04ECCH 00000H @@CNSTL accero 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL sw 04ECCH 00000H @@CNSTL sw 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL task_misc @@CNSTL task_misc
04ECCH 00000H 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL task_sys 04ECCH 00000H @@CNSTL task_sys 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL pedo_alg_thre_det2 @@CNSTL pedo_alg_thre_det2
04ECCH 00000H 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04ECCH 00000H @@CNSTL ini_VECT 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL led_cam 04ECCH 00000H @@CNSTL led_cam 04EFCH 00000H
@@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL 04EFCH 00000H CSEG PAGE64KP
@@CNSTL led_pow 04ECCH 00000H @@CNSTL led_pow 04EFCH 00000H
@@CNSTL 04ECCH 0000AH CSEG PAGE64KP @@CNSTL 04EFCH 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04ECCH 0000AH @@CNSTL @bcdtob 04EFCH 0000AH
@@R_INIT 04ED6H 00038H CSEG UNIT64KP @@R_INIT 04F06H 00038H CSEG UNIT64KP
@@R_INIT @cstart 04ED6H 00000H @@R_INIT @cstart 04F06H 00000H
@@R_INIT loader 04ED6H 00000H @@R_INIT loader 04F06H 00000H
@@R_INIT pm 04ED6H 00002H @@R_INIT pm 04F06H 00002H
@@R_INIT i2c_ctr 04ED8H 00002H @@R_INIT i2c_ctr 04F08H 00002H
@@R_INIT main 04EDAH 00000H @@R_INIT main 04F0AH 00000H
@@R_INIT magic 04EDAH 00000H @@R_INIT magic 04F0AH 00000H
@@R_INIT WDT 04EDAH 00000H @@R_INIT WDT 04F0AH 00000H
@@R_INIT i2c_mcu 04EDAH 00000H @@R_INIT i2c_mcu 04F0AH 00000H
@@R_INIT i2c_twl 04EDAH 00000H @@R_INIT i2c_twl 04F0AH 00000H
@@R_INIT led 04EDAH 00000H @@R_INIT led 04F0AH 00000H
@@R_INIT rtc 04EDAH 00000H @@R_INIT rtc 04F0AH 00000H
@@R_INIT vreg_ctr 04EDAH 00000H @@R_INIT vreg_ctr 04F0AH 00000H
@@R_INIT vreg_twl 04EDAH 00000H @@R_INIT vreg_twl 04F0AH 00000H
@@R_INIT adc 04EDAH 0000CH @@R_INIT adc 04F0AH 0000CH
@@R_INIT renge 04EE6H 00014H @@R_INIT renge 04F16H 00014H
@@R_INIT accero 04EFAH 00000H @@R_INIT accero 04F2AH 00000H
@@R_INIT self_flash @@R_INIT self_flash
04EFAH 00000H 04F2AH 00000H
@@R_INIT sw 04EFAH 00002H @@R_INIT sw 04F2AH 00002H
@@R_INIT task_debug @@R_INIT task_debug
04EFCH 00000H 04F2CH 00000H
@@R_INIT task_misc @@R_INIT task_misc
04EFCH 00000H 04F2CH 00000H
@@R_INIT task_sys 04EFCH 00002H @@R_INIT task_sys 04F2CH 00002H
@@R_INIT pedo_alg_thre_det2 @@R_INIT pedo_alg_thre_det2
04EFEH 00006H 04F2EH 00006H
@@R_INIT ini_VECT 04F04H 00000H @@R_INIT ini_VECT 04F34H 00000H
@@R_INIT task_status @@R_INIT task_status
04F04H 00002H 04F34H 00002H
@@R_INIT led_cam 04F06H 00002H @@R_INIT led_cam 04F36H 00002H
@@R_INIT led_pow 04F08H 00006H @@R_INIT led_pow 04F38H 00006H
@@R_INIT @rom 04F0EH 00000H @@R_INIT @rom 04F3EH 00000H
@@R_INIS 04F0EH 00000H CSEG UNIT64KP @@R_INIS 04F3EH 00000H CSEG UNIT64KP
@@R_INIS @cstart 04F0EH 00000H @@R_INIS @cstart 04F3EH 00000H
@@R_INIS loader 04F0EH 00000H @@R_INIS loader 04F3EH 00000H
@@R_INIS pm 04F0EH 00000H @@R_INIS pm 04F3EH 00000H
@@R_INIS i2c_ctr 04F0EH 00000H @@R_INIS i2c_ctr 04F3EH 00000H
@@R_INIS main 04F0EH 00000H @@R_INIS main 04F3EH 00000H
@@R_INIS magic 04F0EH 00000H @@R_INIS magic 04F3EH 00000H
@@R_INIS WDT 04F0EH 00000H @@R_INIS WDT 04F3EH 00000H
@@R_INIS i2c_mcu 04F0EH 00000H @@R_INIS i2c_mcu 04F3EH 00000H
@@R_INIS i2c_twl 04F0EH 00000H @@R_INIS i2c_twl 04F3EH 00000H
@@R_INIS led 04F0EH 00000H @@R_INIS led 04F3EH 00000H
@@R_INIS rtc 04F0EH 00000H @@R_INIS rtc 04F3EH 00000H
@@R_INIS vreg_ctr 04F0EH 00000H @@R_INIS vreg_ctr 04F3EH 00000H
@@R_INIS vreg_twl 04F0EH 00000H @@R_INIS vreg_twl 04F3EH 00000H
@@R_INIS adc 04F0EH 00000H @@R_INIS adc 04F3EH 00000H
@@R_INIS renge 04F0EH 00000H @@R_INIS renge 04F3EH 00000H
@@R_INIS accero 04F0EH 00000H @@R_INIS accero 04F3EH 00000H
@@R_INIS self_flash @@R_INIS self_flash
04F0EH 00000H 04F3EH 00000H
@@R_INIS sw 04F0EH 00000H @@R_INIS sw 04F3EH 00000H
@@R_INIS task_debug @@R_INIS task_debug
04F0EH 00000H 04F3EH 00000H
@@R_INIS task_misc @@R_INIS task_misc
04F0EH 00000H 04F3EH 00000H
@@R_INIS task_sys 04F0EH 00000H @@R_INIS task_sys 04F3EH 00000H
@@R_INIS pedo_alg_thre_det2 @@R_INIS pedo_alg_thre_det2
04F0EH 00000H 04F3EH 00000H
@@R_INIS ini_VECT 04F0EH 00000H @@R_INIS ini_VECT 04F3EH 00000H
@@R_INIS task_status @@R_INIS task_status
04F0EH 00000H 04F3EH 00000H
@@R_INIS led_cam 04F0EH 00000H @@R_INIS led_cam 04F3EH 00000H
@@R_INIS led_pow 04F0EH 00000H @@R_INIS led_pow 04F3EH 00000H
@@R_INIS @rom 04F0EH 00000H @@R_INIS @rom 04F3EH 00000H
@@CALT 04F0EH 00000H CSEG @@CALT 04F3EH 00000H CSEG
@@CALT @cstart 04F0EH 00000H @@CALT @cstart 04F3EH 00000H
@@CALT loader 04F0EH 00000H @@CALT loader 04F3EH 00000H
@@CALT pm 04F0EH 00000H @@CALT pm 04F3EH 00000H
@@CALT i2c_ctr 04F0EH 00000H @@CALT i2c_ctr 04F3EH 00000H
@@CALT main 04F0EH 00000H @@CALT main 04F3EH 00000H
@@CALT magic 04F0EH 00000H @@CALT magic 04F3EH 00000H
@@CALT WDT 04F0EH 00000H @@CALT WDT 04F3EH 00000H
@@CALT i2c_mcu 04F0EH 00000H @@CALT i2c_mcu 04F3EH 00000H
@@CALT i2c_twl 04F0EH 00000H @@CALT i2c_twl 04F3EH 00000H
@@CALT led 04F0EH 00000H @@CALT led 04F3EH 00000H
@@CALT rtc 04F0EH 00000H @@CALT rtc 04F3EH 00000H
@@CALT vreg_ctr 04F0EH 00000H @@CALT vreg_ctr 04F3EH 00000H
@@CALT vreg_twl 04F0EH 00000H @@CALT vreg_twl 04F3EH 00000H
@@CALT adc 04F0EH 00000H @@CALT adc 04F3EH 00000H
@@CALT renge 04F0EH 00000H @@CALT renge 04F3EH 00000H
@@CALT accero 04F0EH 00000H @@CALT accero 04F3EH 00000H
@@CALT self_flash @@CALT self_flash
04F0EH 00000H 04F3EH 00000H
@@CALT sw 04F0EH 00000H @@CALT sw 04F3EH 00000H
@@CALT task_debug @@CALT task_debug
04F0EH 00000H 04F3EH 00000H
@@CALT task_misc @@CALT task_misc
04F0EH 00000H 04F3EH 00000H
@@CALT task_sys 04F0EH 00000H @@CALT task_sys 04F3EH 00000H
@@CALT pedo_alg_thre_det2 @@CALT pedo_alg_thre_det2
04F0EH 00000H 04F3EH 00000H
@@CALT ini_VECT 04F0EH 00000H @@CALT ini_VECT 04F3EH 00000H
@@CALT task_status @@CALT task_status
04F0EH 00000H 04F3EH 00000H
@@CALT led_cam 04F0EH 00000H @@CALT led_cam 04F3EH 00000H
@@CALT led_pow 04F0EH 00000H @@CALT led_pow 04F3EH 00000H
@@RLINIT 04F0EH 00000H CSEG UNIT64KP @@RLINIT 04F3EH 00000H CSEG UNIT64KP
@@RLINIT loader 04F0EH 00000H @@RLINIT loader 04F3EH 00000H
@@RLINIT pm 04F0EH 00000H @@RLINIT pm 04F3EH 00000H
@@RLINIT i2c_ctr 04F0EH 00000H @@RLINIT i2c_ctr 04F3EH 00000H
@@RLINIT main 04F0EH 00000H @@RLINIT main 04F3EH 00000H
@@RLINIT magic 04F0EH 00000H @@RLINIT magic 04F3EH 00000H
@@RLINIT WDT 04F0EH 00000H @@RLINIT WDT 04F3EH 00000H
@@RLINIT i2c_mcu 04F0EH 00000H @@RLINIT i2c_mcu 04F3EH 00000H
@@RLINIT i2c_twl 04F0EH 00000H @@RLINIT i2c_twl 04F3EH 00000H
@@RLINIT led 04F0EH 00000H @@RLINIT led 04F3EH 00000H
@@RLINIT rtc 04F0EH 00000H @@RLINIT rtc 04F3EH 00000H
@@RLINIT vreg_ctr 04F0EH 00000H @@RLINIT vreg_ctr 04F3EH 00000H
@@RLINIT vreg_twl 04F0EH 00000H @@RLINIT vreg_twl 04F3EH 00000H
@@RLINIT adc 04F0EH 00000H @@RLINIT adc 04F3EH 00000H
@@RLINIT renge 04F0EH 00000H @@RLINIT renge 04F3EH 00000H
@@RLINIT accero 04F0EH 00000H @@RLINIT accero 04F3EH 00000H
@@RLINIT self_flash @@RLINIT self_flash
04F0EH 00000H 04F3EH 00000H
@@RLINIT sw 04F0EH 00000H @@RLINIT sw 04F3EH 00000H
@@RLINIT task_debug @@RLINIT task_debug
04F0EH 00000H 04F3EH 00000H
@@RLINIT task_misc @@RLINIT task_misc
04F0EH 00000H 04F3EH 00000H
@@RLINIT task_sys 04F0EH 00000H @@RLINIT task_sys 04F3EH 00000H
@@RLINIT pedo_alg_thre_det2 @@RLINIT pedo_alg_thre_det2
04F0EH 00000H 04F3EH 00000H
@@RLINIT ini_VECT 04F0EH 00000H @@RLINIT ini_VECT 04F3EH 00000H
@@RLINIT task_status @@RLINIT task_status
04F0EH 00000H 04F3EH 00000H
@@RLINIT led_cam 04F0EH 00000H @@RLINIT led_cam 04F3EH 00000H
@@RLINIT led_pow 04F0EH 00000H @@RLINIT led_pow 04F3EH 00000H
@@RLINIT @rom 04F0EH 00000H @@RLINIT @rom 04F3EH 00000H
@@CODEL 04F0EH 00000H CSEG @@CODEL 04F3EH 00000H CSEG
@@CODEL pm 04F0EH 00000H @@CODEL pm 04F3EH 00000H
@@CODEL i2c_ctr 04F0EH 00000H @@CODEL i2c_ctr 04F3EH 00000H
@@CODEL magic 04F0EH 00000H @@CODEL magic 04F3EH 00000H
@@CODEL i2c_twl 04F0EH 00000H @@CODEL i2c_twl 04F3EH 00000H
@@CODEL led 04F0EH 00000H @@CODEL led 04F3EH 00000H
@@CODEL rtc 04F0EH 00000H @@CODEL rtc 04F3EH 00000H
@@CODEL vreg_ctr 04F0EH 00000H @@CODEL vreg_ctr 04F3EH 00000H
@@CODEL vreg_twl 04F0EH 00000H @@CODEL vreg_twl 04F3EH 00000H
@@CODEL adc 04F0EH 00000H @@CODEL adc 04F3EH 00000H
@@CODEL renge 04F0EH 00000H @@CODEL renge 04F3EH 00000H
@@CODEL accero 04F0EH 00000H @@CODEL accero 04F3EH 00000H
@@CODEL sw 04F0EH 00000H @@CODEL sw 04F3EH 00000H
@@CODEL task_misc @@CODEL task_misc
04F0EH 00000H 04F3EH 00000H
@@CODEL task_sys 04F0EH 00000H @@CODEL task_sys 04F3EH 00000H
@@CODEL pedo_alg_thre_det2 @@CODEL pedo_alg_thre_det2
04F0EH 00000H 04F3EH 00000H
@@CODEL ini_VECT 04F0EH 00000H @@CODEL ini_VECT 04F3EH 00000H
@@CODEL led_cam 04F0EH 00000H @@CODEL led_cam 04F3EH 00000H
@@CODEL led_pow 04F0EH 00000H @@CODEL led_pow 04F3EH 00000H
@@LCODEL 04F0EH 00008H CSEG @@LCODEL 04F3EH 00008H CSEG
@@LCODEL abs 04F0EH 00008H @@LCODEL abs 04F3EH 00008H
* gap * 04F16H 000E0H * gap * 04F46H 000B0H
MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL 04FF6H 0000AH CSEG AT
MGC_TAIL magic 04FF6H 0000AH MGC_TAIL magic 04FF6H 0000AH

4
trunk/config.h
View File

@ -13,6 +13,8 @@
//#define _FORCE_TAIKENDAI_ //#define _FORCE_TAIKENDAI_
//#define _FORCE_TAIKENDAI_NBD_ //#define _FORCE_TAIKENDAI_NBD_
//#define _TAIKENDAI_SEISAN_SPECIAL_ //#define _TAIKENDAI_SEISAN_SPECIAL_
//#define _RVD_
// 生産中に体験台向け使用が発症すると、アダプタがないと電源が入らずに検査に支障があるので一時ファーム // 生産中に体験台向け使用が発症すると、アダプタがないと電源が入らずに検査に支障があるので一時ファーム
// #define _TAIKENDAI_ // #define _TAIKENDAI_
@ -20,7 +22,7 @@
#define MCU_VER_MAJOR 0x01 #define MCU_VER_MAJOR 0x01
#define MCU_VER_MINOR 0x36 #define MCU_VER_MINOR 0x37
// ↑改訂の時は↓気をつけないと体験台の生産できないからね！ // ↑改訂の時は↓気をつけないと体験台の生産できないからね！
#ifdef _TAIKENDAI_SEISAN_SPECIAL_ #ifdef _TAIKENDAI_SEISAN_SPECIAL_

BIN
trunk/hoge.bin
View File

Binary file not shown.

2
trunk/led.c
View File

@ -341,7 +341,7 @@ void tsk_led_notify( )
} }
} }
led_fade_to2( LED_duty_notify_blu, &LED_dim_status_info_B );
led_fade_to2( LED_duty_notify_red, &LED_dim_status_info_R ); led_fade_to2( LED_duty_notify_red, &LED_dim_status_info_R );
led_fade_to2( LED_duty_notify_grn, &LED_dim_status_info_G ); led_fade_to2( LED_duty_notify_grn, &LED_dim_status_info_G );
led_fade_to2( LED_duty_notify_blu, &LED_dim_status_info_B );
} }

16
trunk/loader.c
View File

@ -171,30 +171,30 @@ void chk_platform_type()
// ●CTR＆その開発機材 // // ●CTR＆その開発機材 //
// 一応初期化 // 一応初期化
system_status.is_dev = 0; system_status.is_dev = false;
system_status.taikendai = 0; system_status.taikendai = false;
system_status.taikendai_nbd = 0; system_status.taikendai_nbd = false;
switch( DIPSW ) switch( DIPSW )
{ {
case DIPSW_TAIKENDAI: case DIPSW_TAIKENDAI:
system_status.taikendai = 1; system_status.taikendai = true;
break; break;
case DIPSW_TAIKENDAI_NBD: case DIPSW_TAIKENDAI_NBD:
system_status.taikendai_nbd = 1; system_status.taikendai_nbd = true;
break; break;
case DIPSW_ISDEV: case DIPSW_ISDEV:
system_status.is_dev = 1; system_status.is_dev = true;
break; break;
} }
#ifdef _FORCE_TAIKENDAI_ #ifdef _FORCE_TAIKENDAI_
system_status.taikendai = 1; system_status.taikendai = true;
#endif #endif
#ifdef _FORCE_TAIKENDAI_NBD_ #ifdef _FORCE_TAIKENDAI_NBD_
system_status.taikendai_nbd = 1; system_status.taikendai_nbd = true;
#endif #endif
} }

21
trunk/pm.c
View File

@ -1132,7 +1132,6 @@ __interrupt void intp6_PM_irq( )
} }
#define _type1_
/* ======================================================== /* ========================================================
PMICからの割り込みを受けて、NTR PMIC互換レジスタからリード PMICからの割り込みを受けて、NTR PMIC互換レジスタからリード
======================================================== */ ======================================================== */
@ -1155,19 +1154,11 @@ task_status_immed tski_ntr_pmic_comm( )
{ {
if( ( reg_shadow & REG_BIT_TWL_REQ_BL_U ) == 0 ) // 消えた if( ( reg_shadow & REG_BIT_TWL_REQ_BL_U ) == 0 ) // 消えた
{ {
#ifdef _type1_
irq_work = REG_BIT_TWL_BL_U_OFF; irq_work = REG_BIT_TWL_BL_U_OFF;
#else
set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_U_OFF );
#endif
} }
else else
{ {
#ifdef _type1_
irq_work = REG_BIT_TWL_BL_U_ON; irq_work = REG_BIT_TWL_BL_U_ON;
#else
set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_U_ON );
#endif
} }
} }
@ -1176,19 +1167,11 @@ task_status_immed tski_ntr_pmic_comm( )
{ {
if( ( reg_shadow & REG_BIT_TWL_REQ_BL_L ) == 0 ) // 消えた if( ( reg_shadow & REG_BIT_TWL_REQ_BL_L ) == 0 ) // 消えた
{ {
#ifdef _type1_
irq_work |= REG_BIT_TWL_BL_L_OFF; irq_work |= REG_BIT_TWL_BL_L_OFF;
#else
set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_L_OFF );
#endif
} }
else else
{ {
#ifdef _type1_
irq_work |= REG_BIT_TWL_BL_L_ON; irq_work |= REG_BIT_TWL_BL_L_ON;
#else
set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_L_ON );
#endif
} }
} }
@ -1196,7 +1179,6 @@ task_status_immed tski_ntr_pmic_comm( )
vreg_ctr[ VREG_C_STATUS_1 ] = ( vreg_ctr[ VREG_C_STATUS_1 ] & ~0x0C ) | ( reg_shadow & 0x0C ); // TWLバックライト情報のミラー vreg_ctr[ VREG_C_STATUS_1 ] = ( vreg_ctr[ VREG_C_STATUS_1 ] & ~0x0C ) | ( reg_shadow & 0x0C ); // TWLバックライト情報のミラー
#ifdef _type1_
irq_work &= ~vreg_ctr[ VREG_C_IRQ_MASK2 ]; irq_work &= ~vreg_ctr[ VREG_C_IRQ_MASK2 ];
// set_irq 相当品 // set_irq 相当品
if( irq_work != 0 ) if( irq_work != 0 )
@ -1209,7 +1191,6 @@ task_status_immed tski_ntr_pmic_comm( )
while( !IRQ0 && ( ++tot != 0 ) ){;} // O.Dなのでちゃんとあがるのを待つ ＆ IRQ_mcu がLに縛られてると困る(基板不良) while( !IRQ0 && ( ++tot != 0 ) ){;} // O.Dなのでちゃんとあがるのを待つ ＆ IRQ_mcu がLに縛られてると困る(基板不良)
IRQ0_ast; IRQ0_ast;
} }
#endif
#if 0 #if 0
// バックライト設定 // バックライト設定
@ -1297,6 +1278,6 @@ void codec_reg_init()
iic_mcu_write_a_byte_codec( CODEC_REG_BT, (u8)ntr_pm_bt_low_old ); // SoC から書けず iic_mcu_write_a_byte_codec( CODEC_REG_BT, (u8)ntr_pm_bt_low_old ); // SoC から書けず
vol_reset(); vol_reset();
// renge_task_immed_add( tski_vol_update ); // renge_task_immed_add( tski_vol_update ); ポーリングするので。
vol_polling = 3; vol_polling = 3;
} }

2
trunk/reboot.c
View File

@ -15,7 +15,7 @@ void my_reboot(){
#asm #asm
MOV PSW,#06H ; ダミーのPSWをセット MOV PSW,#06H ; ダミーのPSWをセット
MOVW AX,#000d0h ; リセットのベクタ値を取り込んでいます。 MOVW AX,#000d0h ; リセットのベクタ値を取り込んでいます。
PUSH PSW PUSH PSW
PUSH AX ; これでRETIのためのスタックを準備 PUSH AX ; これでRETIのためのスタックを準備
RETI ; これでリセット・ベクタに分岐 RETI ; これでリセット・ベクタに分岐

79
trunk/sw.c
View File

@ -107,57 +107,56 @@ void tsk_sw( )
case ( SLEEP ): case ( SLEEP ):
case ( OFF ): case ( OFF ):
case ( ON_CHECK ): case ( ON_CHECK ):
#ifndef _TAIKENDAI_ // 実機の場合
// 電源スイッチの監視 // if( ! system_status.taikendai )
if( SW_pow_count == ( TIME_PWSW_CLICK ) ) // クリック時間に到達
{ {
set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK );
} // 電源スイッチの監視 //
else if( SW_pow_count == ( HOLD_THREASHOLD ) ) // 長押しに到達 if( SW_pow_count == ( TIME_PWSW_CLICK ) ) // クリック時間に到達
{
set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_HOLD );
if( off_timeout_timer == 0 ) // 強制電源断カウントダウン開始、何度も発動しないように。
{ {
off_timeout_timer = vreg_ctr[ VREG_C_OFF_DELAY ] * 16; set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK );
}
else if( SW_pow_count == ( HOLD_THREASHOLD ) ) // 長押しに到達
{
set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_HOLD );
if( off_timeout_timer == 0 ) // 強制電源断カウントダウン開始、何度も発動しないように。
{
off_timeout_timer = vreg_ctr[ VREG_C_OFF_DELAY ] * 16;
}
} }
}
if( off_timeout_timer != 0 ) // 長押し割り込み後、タイムアウトで強制オフ。 if( off_timeout_timer != 0 ) // 長押し割り込み後、タイムアウトで強制オフ。
{ {
off_timeout_timer -= 1; off_timeout_timer -= 1;
if( off_timeout_timer == 1 ) if( off_timeout_timer == 1 )
{
system_status.force_off = true;
}
}
}else{
// 電源スイッチの監視 //
if( SW_pow_count == ( TIME_PWSW_CLICK ) )
{
if( sw_pwsw_mukan_time == 0 )
{
set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK );
// いやなタイミングでPWSWを押すとHOMEメニューに入れてしまうのを回避するためのマスクタイマー
sw_pwsw_mukan_time = TIME_MUKAN_PWSW;
}
}
else if( SW_pow_count == ( HOLD_THREASHOLD ) )
{ {
system_status.force_off = true; system_status.force_off = true;
} }
}
if( sw_pwsw_mukan_time != 0 )
{
count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); // ボタン押し時間のカウント
}
#else // 試遊台の場合 //
// 電源スイッチの監視 //
if( SW_pow_count == ( TIME_PWSW_CLICK ) )
{
if( sw_pwsw_mukan_time == 0 )
{ {
set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); sw_pwsw_mukan_time--;
// いやなタイミングでPWSWを押すとHOMEメニューに入れてしまうのを回避するためのマスクタイマー
sw_pwsw_mukan_time = TIME_MUKAN_PWSW;
} }
} }
else if( SW_pow_count == ( HOLD_THREASHOLD ) )
{
system_status.force_off = true;
}
if( sw_pwsw_mukan_time != 0 )
{
sw_pwsw_mukan_time--;
}
count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); // ボタン押し時間のカウント count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); // ボタン押し時間のカウント
#endif
// HOME スイッチ // // HOME スイッチ //
switch( system_status.model ) switch( system_status.model )
@ -177,7 +176,7 @@ void tsk_sw( )
chk_clicked( SW_HOME_n, SW_home_count, REG_BIT_SW_HOME_CLICK ); chk_clicked( SW_HOME_n, SW_home_count, REG_BIT_SW_HOME_CLICK );
chk_clicked( !SW_HOME_n, SW_home_count_rel, REG_BIT_SW_HOME_RELEASE ); chk_clicked( !SW_HOME_n, SW_home_count_rel, REG_BIT_SW_HOME_RELEASE );
// wifi sw // // wifi sw //
/// 最悪な実装なのはわかっているが、メモリ不足と、市場に出てしまった不良スイッチを救うため /// 最悪な実装なのはわかっているが、メモリ不足と、市場に出てしまった不良スイッチを救うため
if( sw_wifi_mukan_time != 0 ) if( sw_wifi_mukan_time != 0 )
{ {

8
trunk/task_misc.c
View File

@ -96,10 +96,12 @@ void tsk_misc( )
set_irq( VREG_C_IRQ2, REG_BIT_TWL_VER_READ ); set_irq( VREG_C_IRQ2, REG_BIT_TWL_VER_READ );
} }
check_twl_vol_irq(); // TWL の音量変化割り込みチェック // TWL の音量変化割り込みチェック //
check_twl_vol_irq();
} }
update_LED_3D(); // 3D ランプ更新 // 3D ランプ更新 //
update_LED_3D();
} }
@ -225,7 +227,7 @@ task_status_immed tski_do_command0( )
PM_reset_neg(); PM_reset_neg();
RESET2_neg; RESET2_neg;
// CODEC 不定レジスタ初期化 // CODEC 不定レジスタ初期化 //
codec_reg_init(); codec_reg_init();
} }
} }

9
trunk/task_status.c
View File

@ -57,9 +57,10 @@ void tsk_status( )
{ {
if( diff & REG_BIT_BATT_CHARGE ) if( diff & REG_BIT_BATT_CHARGE )
{ {
BT_CHG_STAT_Change = true; BT_CHG_STAT_Change = true;
// 充電状態に以下略
if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BATT_CHARGE ) // 充電状態に以下略
if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BATT_CHARGE )
{ {
set_irq( VREG_C_IRQ1, REG_BIT_BT_CHG_START ); set_irq( VREG_C_IRQ1, REG_BIT_BT_CHG_START );
} }
@ -67,7 +68,7 @@ void tsk_status( )
{ {
set_irq( VREG_C_IRQ1, REG_BIT_BT_CHG_STOP ); set_irq( VREG_C_IRQ1, REG_BIT_BT_CHG_STOP );
} }
} }
} }
if(( system_status.pwr_state == ON ) || if(( system_status.pwr_state == ON ) ||

6
trunk/task_sys.c
View File

@ -504,20 +504,18 @@ static void chk_emergencyExit(){
else if( shirobako_power_control_count == 200 ) // * (sys_tick)[ms] else if( shirobako_power_control_count == 200 ) // * (sys_tick)[ms]
// デバッガが何かしたいらしい // デバッガが何かしたいらしい
{ {
// #ifdef _RVD_ #ifndef _RVD_
// 白箱は電源を切りたいらしい // 白箱は電源を切りたいらしい
system_status.pwr_state = OFF_TRIG; system_status.pwr_state = OFF_TRIG;
renge_task_interval_run_force = true; renge_task_interval_run_force = true;
shirobako_power_control_count = WAIT_SHIROBAKO_POW_CONTROL; shirobako_power_control_count = WAIT_SHIROBAKO_POW_CONTROL;
// #endif #endif
} }
else else
{ {
if( !RESET1_n ) if( !RESET1_n )
{ {
// #ifdef _RVD_
if( shirobako_power_control_count != 255 ) if( shirobako_power_control_count != 255 )
// #endif
shirobako_power_control_count += 1; shirobako_power_control_count += 1;
} }
else else

2
trunk/vreg_ctr.c
View File

@ -308,7 +308,7 @@ void vreg_ctr_write( u8 adrs, u8 data )
switch ( data ) switch ( data )
{ {
case ( 'r' ): case ( 'r' ):
// 割り込みルーチンからFSLライブラリを呼ぶのは禁止のため // 割り込みルーチンからFSLライブラリを呼ぶのは禁止
// マイコンを再起動。　レジスタ類も初期化される。 // マイコンを再起動。　レジスタ類も初期化される。
renge_task_immed_add( tski_mcu_reset ); renge_task_immed_add( tski_mcu_reset );
break; break;

1152
trunk/yav_mcu_bsr.prj
View File

File diff suppressed because it is too large Load Diff

8
trunk/yav_mcu_bsr.prk
View File

@ -1,7 +1,7 @@
[ProjectManager] [ProjectManager]
FrameMax=1 FrameMax=1
FrameX=75 FrameX=100
FrameY=75 FrameY=100
FrameCX=1440 FrameCX=1440
FrameCY=850 FrameCY=850
OpenFile1=batt_params.h,0,596,19,1842,741,0,19,0,0 OpenFile1=batt_params.h,0,596,19,1842,741,0,19,0,0
@ -11,7 +11,9 @@ PrjPos=0,0,706,0,291
OpenFile4=led_cam.c,0,125,125,1320,606,0,24,0,0 OpenFile4=led_cam.c,0,125,125,1320,606,0,24,0,0
OpenFile5=led_pow.c,0,150,150,1345,631,0,205,0,0 OpenFile5=led_pow.c,0,150,150,1345,631,0,205,0,0
OpenFile6=config.h,0,442,428,1557,1029,29,23,29,0 OpenFile6=config.h,0,442,428,1557,1029,29,23,29,0
OpenFile7=OutputWindow OpenFile7=i2c_mcu.c,0,175,175,1766,882,0,303,0,0
OpenFile8=i2c_mcu.h,0,200,200,1791,907,46,23,48,0
OpenFile9=OutputWindow
OutputPos=0,34,740,376,1323 OutputPos=0,34,740,376,1323
ActivePRJ=yav_mcu_bsr.prj ActivePRJ=yav_mcu_bsr.prj
[ProjectWindow] [ProjectWindow]