typo修正

iic_mcu_read_a_byte() 失敗時、返値が不定だったのを 0xff に固定
市部も関数名・マクロ名を、体を表すよう変更(_snake向けからの輸入)

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@597 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
n2232 2014-01-07 01:22:23 +00:00
parent f3f8063b90
commit 7e58fd13c4
16 changed files with 1286 additions and 1258 deletions

Binary file not shown.

Binary file not shown.

View File

@ -69,7 +69,7 @@ const bt_param_ bt_param[ /*_BT_PARAM_NUM_*/ ] = //
{
{
0x9C, 0xF0, 0xAD, 0x50, 0xAF, 0xB0, 0xB3, 0x00,
0xB3, 0xE0, 0XB5, 0x60, 0XB6, 0x70, 0xB7, 0xA0,
0xB3, 0xE0, 0xB5, 0x60, 0xB6, 0x70, 0xB7, 0xA0,
0xBA, 0x00, 0xBC, 0x00, 0xBE, 0x90, 0xC1, 0x60,
0xC4, 0x00, 0xC7, 0x00, 0xCC, 0xA0, 0xD0, 0xA0,
0x02, 0x00, 0x19, 0x10, 0x12, 0x00, 0x48, 0x10,

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -1,7 +1,7 @@
78K0R Linker W1.33 Date:27 Feb 2013 Page: 1
78K0R Linker W1.33 Date: 7 Jan 2014 Page: 1
Command: -yC:\Program Files (x86)\NEC Electronics Tools\DEV -_msgoff -
obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C
@ -26,8 +26,8 @@ Direc-file:bsr_mcu.dr
*** Link information ***
73 output segment(s)
3E28H byte(s) real data
6406 symbol(s) defined
3EBFH byte(s) real data
6539 symbol(s) defined
*** Memory map ***
@ -155,56 +155,56 @@ Direc-file:bsr_mcu.dr
LDR_CODL util_funcs
000C4H 00000H
?CSEGSI 000C4H 0000AH CSEG
LDR_CODE 000CEH 00975H CSEG
LDR_CODE loader 000CEH 0019AH
LDR_CODE WDT 00268H 00000H
LDR_CODE i2c_mcu 00268H 0029BH
LDR_CODE i2c_twl 00503H 0005BH
LDR_CODE 000CEH 0096EH CSEG
LDR_CODE loader 000CEH 0018CH
LDR_CODE WDT 0025AH 00000H
LDR_CODE i2c_mcu 0025AH 002A2H
LDR_CODE i2c_twl 004FCH 0005BH
LDR_CODE self_flash
0055EH 00370H
00557H 00370H
LDR_CODE task_debug
008CEH 00000H
008C7H 00000H
LDR_CODE task_status
008CEH 00075H
LDR_CODE hal 00943H 000DCH
008C7H 00075H
LDR_CODE hal 0093CH 000DCH
LDR_CODE util_funcs
00A1FH 00024H
FSL_CODE 00A43H 00322H CSEG
00A18H 00024H
FSL_CODE 00A3CH 00322H CSEG
FSL_CODE fsl_block_cmd
00A43H 0002BH
00A3CH 0002BH
FSL_CODE fsl_block_check
00A6EH 00013H
00A67H 00013H
FSL_CODE fsl_common
00A81H 0014FH
00A7AH 0014FH
FSL_CODE fsl_reset
00BD0H 00001H
00BC9H 00001H
FSL_CODE fsl_si_ibf
00BD1H 00064H
00BCAH 00064H
FSL_CODE fsl_phySwap
00C35H 0004DH
00C2EH 0004DH
FSL_CODE fsl_si_common
00C82H 00061H
FSL_CODE fsl_swap 00CE3H 00030H
00C7BH 00061H
FSL_CODE fsl_swap 00CDCH 00030H
FSL_CODE fsl_write
00D13H 00052H
@@LCODE 00D65H 00277H CSEG
@@LCODE @cstart 00D65H 0006DH
@@LCODE @imul 00DD2H 00011H
@@LCODE @lumul 00DE3H 0002BH
@@LCODE @isdiv 00E0EH 00022H
@@LCODE @iudiv 00E30H 0002DH
@@LCODE @isrem 00E5DH 00021H
@@LCODE @iurem 00E7EH 0002FH
@@LCODE @lsdiv 00EADH 00039H
@@LCODE @ludiv 00EE6H 0003FH
@@LCODE @divuw 00F25H 00034H
@@LCODE @ladd 00F59H 0000FH
@@LCODE @llsh 00F68H 0001BH
@@LCODE @lursh 00F83H 0001FH
@@LCODE @iscmp 00FA2H 0000CH
@@LCODE @lband 00FAEH 00014H
@@LCODE @bcdtob 00FC2H 0001AH
* gap * 00FDCH 0001AH
00D0CH 00052H
@@LCODE 00D5EH 00277H CSEG
@@LCODE @cstart 00D5EH 0006DH
@@LCODE @imul 00DCBH 00011H
@@LCODE @lumul 00DDCH 0002BH
@@LCODE @isdiv 00E07H 00022H
@@LCODE @iudiv 00E29H 0002DH
@@LCODE @isrem 00E56H 00021H
@@LCODE @iurem 00E77H 0002FH
@@LCODE @lsdiv 00EA6H 00039H
@@LCODE @ludiv 00EDFH 0003FH
@@LCODE @divuw 00F1EH 00034H
@@LCODE @ladd 00F52H 0000FH
@@LCODE @llsh 00F61H 0001BH
@@LCODE @lursh 00F7CH 0001FH
@@LCODE @iscmp 00F9BH 0000CH
@@LCODE @lband 00FA7H 00014H
@@LCODE @bcdtob 00FBBH 0001AH
* gap * 00FD5H 00021H
MGC_LOAD 00FF6H 0000AH CSEG AT
MGC_LOAD magic 00FF6H 0000AH
@ -258,298 +258,298 @@ Direc-file:bsr_mcu.dr
0228CH 00000H
@@CNST i2c_mcu-sub
0228CH 00000H
ROM_CODE 0228CH 025B0H CSEG
ROM_CODE pm 0228CH 00A10H
ROM_CODE i2c_ctr 02C9CH 0005CH
ROM_CODE main 02CF8H 00055H
ROM_CODE led 02D4DH 00274H
ROM_CODE rtc 02FC1H 000E0H
ROM_CODE vreg_ctr 030A1H 00493H
ROM_CODE vreg_twl 03534H 000F9H
ROM_CODE adc 0362DH 00261H
ROM_CODE renge 0388EH 00018H
ROM_CODE accero 038A6H 00155H
ROM_CODE sw 039FBH 00131H
ROM_CODE 0228CH 0264EH CSEG
ROM_CODE pm 0228CH 009F4H
ROM_CODE i2c_ctr 02C80H 0005CH
ROM_CODE main 02CDCH 00055H
ROM_CODE led 02D31H 00284H
ROM_CODE rtc 02FB5H 000E0H
ROM_CODE vreg_ctr 03095H 0049EH
ROM_CODE vreg_twl 03533H 000F9H
ROM_CODE adc 0362CH 00261H
ROM_CODE renge 0388DH 00018H
ROM_CODE accero 038A5H 00155H
ROM_CODE sw 039FAH 0013CH
ROM_CODE task_misc
03B2CH 001C1H
ROM_CODE task_sys 03CEDH 00380H
03B36H 001C1H
ROM_CODE task_sys 03CF7H 00414H
ROM_CODE pedo_alg_thre_det2
0406DH 004D4H
ROM_CODE led_cam 04541H 000C4H
ROM_CODE led_pow 04605H 0016FH
ROM_CODE voltable 04774H 00000H
0410BH 004D4H
ROM_CODE led_cam 045DFH 000C4H
ROM_CODE led_pow 046A3H 0016FH
ROM_CODE voltable 04812H 00000H
ROM_CODE pedo_lpf_coeff
04774H 00000H
04812H 00000H
ROM_CODE kanaria_c
04774H 00006H
ROM_CODE get_ei 0477AH 0000DH
04812H 00006H
ROM_CODE get_ei 04818H 0000DH
ROM_CODE i2c_mcu-sub
04787H 000B5H
@@BASE 0483CH 00614H CSEG BASE
@@BASE loader 0483CH 00000H
@@BASE pm 0483CH 0003EH
@@BASE i2c_ctr 0487AH 00170H
@@BASE main 049EAH 00000H
@@BASE magic 049EAH 00000H
@@BASE WDT 049EAH 00000H
@@BASE i2c_mcu 049EAH 000F2H
@@BASE i2c_twl 04ADCH 000D0H
@@BASE led 04BACH 00000H
@@BASE rtc 04BACH 0005DH
@@BASE vreg_ctr 04C09H 00000H
@@BASE vreg_twl 04C09H 00000H
@@BASE adc 04C09H 00094H
@@BASE renge 04C9DH 0016BH
@@BASE accero 04E08H 00042H
04825H 000B5H
@@BASE 048DAH 00614H CSEG BASE
@@BASE loader 048DAH 00000H
@@BASE pm 048DAH 0003EH
@@BASE i2c_ctr 04918H 00170H
@@BASE main 04A88H 00000H
@@BASE magic 04A88H 00000H
@@BASE WDT 04A88H 00000H
@@BASE i2c_mcu 04A88H 000F2H
@@BASE i2c_twl 04B7AH 000D0H
@@BASE led 04C4AH 00000H
@@BASE rtc 04C4AH 0005DH
@@BASE vreg_ctr 04CA7H 00000H
@@BASE vreg_twl 04CA7H 00000H
@@BASE adc 04CA7H 00094H
@@BASE renge 04D3BH 0016BH
@@BASE accero 04EA6H 00042H
@@BASE self_flash
04E4AH 00000H
@@BASE sw 04E4AH 00000H
04EE8H 00000H
@@BASE sw 04EE8H 00000H
@@BASE task_debug
04E4AH 00000H
04EE8H 00000H
@@BASE task_misc
04E4AH 00000H
@@BASE task_sys 04E4AH 00000H
04EE8H 00000H
@@BASE task_sys 04EE8H 00000H
@@BASE pedo_alg_thre_det2
04E4AH 00000H
@@BASE ini_VECT 04E4AH 00006H
04EE8H 00000H
@@BASE ini_VECT 04EE8H 00006H
@@BASE task_status
04E50H 00000H
@@BASE led_cam 04E50H 00000H
@@BASE led_pow 04E50H 00000H
@@BASE hal 04E50H 00000H
04EEEH 00000H
@@BASE led_cam 04EEEH 00000H
@@BASE led_pow 04EEEH 00000H
@@BASE hal 04EEEH 00000H
@@BASE batt_params
04E50H 00000H
@@BASE voltable 04E50H 00000H
04EEEH 00000H
@@BASE voltable 04EEEH 00000H
@@BASE pedo_lpf_coeff
04E50H 00000H
04EEEH 00000H
@@BASE kanaria_c
04E50H 00000H
04EEEH 00000H
@@BASE util_funcs
04E50H 00000H
04EEEH 00000H
@@BASE i2c_mcu-sub
04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL @cstart 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL pm 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL main 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL led 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL rtc 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL adc 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL renge 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL accero 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL sw 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL @cstart 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL pm 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL main 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL led 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL rtc 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL adc 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL renge 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL accero 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL sw 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL task_misc
04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL task_sys 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL task_sys 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL pedo_alg_thre_det2
04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL led_cam 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL led_pow 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL led_cam 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL led_pow 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL batt_params
04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
@@CNSTL voltable 04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL voltable 04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL pedo_lpf_coeff
04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL kanaria_c
04E50H 00000H
@@CNSTL 04E50H 00000H CSEG PAGE64KP
04EEEH 00000H
@@CNSTL 04EEEH 00000H CSEG PAGE64KP
@@CNSTL i2c_mcu-sub
04E50H 00000H
@@CNSTL 04E50H 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04E50H 0000AH
@@R_INIT 04E5AH 0004AH CSEG UNIT64KP
@@R_INIT @cstart 04E5AH 00000H
@@R_INIT loader 04E5AH 00000H
@@R_INIT pm 04E5AH 00000H
@@R_INIT i2c_ctr 04E5AH 00000H
@@R_INIT main 04E5AH 00000H
@@R_INIT magic 04E5AH 00000H
@@R_INIT WDT 04E5AH 00000H
@@R_INIT i2c_mcu 04E5AH 00000H
@@R_INIT i2c_twl 04E5AH 00000H
@@R_INIT led 04E5AH 00000H
@@R_INIT rtc 04E5AH 00000H
@@R_INIT vreg_ctr 04E5AH 00000H
@@R_INIT vreg_twl 04E5AH 00000H
@@R_INIT adc 04E5AH 0000CH
@@R_INIT renge 04E66H 00014H
@@R_INIT accero 04E7AH 00000H
04EEEH 00000H
@@CNSTL 04EEEH 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04EEEH 0000AH
@@R_INIT 04EF8H 0004AH CSEG UNIT64KP
@@R_INIT @cstart 04EF8H 00000H
@@R_INIT loader 04EF8H 00000H
@@R_INIT pm 04EF8H 00000H
@@R_INIT i2c_ctr 04EF8H 00000H
@@R_INIT main 04EF8H 00000H
@@R_INIT magic 04EF8H 00000H
@@R_INIT WDT 04EF8H 00000H
@@R_INIT i2c_mcu 04EF8H 00000H
@@R_INIT i2c_twl 04EF8H 00000H
@@R_INIT led 04EF8H 00000H
@@R_INIT rtc 04EF8H 00000H
@@R_INIT vreg_ctr 04EF8H 00000H
@@R_INIT vreg_twl 04EF8H 00000H
@@R_INIT adc 04EF8H 0000CH
@@R_INIT renge 04F04H 00014H
@@R_INIT accero 04F18H 00000H
@@R_INIT self_flash
04E7AH 00000H
@@R_INIT sw 04E7AH 00000H
04F18H 00000H
@@R_INIT sw 04F18H 00000H
@@R_INIT task_debug
04E7AH 00000H
04F18H 00000H
@@R_INIT task_misc
04E7AH 00026H
@@R_INIT task_sys 04EA0H 00000H
04F18H 00026H
@@R_INIT task_sys 04F3EH 00000H
@@R_INIT pedo_alg_thre_det2
04EA0H 00000H
@@R_INIT ini_VECT 04EA0H 00000H
04F3EH 00000H
@@R_INIT ini_VECT 04F3EH 00000H
@@R_INIT task_status
04EA0H 00000H
@@R_INIT led_cam 04EA0H 00000H
@@R_INIT led_pow 04EA0H 00004H
@@R_INIT hal 04EA4H 00000H
04F3EH 00000H
@@R_INIT led_cam 04F3EH 00000H
@@R_INIT led_pow 04F3EH 00004H
@@R_INIT hal 04F42H 00000H
@@R_INIT batt_params
04EA4H 00000H
@@R_INIT voltable 04EA4H 00000H
04F42H 00000H
@@R_INIT voltable 04F42H 00000H
@@R_INIT pedo_lpf_coeff
04EA4H 00000H
04F42H 00000H
@@R_INIT kanaria_c
04EA4H 00000H
04F42H 00000H
@@R_INIT util_funcs
04EA4H 00000H
04F42H 00000H
@@R_INIT i2c_mcu-sub
04EA4H 00000H
@@R_INIT @rom 04EA4H 00000H
@@R_INIS 04EA4H 00010H CSEG UNIT64KP
@@R_INIS @cstart 04EA4H 00000H
@@R_INIS loader 04EA4H 00000H
@@R_INIS pm 04EA4H 00002H
@@R_INIS i2c_ctr 04EA6H 00002H
@@R_INIS main 04EA8H 00000H
@@R_INIS magic 04EA8H 00000H
@@R_INIS WDT 04EA8H 00000H
@@R_INIS i2c_mcu 04EA8H 00000H
@@R_INIS i2c_twl 04EA8H 00000H
@@R_INIS led 04EA8H 00000H
@@R_INIS rtc 04EA8H 00000H
@@R_INIS vreg_ctr 04EA8H 00000H
@@R_INIS vreg_twl 04EA8H 00000H
@@R_INIS adc 04EA8H 00000H
@@R_INIS renge 04EA8H 00000H
@@R_INIS accero 04EA8H 00000H
04F42H 00000H
@@R_INIT @rom 04F42H 00000H
@@R_INIS 04F42H 00010H CSEG UNIT64KP
@@R_INIS @cstart 04F42H 00000H
@@R_INIS loader 04F42H 00000H
@@R_INIS pm 04F42H 00002H
@@R_INIS i2c_ctr 04F44H 00002H
@@R_INIS main 04F46H 00000H
@@R_INIS magic 04F46H 00000H
@@R_INIS WDT 04F46H 00000H
@@R_INIS i2c_mcu 04F46H 00000H
@@R_INIS i2c_twl 04F46H 00000H
@@R_INIS led 04F46H 00000H
@@R_INIS rtc 04F46H 00000H
@@R_INIS vreg_ctr 04F46H 00000H
@@R_INIS vreg_twl 04F46H 00000H
@@R_INIS adc 04F46H 00000H
@@R_INIS renge 04F46H 00000H
@@R_INIS accero 04F46H 00000H
@@R_INIS self_flash
04EA8H 00000H
@@R_INIS sw 04EA8H 00000H
04F46H 00000H
@@R_INIS sw 04F46H 00000H
@@R_INIS task_debug
04EA8H 00000H
04F46H 00000H
@@R_INIS task_misc
04EA8H 00000H
@@R_INIS task_sys 04EA8H 00002H
04F46H 00000H
@@R_INIS task_sys 04F46H 00002H
@@R_INIS pedo_alg_thre_det2
04EAAH 00006H
@@R_INIS ini_VECT 04EB0H 00000H
04F48H 00006H
@@R_INIS ini_VECT 04F4EH 00000H
@@R_INIS task_status
04EB0H 00000H
@@R_INIS led_cam 04EB0H 00002H
@@R_INIS led_pow 04EB2H 00002H
@@R_INIS hal 04EB4H 00000H
04F4EH 00000H
@@R_INIS led_cam 04F4EH 00002H
@@R_INIS led_pow 04F50H 00002H
@@R_INIS hal 04F52H 00000H
@@R_INIS batt_params
04EB4H 00000H
@@R_INIS voltable 04EB4H 00000H
04F52H 00000H
@@R_INIS voltable 04F52H 00000H
@@R_INIS pedo_lpf_coeff
04EB4H 00000H
04F52H 00000H
@@R_INIS kanaria_c
04EB4H 00000H
04F52H 00000H
@@R_INIS util_funcs
04EB4H 00000H
04F52H 00000H
@@R_INIS i2c_mcu-sub
04EB4H 00000H
@@R_INIS @rom 04EB4H 00000H
@@RLINIT 04EB4H 00000H CSEG UNIT64KP
@@RLINIT loader 04EB4H 00000H
@@RLINIT pm 04EB4H 00000H
@@RLINIT i2c_ctr 04EB4H 00000H
@@RLINIT main 04EB4H 00000H
@@RLINIT magic 04EB4H 00000H
@@RLINIT WDT 04EB4H 00000H
@@RLINIT i2c_mcu 04EB4H 00000H
@@RLINIT i2c_twl 04EB4H 00000H
@@RLINIT led 04EB4H 00000H
@@RLINIT rtc 04EB4H 00000H
@@RLINIT vreg_ctr 04EB4H 00000H
@@RLINIT vreg_twl 04EB4H 00000H
@@RLINIT adc 04EB4H 00000H
@@RLINIT renge 04EB4H 00000H
@@RLINIT accero 04EB4H 00000H
04F52H 00000H
@@R_INIS @rom 04F52H 00000H
@@RLINIT 04F52H 00000H CSEG UNIT64KP
@@RLINIT loader 04F52H 00000H
@@RLINIT pm 04F52H 00000H
@@RLINIT i2c_ctr 04F52H 00000H
@@RLINIT main 04F52H 00000H
@@RLINIT magic 04F52H 00000H
@@RLINIT WDT 04F52H 00000H
@@RLINIT i2c_mcu 04F52H 00000H
@@RLINIT i2c_twl 04F52H 00000H
@@RLINIT led 04F52H 00000H
@@RLINIT rtc 04F52H 00000H
@@RLINIT vreg_ctr 04F52H 00000H
@@RLINIT vreg_twl 04F52H 00000H
@@RLINIT adc 04F52H 00000H
@@RLINIT renge 04F52H 00000H
@@RLINIT accero 04F52H 00000H
@@RLINIT self_flash
04EB4H 00000H
@@RLINIT sw 04EB4H 00000H
04F52H 00000H
@@RLINIT sw 04F52H 00000H
@@RLINIT task_debug
04EB4H 00000H
04F52H 00000H
@@RLINIT task_misc
04EB4H 00000H
@@RLINIT task_sys 04EB4H 00000H
04F52H 00000H
@@RLINIT task_sys 04F52H 00000H
@@RLINIT pedo_alg_thre_det2
04EB4H 00000H
@@RLINIT ini_VECT 04EB4H 00000H
04F52H 00000H
@@RLINIT ini_VECT 04F52H 00000H
@@RLINIT task_status
04EB4H 00000H
@@RLINIT led_cam 04EB4H 00000H
@@RLINIT led_pow 04EB4H 00000H
@@RLINIT hal 04EB4H 00000H
04F52H 00000H
@@RLINIT led_cam 04F52H 00000H
@@RLINIT led_pow 04F52H 00000H
@@RLINIT hal 04F52H 00000H
@@RLINIT batt_params
04EB4H 00000H
@@RLINIT voltable 04EB4H 00000H
04F52H 00000H
@@RLINIT voltable 04F52H 00000H
@@RLINIT pedo_lpf_coeff
04EB4H 00000H
04F52H 00000H
@@RLINIT kanaria_c
04EB4H 00000H
04F52H 00000H
@@RLINIT util_funcs
04EB4H 00000H
04F52H 00000H
@@RLINIT i2c_mcu-sub
04EB4H 00000H
@@RLINIT @rom 04EB4H 00000H
@@CODEL 04EB4H 00000H CSEG
@@CODEL pm 04EB4H 00000H
@@CODEL i2c_ctr 04EB4H 00000H
@@CODEL main 04EB4H 00000H
@@CODEL magic 04EB4H 00000H
@@CODEL led 04EB4H 00000H
@@CODEL rtc 04EB4H 00000H
@@CODEL vreg_ctr 04EB4H 00000H
@@CODEL vreg_twl 04EB4H 00000H
@@CODEL adc 04EB4H 00000H
@@CODEL renge 04EB4H 00000H
@@CODEL accero 04EB4H 00000H
@@CODEL sw 04EB4H 00000H
04F52H 00000H
@@RLINIT @rom 04F52H 00000H
@@CODEL 04F52H 00000H CSEG
@@CODEL pm 04F52H 00000H
@@CODEL i2c_ctr 04F52H 00000H
@@CODEL main 04F52H 00000H
@@CODEL magic 04F52H 00000H
@@CODEL led 04F52H 00000H
@@CODEL rtc 04F52H 00000H
@@CODEL vreg_ctr 04F52H 00000H
@@CODEL vreg_twl 04F52H 00000H
@@CODEL adc 04F52H 00000H
@@CODEL renge 04F52H 00000H
@@CODEL accero 04F52H 00000H
@@CODEL sw 04F52H 00000H
@@CODEL task_misc
04EB4H 00000H
@@CODEL task_sys 04EB4H 00000H
04F52H 00000H
@@CODEL task_sys 04F52H 00000H
@@CODEL pedo_alg_thre_det2
04EB4H 00000H
@@CODEL ini_VECT 04EB4H 00000H
@@CODEL led_cam 04EB4H 00000H
@@CODEL led_pow 04EB4H 00000H
04F52H 00000H
@@CODEL ini_VECT 04F52H 00000H
@@CODEL led_cam 04F52H 00000H
@@CODEL led_pow 04F52H 00000H
@@CODEL batt_params
04EB4H 00000H
@@CODEL voltable 04EB4H 00000H
04F52H 00000H
@@CODEL voltable 04F52H 00000H
@@CODEL pedo_lpf_coeff
04EB4H 00000H
04F52H 00000H
@@CODEL kanaria_c
04EB4H 00000H
04F52H 00000H
@@CODEL i2c_mcu-sub
04EB4H 00000H
@@LCODEL 04EB4H 00022H CSEG
@@LCODEL abs 04EB4H 00008H
@@LCODEL memcpy_n 04EBCH 0001AH
* gap * 04ED6H 0011EH
04F52H 00000H
@@LCODEL 04F52H 00022H CSEG
@@LCODEL abs 04F52H 00008H
@@LCODEL memcpy_n 04F5AH 0001AH
* gap * 04F74H 00080H
MGC_VER 04FF4H 00002H CSEG AT
MGC_VER magic 04FF4H 00002H
MGC_TAIL 04FF6H 0000AH CSEG AT
@ -795,7 +795,7 @@ Direc-file:bsr_mcu.dr
@@INIS i2c_mcu-sub
FFE30H 00000H
@@INIS @rom FFE30H 00000H
@@DATS FFE30H 00066H DSEG SADDRP
@@DATS FFE30H 0006AH DSEG SADDRP
@@DATS @cstart FFE30H 00000H
@@DATS loader FFE30H 00000H
@@DATS pm FFE30H 0001AH
@ -819,72 +819,72 @@ Direc-file:bsr_mcu.dr
FFE7AH 00000H
@@DATS task_misc
FFE7AH 00004H
@@DATS task_sys FFE7EH 00002H
@@DATS task_sys FFE7EH 00006H
@@DATS pedo_alg_thre_det2
FFE80H 0000EH
@@DATS ini_VECT FFE8EH 00000H
FFE84H 0000EH
@@DATS ini_VECT FFE92H 00000H
@@DATS task_status
FFE8EH 00002H
@@DATS led_cam FFE90H 00002H
@@DATS led_pow FFE92H 00004H
@@DATS hal FFE96H 00000H
FFE92H 00002H
@@DATS led_cam FFE94H 00002H
@@DATS led_pow FFE96H 00004H
@@DATS hal FFE9AH 00000H
@@DATS batt_params
FFE96H 00000H
@@DATS voltable FFE96H 00000H
FFE9AH 00000H
@@DATS voltable FFE9AH 00000H
@@DATS pedo_lpf_coeff
FFE96H 00000H
FFE9AH 00000H
@@DATS kanaria_c
FFE96H 00000H
FFE9AH 00000H
@@DATS util_funcs
FFE96H 00000H
FFE9AH 00000H
@@DATS i2c_mcu-sub
FFE96H 00000H
@@DATS @rom FFE96H 00000H
@@BITS FFE96H 00006H BSEG
@@BITS @cstart FFE96H.0 00000H.0
@@BITS loader FFE96H.0 00000H.0
@@BITS pm FFE96H.0 00001H.1
@@BITS i2c_ctr FFE97H.1 00000H.0
@@BITS main FFE97H.1 00000H.1
@@BITS magic FFE97H.2 00000H.0
@@BITS WDT FFE97H.2 00000H.0
@@BITS i2c_mcu FFE97H.2 00000H.4
@@BITS i2c_twl FFE97H.6 00000H.0
@@BITS led FFE97H.6 00000H.4
@@BITS rtc FFE98H.2 00000H.3
@@BITS vreg_ctr FFE98H.5 00000H.1
@@BITS vreg_twl FFE98H.6 00000H.0
@@BITS adc FFE98H.6 00000H.4
@@BITS renge FFE99H.2 00000H.2
@@BITS accero FFE99H.4 00000H.0
FFE9AH 00000H
@@DATS @rom FFE9AH 00000H
@@BITS FFE9AH 00006H BSEG
@@BITS @cstart FFE9AH.0 00000H.0
@@BITS loader FFE9AH.0 00000H.0
@@BITS pm FFE9AH.0 00001H.1
@@BITS i2c_ctr FFE9BH.1 00000H.0
@@BITS main FFE9BH.1 00000H.1
@@BITS magic FFE9BH.2 00000H.0
@@BITS WDT FFE9BH.2 00000H.0
@@BITS i2c_mcu FFE9BH.2 00000H.4
@@BITS i2c_twl FFE9BH.6 00000H.0
@@BITS led FFE9BH.6 00000H.4
@@BITS rtc FFE9CH.2 00000H.3
@@BITS vreg_ctr FFE9CH.5 00000H.1
@@BITS vreg_twl FFE9CH.6 00000H.0
@@BITS adc FFE9CH.6 00000H.4
@@BITS renge FFE9DH.2 00000H.2
@@BITS accero FFE9DH.4 00000H.0
@@BITS self_flash
FFE99H.4 00000H.0
@@BITS sw FFE99H.4 00000H.1
FFE9DH.4 00000H.0
@@BITS sw FFE9DH.4 00000H.1
@@BITS task_debug
FFE99H.5 00000H.0
FFE9DH.5 00000H.0
@@BITS task_misc
FFE99H.5 00000H.3
@@BITS task_sys FFE9AH.0 00000H.0
FFE9DH.5 00000H.3
@@BITS task_sys FFE9EH.0 00000H.0
@@BITS pedo_alg_thre_det2
FFE9AH.0 00000H.2
@@BITS ini_VECT FFE9AH.2 00000H.0
FFE9EH.0 00000H.2
@@BITS ini_VECT FFE9EH.2 00000H.0
@@BITS task_status
FFE9AH.2 00000H.0
@@BITS led_cam FFE9AH.2 00000H.1
@@BITS led_pow FFE9AH.3 00000H.0
@@BITS hal FFE9AH.3 00000H.6
FFE9EH.2 00000H.0
@@BITS led_cam FFE9EH.2 00000H.1
@@BITS led_pow FFE9EH.3 00000H.0
@@BITS hal FFE9EH.3 00000H.6
@@BITS batt_params
FFE9BH.1 00000H.0
@@BITS voltable FFE9BH.1 00000H.0
FFE9FH.1 00000H.0
@@BITS voltable FFE9FH.1 00000H.0
@@BITS pedo_lpf_coeff
FFE9BH.1 00000H.0
FFE9FH.1 00000H.0
@@BITS kanaria_c
FFE9BH.1 00000H.0
FFE9FH.1 00000H.0
@@BITS util_funcs
FFE9BH.1 00000H.0
FFE9FH.1 00000H.0
@@BITS i2c_mcu-sub
FFE9BH.1 00000H.0
* gap * FFE9CH 00038H
FFE9FH.1 00000H.0
* gap * FFEA0H 00034H
@@SEGREG FFED4H 00004H DSEG AT
@@SEGREG @SEGREG FFED4H 00004H
@@RTARG0 FFED8H 00008H DSEG AT

View File

@ -7,7 +7,7 @@
*/
#define MCU_VER_MAJOR 0x02
#define MCU_VER_MINOR 0x40
#define MCU_VER_MINOR 0x26
/*
2.40

View File

@ -143,6 +143,10 @@ u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs )
u8 dat;
iic_mcu_result = iic_mcu_read( SLA, adrs, 1, &dat );
if( iic_mcu_result != I2C_ERR_OK )
{
dat = 0xff;
}
return ( dat );
}

View File

@ -13,7 +13,7 @@ typedef signed short sx16;
#define false 0
#define set_bit( cond, reg, pos ) \
#define set_bit_if( cond, reg, pos ) \
{ \
if( cond ){ \
reg |= pos; \

View File

@ -185,7 +185,7 @@ static void update_chg_led()
LED_CHARGE = temp_led_chg;
// レジスタの充電中ビットはLEDに同期する
set_bit( LED_CHARGE, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); // set_bitのみ。
set_bit_if( LED_CHARGE, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); // set_bit_ifのみ。
/// 割り込みはtask_status()で行う
}
@ -282,7 +282,7 @@ void bt_get_charge_status()
***********************************************/
void pm_chk_adapter()
{
set_bit( !PM_EXTDC_n, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
set_bit_if( !PM_EXTDC_n, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
if( pm_extdc_old != PM_EXTDC_n ) // HAL を通すため、 PM_EXTDC_n の volatile にする心配なし
{
@ -849,7 +849,7 @@ err PM_LCD_on( )
{
// SPFL/SNAKE ならアモルファスHV on を間に挟む
wait_ms( 10 );
SPFL_LCD_AMOL_HV_CONT = 1;
LCD_AMOL_HV_CTRL = 1;
wait_ms( DELAY_PM_TSS_50B_AND_TCOM - 10 );
}
@ -907,7 +907,7 @@ void PM_LCD_off()
if( system_status.LCD_is_CGS == false )
{
// アモルファスならポート操作
SPFL_LCD_AMOL_HV_CONT = 0; // 他のファミリでもL縛りなので弊害なし
LCD_AMOL_HV_CTRL = 0; // 他のファミリでもL縛りなので弊害なし
wait_ms( 10 ); // アモルファス15Vを切ったときのウェイト。
}

View File

@ -27,7 +27,8 @@ typedef signed short s16;
typedef enum _ERR
{
ERR_SUCCESS = 0,
ERR_ERR
ERR_ERR,
ERR_RET1
}err;

View File

@ -37,7 +37,7 @@ void tsk_status( )
u8 diff;
// 蓋開けチェック
set_bit( SHELL_OPEN, vreg_ctr[VREG_C_STATUS], REG_BIT_ST_SHELL_OPEN );
set_bit_if( SHELL_OPEN, vreg_ctr[VREG_C_STATUS], REG_BIT_ST_SHELL_OPEN );
// ステータスレジスタ関係 → 割り込み //
// pm.c で、その場で行います。

View File

@ -736,7 +736,7 @@ static void restore_status_regs()
bl_status_temp = read_pmic( PM_REG_ADRS_BL );
vreg_ctr[ VREG_C_STATUS ] |= (( bl_status_temp & 0x03 ) << 5 );
set_bit( ( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 ),
set_bit_if( ( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 ),
vreg_ctr[ VREG_C_STATUS ], REG_BIT_LCD_POW );
BT_chk();
}

View File

@ -90,7 +90,7 @@
// SPFLのアモルファスLCDで必要な±15Vの電源。
#define SPFL_LCD_AMOL_HV_CONT P20.2 // F2
#define LCD_AMOL_HV_CTRL P20.2 // F2
// 充電せよ(out)

View File

@ -179,7 +179,7 @@ void vreg_ctr_write( u8 adrs, u8 data )
}
else
{
dbg_NOP();
dbg_nop();
}
break;
@ -367,7 +367,7 @@ void vreg_ctr_write( u8 adrs, u8 data )
// mcu_wdt_reset; // このコマンド使ったら意味ないでしょ!
while(1)
{
dbg_NOP();
dbg_nop();
}
break;
#endif //_ENABLE_COMMAND3_

View File

@ -3,6 +3,24 @@ C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\magic.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2m -qvjl2w -sainter_asm -zpb -no vreg_ctr.c
vreg_ctr.c(159) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(160) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(162) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(165) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(252) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(252) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(257) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(257) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(261) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(261) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(265) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(265) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(269) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 14 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\vreg_ctr.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel
RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K'
Read Device File Directory : C:\PROGRAM FILES (X86)\NEC ELECTRONICS TOOLS\DEV\
@ -24,10 +42,6 @@ Link complete, 0 error(s) and 14 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"C:\Program Files (x86)\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 nec_s_2_bsrbin2.rb bsr.hex
nec_s_2_bsrbin2.rb:2: warning: variable $KCODE is no longer effective; ignored
4
intel-HEX to bsr bin converter
file converted!
ruby: No such file or directory -- nec_s_2_bsrbin2.rb (LoadError)
Build Total error(s) : 0 Total warning(s) : 14
Build Total error(s) : 0 Total warning(s) : 28