Index: output/bt_program23.icode =================================================================== --- /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/bt_program23.icode (revision 2800) +++ /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/bt_program23.icode (working copy) @@ -28,7 +28,7 @@ 00000027 0x0000003a beq 0x0000005c , 0x00000473 00000028 0x0000003b beq 0x0000005d , 0x00000479 00000029 0x0000003c beq 0x0000005e , 0x00000535 - 00000030 0x0000003d beq 0x0000005f , 0x0000055f + 00000030 0x0000003d beq 0x0000005f , 0x00000563 00000031 0x0000003e beq 0x00000071 , 0x00000477 00000032 0x0000003f beq 0x00000076 , 0x00000043 00000033 0x00000040 beq 0x00000077 , 0x00000221 @@ -40,9 +40,9 @@ 00000039 0x00000046 beq 0x000000d5 , 0x0000045e 00000040 0x00000047 beq 0x000000d6 , 0x00000457 00000041 0x00000048 beq 0x000000da , 0x00000139 - 00000042 0x00000049 beq 0x000000db , 0x00000564 - 00000043 0x0000004a beq 0x000000dc , 0x000005a1 - 00000044 0x0000004b beq 0x000000dd , 0x00000582 + 00000042 0x00000049 beq 0x000000db , 0x00000568 + 00000043 0x0000004a beq 0x000000dc , 0x000005a5 + 00000044 0x0000004b beq 0x000000dd , 0x00000586 00000045 0x0000004c beq 0x000000f6 , 0x00000506 00000046 0x0000004d beq 0x000000fa , 0x0000050e 00000047 0x0000004e branch 0x0000235a @@ -1310,7 +1310,7 @@ 00001309 0x000006d5 call 0x00003651 00001310 0x000006d6 nbranch 0x00003586 , 0x00000018 00001311 0x000006d7 nbranch 0x00003586 , 0x0000002f - 00001312 0x000006d8 call 0x00000557 + 00001312 0x000006d8 call 0x0000055b 00001313 0x000006d9 branch 0x0000356a 00001314 0x000006dd call 0x00003625 00001315 0x000006de nbranch 0x00000527 , 0x00000028 @@ -1342,7 +1342,7 @@ 00001341 0x000006ff beq 0x00000001 , 0x00003646 00001342 0x00000700 nbranch 0x00000543 , 0x00000018 00001343 0x00000701 nbranch 0x00000543 , 0x0000002f - 00001344 0x00000702 call 0x00000557 + 00001344 0x00000702 call 0x0000055b 00001345 0x00000704 jam 0x00000000 , 0x0000473f 00001346 0x00000705 branch 0x00003646 00001347 0x00000709 fetch 0x00000001 , 0x00004602 @@ -1352,118 +1352,122 @@ 00001351 0x0000070d store 0x00000002 , 0x000045fe 00001352 0x0000070e fetch 0x00000001 , 0x000045fe 00001353 0x0000070f beq 0x000000ff , 0x00003676 - 00001354 0x00000710 call 0x0000054c - 00001355 0x00000711 branch 0x00000536 - 00001356 0x00000714 fetch 0x00000001 , 0x00004601 - 00001357 0x00000715 increase 0x00000001 , 0x0000003f - 00001358 0x00000716 store 0x00000001 , 0x00004601 - 00001359 0x00000717 and_into 0x00000003 , 0x0000003f - 00001360 0x00000718 branch 0x00000552 , 0x00000034 - 00001361 0x00000719 rtn - 00001362 0x0000071c fetch 0x00000004 , 0x0000458f - 00001363 0x0000071d fetcht 0x00000004 , 0x000045e4 - 00001364 0x0000071e isub 0x00000002 , 0x0000003e - 00001365 0x0000071f branch 0x00003222 , 0x00000005 - 00001366 0x00000720 branch 0x0000369a - 00001367 0x00000724 call 0x0000366e - 00001368 0x00000725 fetch 0x00000001 , 0x000044f8 - 00001369 0x00000726 compare 0x00000008 , 0x0000003f , 0x000000f8 - 00001370 0x00000727 nrtn 0x00000001 - 00001371 0x00000728 fetch 0x00000001 , 0x000044f9 - 00001372 0x00000729 beq 0x000000ff , 0x000001f7 - 00001373 0x0000072a store 0x00000001 , 0x000049aa - 00001374 0x0000072b rtn - 00001375 0x0000072e call 0x000036b4 - 00001376 0x0000072f nrtn 0x00000028 - 00001377 0x00000730 call 0x00000467 - 00001378 0x00000731 fetch 0x00000003 , 0x00004608 - 00001379 0x00000732 branch 0x00003622 - 00001380 0x00000736 fetch 0x00000008 , 0x000001fd - 00001381 0x00000737 branch 0x00006f79 , 0x00000034 - 00001382 0x00000738 store 0x00000008 , 0x000043fd - 00001383 0x00000739 call 0x00006b3a - 00001384 0x0000073a call 0x00006aad - 00001385 0x0000073b arg 0x00000fc0 , 0x0000003f - 00001386 0x0000073c iadd 0x00000012 , 0x00000012 - 00001387 0x0000073d arg 0x0000000a , 0x00000039 - 00001388 0x0000073e arg 0x000001fd , 0x00000011 - 00001389 0x0000073f call 0x00006b74 - 00001390 0x00000740 call 0x00006b37 - 00001391 0x00000741 fetch 0x00000008 , 0x000001fd - 00001392 0x00000742 rtn 0x00000034 - 00001393 0x00000743 store 0x00000008 , 0x00004be9 - 00001394 0x00000744 ifetch 0x00000002 , 0x00000006 - 00001395 0x00000745 istore 0x00000002 , 0x00000005 - 00001396 0x00000747 rtn - 00001397 0x0000074a fetch 0x00000001 , 0x000080cc - 00001398 0x0000074b set1 0x00000001 , 0x0000003f - 00001399 0x0000074c store 0x00000001 , 0x000080cc - 00001400 0x0000074d fetchr 0x00000012 , 0x00000001 , 0x00004419 - 00001401 0x0000074e fetch 0x00000001 , 0x00004433 - 00001402 0x0000074f store 0x00000001 , 0x00004419 - 00001403 0x00000750 arg 0x00000008 , 0x00000039 - 00001404 0x00000751 call 0x00006f67 - 00001405 0x00000752 storer 0x00000012 , 0x00000001 , 0x00004419 - 00001406 0x00000753 fetch 0x00000001 , 0x00008a0a - 00001407 0x00000754 set0 0x00000004 , 0x0000003f - 00001408 0x00000755 store 0x00000001 , 0x00008a0a - 00001409 0x00000756 rtn - 00001410 0x0000075d fetch 0x00000001 , 0x00004407 - 00001411 0x0000075e beq 0x00000001 , 0x00000586 - 00001412 0x0000075f beq 0x00000002 , 0x0000058d - 00001413 0x00000760 rtn - 00001414 0x00000763 setarg 0x000003e8 - 00001415 0x00000764 store 0x00000002 , 0x00004405 - 00001416 0x00000765 fetcht 0x00000002 , 0x00004bed - 00001417 0x00000766 fetch 0x00000002 , 0x00004bef - 00001418 0x00000767 arg 0x00000e10 , 0x00000013 - 00001419 0x00000768 call 0x00006fc0 - 00001420 0x00000769 branch 0x00000593 - 00001421 0x0000076c setarg 0x000003e8 - 00001422 0x0000076d store 0x00000002 , 0x00004405 - 00001423 0x0000076e fetcht 0x00000002 , 0x00004be9 - 00001424 0x0000076f fetch 0x00000002 , 0x00004beb - 00001425 0x00000770 arg 0x000003e8 , 0x00000013 - 00001426 0x00000771 call 0x00006fc0 - 00001427 0x00000773 fetcht 0x00000002 , 0x00004bf1 - 00001428 0x00000774 imul32 0x00000002 , 0x0000003f - 00001429 0x00000775 fetcht 0x00000002 , 0x00004bf3 - 00001430 0x00000776 idiv 0x00000002 - 00001431 0x00000777 branch 0x00007d5f - 00001432 0x0000077a call 0x00000575 - 00001433 0x0000077b fetch 0x00000001 , 0x00008a09 - 00001434 0x0000077c set0 0x00000007 , 0x0000003f - 00001435 0x0000077d store 0x00000001 , 0x00008a09 - 00001436 0x0000077e jam 0x00000077 , 0x00008a07 - 00001437 0x0000077f jam 0x000000c1 , 0x00008a08 - 00001438 0x00000780 jam 0x00000061 , 0x00008a0d - 00001439 0x00000781 jam 0x00000000 , 0x00008a0b - 00001440 0x00000782 rtn - 00001441 0x00000787 call 0x00000598 - 00001442 0x00000788 call 0x00006f90 - 00001443 0x00000789 fetch 0x00000001 , 0x00004409 - 00001444 0x0000078a store 0x00000001 , 0x000080cd - 00001445 0x0000078b call 0x00006f97 - 00001446 0x0000078c jam 0x00000060 , 0x00008a0d - 00001447 0x0000078d jam 0x00000000 , 0x000080cd - 00001448 0x00000791 call 0x00000598 - 00001449 0x00000792 fetch 0x00000001 , 0x00004409 - 00001450 0x00000793 store 0x00000001 , 0x000080cd - 00001451 0x00000794 jam 0x00000050 , 0x00008a0b - 00001452 0x00000795 jam 0x000000c0 , 0x00008a0e - 00001453 0x00000797 arg 0x0000000b , 0x00000038 - 00001454 0x00000798 fetchr 0x0000002f , 0x00000002 , 0x0000440a - 00001455 0x0000079a jam 0x00000003 , 0x000080cc - 00001456 0x0000079b call 0x000005ba - 00001457 0x0000079c fetcht 0x00000002 , 0x00008164 - 00001458 0x0000079d storet 0x00000002 , 0x00004bf3 - 00001459 0x0000079e call 0x00006f9c - 00001460 0x000007a0 arg 0x0000000b , 0x00000038 - 00001461 0x000007a1 storer 0x0000002f , 0x00000002 , 0x0000440a - 00001462 0x000007a3 jam 0x00000060 , 0x00008a0d - 00001463 0x000007a4 jam 0x00000000 , 0x000080cd - 00001464 0x000007a5 jam 0x00000000 , 0x000080cc - 00001465 0x000007a6 rtn - 00001466 0x000007ab fetch 0x00000001 , 0x00008129 - 00001467 0x000007ac bbit0 0x00000005 , 0x000005ba - 00001468 0x000007ad rtn + 00001354 0x00000710 fetch 0x00000001 , 0x00004601 + 00001355 0x00000711 increase 0x00000001 , 0x0000003f + 00001356 0x00000712 store 0x00000001 , 0x00004601 + 00001357 0x00000713 and_into 0x00000003 , 0x0000003f + 00001358 0x00000714 branch 0x00000550 , 0x00000034 + 00001359 0x00000715 branch 0x00000536 + 00001360 0x00000718 call 0x00004bfb + 00001361 0x00000719 call 0x000003e4 + 00001362 0x0000071a fetch 0x00000001 , 0x00004ba1 + 00001363 0x0000071b nbranch 0x00003646 , 0x00000034 + 00001364 0x0000071c call 0x00000556 + 00001365 0x0000071d branch 0x00000536 + 00001366 0x00000720 fetch 0x00000004 , 0x0000458f + 00001367 0x00000721 fetcht 0x00000004 , 0x000045e4 + 00001368 0x00000722 isub 0x00000002 , 0x0000003e + 00001369 0x00000723 branch 0x00003222 , 0x00000005 + 00001370 0x00000724 branch 0x0000369a + 00001371 0x00000728 call 0x0000366e + 00001372 0x00000729 fetch 0x00000001 , 0x000044f8 + 00001373 0x0000072a compare 0x00000008 , 0x0000003f , 0x000000f8 + 00001374 0x0000072b nrtn 0x00000001 + 00001375 0x0000072c fetch 0x00000001 , 0x000044f9 + 00001376 0x0000072d beq 0x000000ff , 0x000001f7 + 00001377 0x0000072e store 0x00000001 , 0x000049aa + 00001378 0x0000072f rtn + 00001379 0x00000732 call 0x000036b4 + 00001380 0x00000733 nrtn 0x00000028 + 00001381 0x00000734 call 0x00000467 + 00001382 0x00000735 fetch 0x00000003 , 0x00004608 + 00001383 0x00000736 branch 0x00003622 + 00001384 0x0000073a fetch 0x00000008 , 0x000001fd + 00001385 0x0000073b branch 0x00006f79 , 0x00000034 + 00001386 0x0000073c store 0x00000008 , 0x000043fd + 00001387 0x0000073d call 0x00006b3a + 00001388 0x0000073e call 0x00006aad + 00001389 0x0000073f arg 0x00000fc0 , 0x0000003f + 00001390 0x00000740 iadd 0x00000012 , 0x00000012 + 00001391 0x00000741 arg 0x0000000a , 0x00000039 + 00001392 0x00000742 arg 0x000001fd , 0x00000011 + 00001393 0x00000743 call 0x00006b74 + 00001394 0x00000744 call 0x00006b37 + 00001395 0x00000745 fetch 0x00000008 , 0x000001fd + 00001396 0x00000746 rtn 0x00000034 + 00001397 0x00000747 store 0x00000008 , 0x00004be9 + 00001398 0x00000748 ifetch 0x00000002 , 0x00000006 + 00001399 0x00000749 istore 0x00000002 , 0x00000005 + 00001400 0x0000074b rtn + 00001401 0x0000074e fetch 0x00000001 , 0x000080cc + 00001402 0x0000074f set1 0x00000001 , 0x0000003f + 00001403 0x00000750 store 0x00000001 , 0x000080cc + 00001404 0x00000751 fetchr 0x00000012 , 0x00000001 , 0x00004419 + 00001405 0x00000752 fetch 0x00000001 , 0x00004433 + 00001406 0x00000753 store 0x00000001 , 0x00004419 + 00001407 0x00000754 arg 0x00000008 , 0x00000039 + 00001408 0x00000755 call 0x00006f67 + 00001409 0x00000756 storer 0x00000012 , 0x00000001 , 0x00004419 + 00001410 0x00000757 fetch 0x00000001 , 0x00008a0a + 00001411 0x00000758 set0 0x00000004 , 0x0000003f + 00001412 0x00000759 store 0x00000001 , 0x00008a0a + 00001413 0x0000075a rtn + 00001414 0x00000761 fetch 0x00000001 , 0x00004407 + 00001415 0x00000762 beq 0x00000001 , 0x0000058a + 00001416 0x00000763 beq 0x00000002 , 0x00000591 + 00001417 0x00000764 rtn + 00001418 0x00000767 setarg 0x000003e8 + 00001419 0x00000768 store 0x00000002 , 0x00004405 + 00001420 0x00000769 fetcht 0x00000002 , 0x00004bed + 00001421 0x0000076a fetch 0x00000002 , 0x00004bef + 00001422 0x0000076b arg 0x00000e10 , 0x00000013 + 00001423 0x0000076c call 0x00006fc0 + 00001424 0x0000076d branch 0x00000597 + 00001425 0x00000770 setarg 0x000003e8 + 00001426 0x00000771 store 0x00000002 , 0x00004405 + 00001427 0x00000772 fetcht 0x00000002 , 0x00004be9 + 00001428 0x00000773 fetch 0x00000002 , 0x00004beb + 00001429 0x00000774 arg 0x000003e8 , 0x00000013 + 00001430 0x00000775 call 0x00006fc0 + 00001431 0x00000777 fetcht 0x00000002 , 0x00004bf1 + 00001432 0x00000778 imul32 0x00000002 , 0x0000003f + 00001433 0x00000779 fetcht 0x00000002 , 0x00004bf3 + 00001434 0x0000077a idiv 0x00000002 + 00001435 0x0000077b branch 0x00007d5f + 00001436 0x0000077e call 0x00000579 + 00001437 0x0000077f fetch 0x00000001 , 0x00008a09 + 00001438 0x00000780 set0 0x00000007 , 0x0000003f + 00001439 0x00000781 store 0x00000001 , 0x00008a09 + 00001440 0x00000782 jam 0x00000077 , 0x00008a07 + 00001441 0x00000783 jam 0x000000c1 , 0x00008a08 + 00001442 0x00000784 jam 0x00000061 , 0x00008a0d + 00001443 0x00000785 jam 0x00000000 , 0x00008a0b + 00001444 0x00000786 rtn + 00001445 0x0000078b call 0x0000059c + 00001446 0x0000078c call 0x00006f90 + 00001447 0x0000078d fetch 0x00000001 , 0x00004409 + 00001448 0x0000078e store 0x00000001 , 0x000080cd + 00001449 0x0000078f call 0x00006f97 + 00001450 0x00000790 jam 0x00000060 , 0x00008a0d + 00001451 0x00000791 jam 0x00000000 , 0x000080cd + 00001452 0x00000795 call 0x0000059c + 00001453 0x00000796 fetch 0x00000001 , 0x00004409 + 00001454 0x00000797 store 0x00000001 , 0x000080cd + 00001455 0x00000798 jam 0x00000050 , 0x00008a0b + 00001456 0x00000799 jam 0x000000c0 , 0x00008a0e + 00001457 0x0000079b arg 0x0000000b , 0x00000038 + 00001458 0x0000079c fetchr 0x0000002f , 0x00000002 , 0x0000440a + 00001459 0x0000079e jam 0x00000003 , 0x000080cc + 00001460 0x0000079f call 0x000005be + 00001461 0x000007a0 fetcht 0x00000002 , 0x00008164 + 00001462 0x000007a1 storet 0x00000002 , 0x00004bf3 + 00001463 0x000007a2 call 0x00006f9c + 00001464 0x000007a4 arg 0x0000000b , 0x00000038 + 00001465 0x000007a5 storer 0x0000002f , 0x00000002 , 0x0000440a + 00001466 0x000007a7 jam 0x00000060 , 0x00008a0d + 00001467 0x000007a8 jam 0x00000000 , 0x000080cd + 00001468 0x000007a9 jam 0x00000000 , 0x000080cc + 00001469 0x000007aa rtn + 00001470 0x000007af fetch 0x00000001 , 0x00008129 + 00001471 0x000007b0 bbit0 0x00000005 , 0x000005be + 00001472 0x000007b1 rtn Index: output/bt_program23.list =================================================================== --- /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/bt_program23.list (revision 2800) +++ /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/bt_program23.list (working copy) @@ -1557,134 +1557,138 @@ 0x547 001805 store 2 ,mem_24g_txfail_cnt 0x548 001806 fetch 1 ,mem_24g_txfail_cnt 0x549 001807 beq 0xff ,g24_tx_attempt_fail -0x54a 001808 call p_keyboard_g24_transmit_hop_process -0x54b 001809 branch p_keyboard_g24_transmit_loop -: 001811 p_keyboard_g24_transmit_hop_process: -0x54c 001812 fetch 1 ,mem_24g_retry -0x54d 001813 increase 1 ,pdata -0x54e 001814 store 1 ,mem_24g_retry -0x54f 001815 and_into 0x03 ,pdata -0x550 001816 branch p_g24_tx_fast_hop ,blank -0x551 001817 rtn -: 001819 p_g24_tx_fast_hop: -0x552 001820 fetch 4 ,mem_24g_addr -0x553 001821 fetcht 4 ,mem_24g_fast_conn_addr -0x554 001822 isub temp ,null -0x555 001823 branch g24_ch ,zero -0x556 001824 branch g24_tx_fast_hop -: 001827 p_keyboard_g24_ackpayload_parse: -0x557 001828 call g24_ackpayload_parse -0x558 001829 fetch 1 ,mem_24g_rxbuf + 1 -0x559 001830 compare 0x08 ,pdata ,0xf8 -0x55a 001831 nrtn true -0x55b 001832 fetch 1 ,mem_24g_rxbuf + 2 -0x55c 001833 beq 0xff ,p_keyboard_24g_hibernate_set -0x55d 001834 store 1 ,mem_keyboard_led_status -0x55e 001835 rtn -: 001837 p_keyboard_g24_short_sleep: -0x55f 001838 call g24_lpm_wait -0x560 001839 nrtn user -0x561 001840 call p_clear_wake -0x562 001841 fetch 3 ,mem_24g_short_sleep_set -0x563 001842 branch g24_long_seep2 -: 001845 p_adc_init_data: -0x564 001846 fetch 8 ,mem_otp_adc -0x565 001847 branch adc_init_cal_data_default ,blank -0x566 001848 store 8 ,mem_reference_inter1p8v_2v_adc_io_data -0x567 001849 call enable_otp_read -0x568 001850 call loadcode_check_otp_lock -0x569 001851 arg otp_offset_adc_param_l_c0 ,pdata -0x56a 001852 iadd regb ,regb -0x56b 001853 arg 10 ,loopcnt -0x56c 001854 arg mem_otp_temp ,rega -0x56d 001855 call otp_read_data -0x56e 001856 call disable_otp -0x56f 001857 fetch 8 ,mem_otp_temp -0x570 001858 rtn blank -0x571 001859 store 8 ,mem_adc_reference3v_gpio1v_ft_data -0x572 001860 ifetch 2 ,contr -0x573 001861 istore 2 ,contw -0x574 001863 rtn -: 001865 p_sadc_cal_write: -0x575 001866 fetch 1 ,core_sadc_ctrl -0x576 001867 set1 1 ,pdata -0x577 001868 store 1 ,core_sadc_ctrl -0x578 001869 fetchr regb ,1 ,mem_spi_write_addr -0x579 001870 fetch 1 ,mem_adc_cal_c7 -0x57a 001871 store 1 ,mem_spi_write_addr -0x57b 001872 arg 8 ,loopcnt -0x57c 001873 call sadc_cal_write + 4 -0x57d 001874 storer regb ,1 ,mem_spi_write_addr -0x57e 001875 fetch 1 ,core_gpadc_cfg2 -0x57f 001876 set0 4 ,pdata -0x580 001877 store 1 ,core_gpadc_cfg2 -0x581 001878 rtn -: 001882 p_vdd_calculate_by_mode: -: 001884 p_vdd_reference_inter3v_calculate: -0x582 001885 fetch 1 ,mem_adc_config_flag -0x583 001886 beq adc_config_hvin ,p_vdd_reference_inter3v_calculate_by_mode_vdcdc -0x584 001887 beq adc_config_gpio ,p_vdd_reference_inter3v_calculate_by_mode_gpio -0x585 001888 rtn -: 001890 p_vdd_reference_inter3v_calculate_by_mode_vdcdc: -0x586 001891 setarg 1000 -0x587 001892 store 2 ,mem_reference_voltage -0x588 001893 fetcht 2 ,mem_adc_reference3v_vdcdc3p6v_ft_data -0x589 001894 fetch 2 ,mem_adc_reference3v_vdcdc4p6v_ft_data -0x58a 001895 arg 3600 ,regc -0x58b 001896 call vdd_calculate -0x58c 001897 branch p_mul1v_div1v_to_cal -: 001899 p_vdd_reference_inter3v_calculate_by_mode_gpio: -0x58d 001900 setarg 1000 -0x58e 001901 store 2 ,mem_reference_voltage -0x58f 001902 fetcht 2 ,mem_adc_reference3v_gpio1v_ft_data -0x590 001903 fetch 2 ,mem_adc_reference3v_gpio2v_ft_data -0x591 001904 arg 1000 ,regc -0x592 001905 call vdd_calculate -: 001906 p_mul1v_div1v_to_cal: -0x593 001907 fetcht 2 ,mem_adc_reference3v_inter1v_ft_data -0x594 001908 imul32 temp ,pdata -0x595 001909 fetcht 2 ,mem_adc_reference3v_inter1v_now_data -0x596 001910 idiv temp -0x597 001911 branch get_div_result -: 001913 p_enable_adc_init_config: -0x598 001914 call p_sadc_cal_write -0x599 001915 fetch 1 ,core_gpadc_cfg1 -0x59a 001916 set0 7 ,pdata -0x59b 001917 store 1 ,core_gpadc_cfg1 -0x59c 001918 jam 0x77 ,core_gpadc_ctrl -0x59d 001919 jam 0xc1 ,core_gpadc_cfg0 -0x59e 001920 jam 0x61 ,core_vtest_ctrl0 -0x59f 001921 jam 0x00 ,core_gpadc_cfg3 -0x5a0 001922 rtn -: 001924 p_enable_adc: -: 001926 p_enable_adc_reference_source_inter3v: -0x5a1 001927 call p_enable_adc_init_config -0x5a2 001928 call sadc_channel -0x5a3 001929 fetch 1 ,mem_adc_clkdiv -0x5a4 001930 store 1 ,core_sadc_clkdiv -0x5a5 001931 call sadc_read -0x5a6 001932 jam 0x60 ,core_vtest_ctrl0 -0x5a7 001933 jam 0x00 ,core_sadc_clkdiv -: 001936 p_read_adc_inter1v: -0x5a8 001937 call p_enable_adc_init_config -0x5a9 001938 fetch 1 ,mem_adc_clkdiv -0x5aa 001939 store 1 ,core_sadc_clkdiv -0x5ab 001940 jam 0x50 ,core_gpadc_cfg3 -0x5ac 001941 jam 0xc0 ,core_vtest_ctrl1 -0x5ad 001943 arg 0xb ,regext_index -0x5ae 001944 fetchr regext ,2 ,mem_adc_current_value -0x5af 001946 jam 0x03 ,core_sadc_ctrl -0x5b0 001947 call p_sar_adc_read_wait -0x5b1 001948 fetcht 2 ,core_sadc_data -0x5b2 001949 storet 2 ,mem_adc_reference3v_inter1v_now_data -0x5b3 001950 call sadc_read_wait + 4 -0x5b4 001952 arg 0xb ,regext_index -0x5b5 001953 storer regext ,2 ,mem_adc_current_value -0x5b6 001955 jam 0x60 ,core_vtest_ctrl0 -0x5b7 001956 jam 0x00 ,core_sadc_clkdiv -0x5b8 001957 jam 0x00 ,core_sadc_ctrl -0x5b9 001958 rtn -: 001962 p_sar_adc_read_wait: -0x5ba 001963 fetch 1 ,core_perf_status -0x5bb 001964 bbit0 saradc_done ,p_sar_adc_read_wait -0x5bc 001965 rtn +0x54a 001808 fetch 1 ,mem_24g_retry +0x54b 001809 increase 1 ,pdata +0x54c 001810 store 1 ,mem_24g_retry +0x54d 001811 and_into 0x03 ,pdata +0x54e 001812 branch p_keyboard_g24_transmit_hop_process ,blank +0x54f 001813 branch p_keyboard_g24_transmit_loop +: 001815 p_keyboard_g24_transmit_hop_process: +0x550 001816 call kscan_dispatch +0x551 001817 call p_keyboard_device_select +0x552 001818 fetch 1 ,mem_keyboard_switch_device_flag +0x553 001819 nbranch g24_transmit_no_ack ,blank +0x554 001820 call p_g24_tx_fast_hop +0x555 001821 branch p_keyboard_g24_transmit_loop +: 001823 p_g24_tx_fast_hop: +0x556 001824 fetch 4 ,mem_24g_addr +0x557 001825 fetcht 4 ,mem_24g_fast_conn_addr +0x558 001826 isub temp ,null +0x559 001827 branch g24_ch ,zero +0x55a 001828 branch g24_tx_fast_hop +: 001831 p_keyboard_g24_ackpayload_parse: +0x55b 001832 call g24_ackpayload_parse +0x55c 001833 fetch 1 ,mem_24g_rxbuf + 1 +0x55d 001834 compare 0x08 ,pdata ,0xf8 +0x55e 001835 nrtn true +0x55f 001836 fetch 1 ,mem_24g_rxbuf + 2 +0x560 001837 beq 0xff ,p_keyboard_24g_hibernate_set +0x561 001838 store 1 ,mem_keyboard_led_status +0x562 001839 rtn +: 001841 p_keyboard_g24_short_sleep: +0x563 001842 call g24_lpm_wait +0x564 001843 nrtn user +0x565 001844 call p_clear_wake +0x566 001845 fetch 3 ,mem_24g_short_sleep_set +0x567 001846 branch g24_long_seep2 +: 001849 p_adc_init_data: +0x568 001850 fetch 8 ,mem_otp_adc +0x569 001851 branch adc_init_cal_data_default ,blank +0x56a 001852 store 8 ,mem_reference_inter1p8v_2v_adc_io_data +0x56b 001853 call enable_otp_read +0x56c 001854 call loadcode_check_otp_lock +0x56d 001855 arg otp_offset_adc_param_l_c0 ,pdata +0x56e 001856 iadd regb ,regb +0x56f 001857 arg 10 ,loopcnt +0x570 001858 arg mem_otp_temp ,rega +0x571 001859 call otp_read_data +0x572 001860 call disable_otp +0x573 001861 fetch 8 ,mem_otp_temp +0x574 001862 rtn blank +0x575 001863 store 8 ,mem_adc_reference3v_gpio1v_ft_data +0x576 001864 ifetch 2 ,contr +0x577 001865 istore 2 ,contw +0x578 001867 rtn +: 001869 p_sadc_cal_write: +0x579 001870 fetch 1 ,core_sadc_ctrl +0x57a 001871 set1 1 ,pdata +0x57b 001872 store 1 ,core_sadc_ctrl +0x57c 001873 fetchr regb ,1 ,mem_spi_write_addr +0x57d 001874 fetch 1 ,mem_adc_cal_c7 +0x57e 001875 store 1 ,mem_spi_write_addr +0x57f 001876 arg 8 ,loopcnt +0x580 001877 call sadc_cal_write + 4 +0x581 001878 storer regb ,1 ,mem_spi_write_addr +0x582 001879 fetch 1 ,core_gpadc_cfg2 +0x583 001880 set0 4 ,pdata +0x584 001881 store 1 ,core_gpadc_cfg2 +0x585 001882 rtn +: 001886 p_vdd_calculate_by_mode: +: 001888 p_vdd_reference_inter3v_calculate: +0x586 001889 fetch 1 ,mem_adc_config_flag +0x587 001890 beq adc_config_hvin ,p_vdd_reference_inter3v_calculate_by_mode_vdcdc +0x588 001891 beq adc_config_gpio ,p_vdd_reference_inter3v_calculate_by_mode_gpio +0x589 001892 rtn +: 001894 p_vdd_reference_inter3v_calculate_by_mode_vdcdc: +0x58a 001895 setarg 1000 +0x58b 001896 store 2 ,mem_reference_voltage +0x58c 001897 fetcht 2 ,mem_adc_reference3v_vdcdc3p6v_ft_data +0x58d 001898 fetch 2 ,mem_adc_reference3v_vdcdc4p6v_ft_data +0x58e 001899 arg 3600 ,regc +0x58f 001900 call vdd_calculate +0x590 001901 branch p_mul1v_div1v_to_cal +: 001903 p_vdd_reference_inter3v_calculate_by_mode_gpio: +0x591 001904 setarg 1000 +0x592 001905 store 2 ,mem_reference_voltage +0x593 001906 fetcht 2 ,mem_adc_reference3v_gpio1v_ft_data +0x594 001907 fetch 2 ,mem_adc_reference3v_gpio2v_ft_data +0x595 001908 arg 1000 ,regc +0x596 001909 call vdd_calculate +: 001910 p_mul1v_div1v_to_cal: +0x597 001911 fetcht 2 ,mem_adc_reference3v_inter1v_ft_data +0x598 001912 imul32 temp ,pdata +0x599 001913 fetcht 2 ,mem_adc_reference3v_inter1v_now_data +0x59a 001914 idiv temp +0x59b 001915 branch get_div_result +: 001917 p_enable_adc_init_config: +0x59c 001918 call p_sadc_cal_write +0x59d 001919 fetch 1 ,core_gpadc_cfg1 +0x59e 001920 set0 7 ,pdata +0x59f 001921 store 1 ,core_gpadc_cfg1 +0x5a0 001922 jam 0x77 ,core_gpadc_ctrl +0x5a1 001923 jam 0xc1 ,core_gpadc_cfg0 +0x5a2 001924 jam 0x61 ,core_vtest_ctrl0 +0x5a3 001925 jam 0x00 ,core_gpadc_cfg3 +0x5a4 001926 rtn +: 001928 p_enable_adc: +: 001930 p_enable_adc_reference_source_inter3v: +0x5a5 001931 call p_enable_adc_init_config +0x5a6 001932 call sadc_channel +0x5a7 001933 fetch 1 ,mem_adc_clkdiv +0x5a8 001934 store 1 ,core_sadc_clkdiv +0x5a9 001935 call sadc_read +0x5aa 001936 jam 0x60 ,core_vtest_ctrl0 +0x5ab 001937 jam 0x00 ,core_sadc_clkdiv +: 001940 p_read_adc_inter1v: +0x5ac 001941 call p_enable_adc_init_config +0x5ad 001942 fetch 1 ,mem_adc_clkdiv +0x5ae 001943 store 1 ,core_sadc_clkdiv +0x5af 001944 jam 0x50 ,core_gpadc_cfg3 +0x5b0 001945 jam 0xc0 ,core_vtest_ctrl1 +0x5b1 001947 arg 0xb ,regext_index +0x5b2 001948 fetchr regext ,2 ,mem_adc_current_value +0x5b3 001950 jam 0x03 ,core_sadc_ctrl +0x5b4 001951 call p_sar_adc_read_wait +0x5b5 001952 fetcht 2 ,core_sadc_data +0x5b6 001953 storet 2 ,mem_adc_reference3v_inter1v_now_data +0x5b7 001954 call sadc_read_wait + 4 +0x5b8 001956 arg 0xb ,regext_index +0x5b9 001957 storer regext ,2 ,mem_adc_current_value +0x5ba 001959 jam 0x60 ,core_vtest_ctrl0 +0x5bb 001960 jam 0x00 ,core_sadc_clkdiv +0x5bc 001961 jam 0x00 ,core_sadc_ctrl +0x5bd 001962 rtn +: 001966 p_sar_adc_read_wait: +0x5be 001967 fetch 1 ,core_perf_status +0x5bf 001968 bbit0 saradc_done ,p_sar_adc_read_wait +0x5c0 001969 rtn Index: output/bt_program23.meta =================================================================== --- /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/bt_program23.meta (revision 2800) +++ /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/bt_program23.meta (working copy) @@ -1805,17 +1805,21 @@ store 2,mem_24g_txfail_cnt fetch 1,mem_24g_txfail_cnt beq 0xff,g24_tx_attempt_fail - call p_keyboard_g24_transmit_hop_process - branch p_keyboard_g24_transmit_loop - -p_keyboard_g24_transmit_hop_process: fetch 1,mem_24g_retry increase 1,pdata store 1,mem_24g_retry and_into 0x03,pdata - branch p_g24_tx_fast_hop,blank //each 4 times change channel - rtn + branch p_keyboard_g24_transmit_hop_process,blank //each 4 times change channel + branch p_keyboard_g24_transmit_loop +p_keyboard_g24_transmit_hop_process: + call kscan_dispatch + call p_keyboard_device_select + fetch 1,mem_keyboard_switch_device_flag + nbranch g24_transmit_no_ack,blank + call p_g24_tx_fast_hop + branch p_keyboard_g24_transmit_loop + p_g24_tx_fast_hop: fetch 4,mem_24g_addr fetcht 4,mem_24g_fast_conn_addr Index: output/bt_program23.rom =================================================================== --- /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/bt_program23.rom (revision 2800) +++ /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/bt_program23.rom (working copy) @@ -28,7 +28,7 @@ 11000000001011100000010001110011 11000000001011101000010001111001 11000000001011110000010100110101 -11000000001011111000010101011111 +11000000001011111000010101100011 11000000001110001000010001110111 11000000001110110000000001000011 11000000001110111000001000100001 @@ -40,9 +40,9 @@ 11000000011010101000010001011110 11000000011010110000010001010111 11000000011011010000000100111001 -11000000011011011000010101100100 -11000000011011100000010110100001 -11000000011011101000010110000010 +11000000011011011000010101101000 +11000000011011100000010110100101 +11000000011011101000010110000110 11000000011110110000010100000110 11000000011111010000010100001110 00100000001000000010001101011010 @@ -1310,7 +1310,7 @@ 00100000010000000011011001010001 00100100001011000011010110000110 00100100001101111011010110000110 -00100000010000000000010101010111 +00100000010000000000010101011011 00100000001000000011010101101010 00100000010000000011011000100101 00100100001101000000010100100111 @@ -1342,7 +1342,7 @@ 11000000000000001011011001000110 00100100001011000000010101000011 00100100001101111000010101000011 -00100000010000000000010101010111 +00100000010000000000010101011011 01110000010001110011111100000000 00100000001000000011011001000110 01101111111000001100011000000010 @@ -1352,14 +1352,18 @@ 01100111111000010100010111111110 01101111111000001100010111111110 11000000011111111011011001110110 -00100000010000000000010101001100 -00100000001000000000010100110110 01101111111000001100011000000001 00011111111000001111111000000001 01100111111000001100011000000001 00011111111000010111111000000011 -00100000001110100000010101010010 -00100000011000000000000000000000 +00100000001110100000010101010000 +00100000001000000000010100110110 +00100000010000000100101111111011 +00100000010000000000001111100100 +01101111111000001100101110100001 +00100100001110100011011001000110 +00100000010000000000010101010110 +00100000001000000000010100110110 01101111111000100100010110001111 01101000010010100100010111100100 10011000010001100111110000000000 @@ -1409,8 +1413,8 @@ 01100111111100001000101000001010 00100000011000000000000000000000 01101111111000001100010000000111 -11000000000000001000010110000110 -11000000000000010000010110001101 +11000000000000001000010110001010 +11000000000000010000010110010001 00100000011000000000000000000000 01011000000000000000001111101000 01100111111000010100010000000101 @@ -1418,7 +1422,7 @@ 01101111111000010100101111101111 11011010011000000000111000010000 00100000010000000110111111000000 -00100000001000000000010110010011 +00100000001000000000010110010111 01011000000000000000001111101000 01100111111000010100010000000101 01101000010010010100101111101001 @@ -1430,7 +1434,7 @@ 01101000010010010100101111110011 10011000010001101111110000000000 00100000001000000111110101011111 -00100000010000000000010101110101 +00100000010000000000010101111001 01101111111100001000101000001001 01111001001111111111111000000111 01100111111100001000101000001001 @@ -1439,14 +1443,14 @@ 01110000100010100000110101100001 01110000100010100000101100000000 00100000011000000000000000000000 -00100000010000000000010110011000 +00100000010000000000010110011100 00100000010000000110111110010000 01101111111000001100010000001001 01100111111100001000000011001101 00100000010000000110111110010111 01110000100010100000110101100000 01110000100000001100110100000000 -00100000010000000000010110011000 +00100000010000000000010110011100 01101111111000001100010000001001 01100111111100001000000011001101 01110000100010100000101101010000 @@ -1454,7 +1458,7 @@ 11011111000000000000000000001011 01101101111000010100010000001010 01110000100000001100110000000011 -00100000010000000000010110111010 +00100000010000000000010110111110 01101000010110010000000101100100 01100000010010010100101111110011 00100000010000000110111110011100 @@ -1465,5 +1469,5 @@ 01110000100000001100110000000000 00100000011000000000000000000000 01101111111100001000000100101001 -11000011000000101000010110111010 +11000011000000101000010110111110 00100000011000000000000000000000 Index: output/eeprom.dat =================================================================== --- /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/eeprom.dat (revision 2800) +++ /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/eeprom.dat (working copy) @@ -18,7 +18,7 @@ 1e aa 55 -00 +10 17 24 e6 @@ -143,7 +143,7 @@ 1c e8 46 -36 +0a 9c 29 df @@ -191,15 +191,15 @@ 1e b2 e8 -ff +f3 ab 2f 49 -07 +03 f0 86 4e -d2 +d6 94 8d 56 @@ -5271,7 +5271,7 @@ 1f 08 39 -8a +86 5a c6 9a @@ -5399,7 +5399,7 @@ e9 dc 75 -b1 +bd 6c 2c 05 @@ -5436,478 +5436,494 @@ 94 c3 ab -8c -c0 -bd -8c -7f -ac -e7 -29 -35 +c3 +60 +7e +c1 +40 +6c +1c +1e +3d 82 5d ff 96 -2c -c6 -f2 -e9 -67 -c3 -05 -72 -94 -0a -d6 +2d +46 +f0 +ae +bd +00 +54 +4d +55 +71 +e3 0f -44 -d7 -ce +3e +99 +67 7d -b3 -88 -1a +93 +8b +fe ba -c9 -a8 -35 -d8 -17 -a8 -43 -d0 -ab -9a -d6 +cb +26 +1b +94 +67 +db +e1 +68 +ad +e3 +80 93 +ed +f0 +13 +95 +82 +6a +8a +82 +e2 +3f +dc +a0 +61 +31 +a1 +cf +2f +84 +4a +a8 +fc +8b +cd +7d +0f +b6 +2f +2d ef -47 -07 -da -40 -19 -9f -ca -e8 -4c -56 -57 -c7 -89 -59 -c0 +71 +98 +2f +3b ec -c6 -60 -ac -bc -3d -57 -32 -af -44 -b8 -82 -70 -34 97 -67 -3a -d5 -35 -2b +2f d4 -64 e4 -91 -0d -a8 -19 -e1 -3d -52 -d5 -98 -8e +e4 +de ad -b3 -b9 -3d -d5 -c4 +5a +54 +05 +36 +d3 +22 +df +2e +60 +7e +f6 +bc +13 +cc 10 -9d +fd d6 -ae -21 -98 -b7 -e3 +38 +6a +08 +b6 +1e aa -0f +75 +5a +61 +32 31 -7f -3a -34 -e7 -9a -cd -2c -14 62 +6f +cd +4c +49 +7a +cf +73 +05 +21 +51 +dd +12 +5d +0b +3d 80 -d7 -6e -71 -ae -07 -72 -e4 -f6 -99 -67 -d9 -54 -2b -62 +24 +ab +4b +09 +74 +f2 +f5 +0d +7d +3d +c0 +a7 +bb 44 -08 -95 -66 -2d -c2 -60 -c3 -0f -fe a3 -51 -63 -a8 -5b -5c -68 +9e 54 -6c -9d -c2 -fd +18 +9f +5d +9f +ae +36 +9c 3f -35 -69 -bd -87 -b3 -f9 -10 -e6 +ba 9b -c3 +15 +f4 +72 +26 +d8 +c8 +98 +e3 +9a +3b 26 -9d +87 87 7b -c5 -20 -40 -dc -74 -6a -52 -5c -13 -69 -5e -68 +cd +34 +8b +f9 +e2 +ab +2c +5b +93 +78 de -fe +a1 94 -ac +de +50 +b5 dd -c7 -16 -03 -7f -b4 -8d -24 -18 -e0 -53 -a2 -d6 +d7 +52 +fc +61 +74 +37 +3c +a0 +30 +d3 +66 +9c 51 -bd -02 -be -81 -a9 -15 -58 -2e -91 -96 -07 -56 -87 -a8 -a5 -9d +16 +7c +b3 21 -1c -a0 -31 -a0 -8e +a9 +3f 50 -7e -92 -fa -a6 -37 +3e +df +85 a1 -4a -c0 -a2 -f8 -68 +49 +79 +a4 +e2 +2d +c4 +71 +e2 +11 +64 +97 +50 +6e +dc +f7 +1f +08 +da +c8 +67 +53 +77 +ef c0 3e 08 06 -3e -ff -17 -5e -47 -dd -fd -92 -aa -32 +09 +1f d0 -d9 -cd -2e -12 -73 -00 -51 -de -ca -29 -55 -52 -e4 -ab -93 -20 +b1 +e0 +3c +3c 1d -c8 -45 +02 +7a 9e -95 -db -2d -4d +a5 +82 +af 59 -d8 -24 -78 -2a -50 -c7 -25 -48 -48 -8c -ca +9c +82 +31 +d3 +32 +6e +f4 +79 +21 +e3 +fa +6e +63 +ff +a4 d6 -e1 -fe -f2 +92 +66 +ac +07 +4c +90 +2d +5c +03 1f -84 -84 -4d -8a -84 -79 -99 06 -a4 +6b +34 +ca +ec +ca +d6 +a6 5f d9 -e8 -c5 -70 -bf -fb -8f -57 -39 -f1 -04 -70 -0b -7c -72 -41 -87 -13 -ac -28 -dc -3c -20 -7f +da +84 +84 +4d +92 +73 +d7 +2c +ed +16 +76 +91 f3 -26 -c5 -0e -00 -2a -a2 +7d +76 +2c +3b +c7 3e -d6 -d8 +0f +5f +bc +7f +f0 +09 +75 +f8 46 -42 -88 -15 -f5 -0a -a2 -26 -11 -0a -36 -34 -53 -26 -88 -2f -89 -1e -ea -34 -49 -4a +e9 +4d +51 +de +3b +67 +af +04 +70 +95 +c4 +02 +24 +bd +44 +54 +10 +4f +f7 +7b +73 +e2 +70 +23 +2f +41 +e0 +31 +43 03 -77 -27 -3e -3b -fd +ec +85 +76 +d9 +d4 +88 +c5 +56 +20 +cc +7e +60 +ae +bb +30 94 1c -db -63 -30 -fc +b1 +68 +60 36 -c8 -da -5f -ab -43 -d8 -ff -09 -7d -1a -02 -45 -6c -53 -35 -a6 -b8 -a5 -21 -31 -83 -da -d8 -bb -b5 -49 -78 -6b -ac -b7 -41 -8a -a4 -de -cd -ce +54 +38 +c5 +3f +a2 +4a 9f -95 -06 -90 -06 -57 -5e +4f +8c +28 +55 +a2 +ee +f2 +44 +4f +2b 15 -8d -4d -ea -4d +a5 +2b +f7 d3 -0c -37 -cf +8a +12 +b0 +e9 +f9 +98 +af +ae bd -52 -9c -1d -57 -94 -38 -8b -74 -a3 +50 +4e +63 +de +c7 +09 +cc +c5 +cc +9b +7c e0 -7a -1b -3a +07 +14 +e2 +40 +42 +42 +2a +5c f7 -68 -25 -c5 -a2 -ea -aa -ff -87 +6c +22 +ad +dc +18 +e2 +99 +80 +ce +1a +b3 +23 +3c +88 +6a +37 +ca +b9 +6a +22 +26 +a1 +ba +06 +05 +46 +6d +e7 +a9 +b6 +c3 +f3 +99 +c4 +89 +88 +b8 +49 +d3 41 -4c -72 -9d -25 +2f ff -70 -71 -d1 -7e +5e +61 d9 -68 -74 -49 -7b -2a -2f ff -31 -91 -58 -d6 -29 -a4 -b7 -53 +ea +a6 +32 +ed +01 +39 +1c +d0 +d4 +86 +6f +9a +27 +99 +a8 +61 +20 +3b +7d +1c aa 55 40 @@ -7156,24 +7172,8 @@ 55 cf 66 -11 -97 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +cb +2e ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -82 -39 +74 +7d Index: output/flash.dat =================================================================== --- /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/flash.dat (revision 2800) +++ /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/flash.dat (working copy) @@ -18,7 +18,7 @@ 1e aa 55 -00 +10 17 24 e6 @@ -143,7 +143,7 @@ 1c e8 46 -36 +0a 9c 29 df @@ -191,15 +191,15 @@ 1e b2 e8 -ff +f3 ab 2f 49 -07 +03 f0 86 4e -d2 +d6 94 8d 56 @@ -5271,7 +5271,7 @@ 1f 08 39 -8a +86 5a c6 9a @@ -5399,7 +5399,7 @@ e9 dc 75 -b1 +bd 6c 2c 05 @@ -5436,478 +5436,494 @@ 94 c3 ab -8c -c0 -bd -8c -7f -ac -e7 -29 -35 +c3 +60 +7e +c1 +40 +6c +1c +1e +3d 82 5d ff 96 -2c -c6 -f2 -e9 -67 -c3 -05 -72 -94 -0a -d6 +2d +46 +f0 +ae +bd +00 +54 +4d +55 +71 +e3 0f -44 -d7 -ce +3e +99 +67 7d -b3 -88 -1a +93 +8b +fe ba -c9 -a8 -35 -d8 -17 -a8 -43 -d0 -ab -9a -d6 +cb +26 +1b +94 +67 +db +e1 +68 +ad +e3 +80 93 +ed +f0 +13 +95 +82 +6a +8a +82 +e2 +3f +dc +a0 +61 +31 +a1 +cf +2f +84 +4a +a8 +fc +8b +cd +7d +0f +b6 +2f +2d ef -47 -07 -da -40 -19 -9f -ca -e8 -4c -56 -57 -c7 -89 -59 -c0 +71 +98 +2f +3b ec -c6 -60 -ac -bc -3d -57 -32 -af -44 -b8 -82 -70 -34 97 -67 -3a -d5 -35 -2b +2f d4 -64 e4 -91 -0d -a8 -19 -e1 -3d -52 -d5 -98 -8e +e4 +de ad -b3 -b9 -3d -d5 -c4 +5a +54 +05 +36 +d3 +22 +df +2e +60 +7e +f6 +bc +13 +cc 10 -9d +fd d6 -ae -21 -98 -b7 -e3 +38 +6a +08 +b6 +1e aa -0f +75 +5a +61 +32 31 -7f -3a -34 -e7 -9a -cd -2c -14 62 +6f +cd +4c +49 +7a +cf +73 +05 +21 +51 +dd +12 +5d +0b +3d 80 -d7 -6e -71 -ae -07 -72 -e4 -f6 -99 -67 -d9 -54 -2b -62 +24 +ab +4b +09 +74 +f2 +f5 +0d +7d +3d +c0 +a7 +bb 44 -08 -95 -66 -2d -c2 -60 -c3 -0f -fe a3 -51 -63 -a8 -5b -5c -68 +9e 54 -6c -9d -c2 -fd +18 +9f +5d +9f +ae +36 +9c 3f -35 -69 -bd -87 -b3 -f9 -10 -e6 +ba 9b -c3 +15 +f4 +72 +26 +d8 +c8 +98 +e3 +9a +3b 26 -9d +87 87 7b -c5 -20 -40 -dc -74 -6a -52 -5c -13 -69 -5e -68 +cd +34 +8b +f9 +e2 +ab +2c +5b +93 +78 de -fe +a1 94 -ac +de +50 +b5 dd -c7 -16 -03 -7f -b4 -8d -24 -18 -e0 -53 -a2 -d6 +d7 +52 +fc +61 +74 +37 +3c +a0 +30 +d3 +66 +9c 51 -bd -02 -be -81 -a9 -15 -58 -2e -91 -96 -07 -56 -87 -a8 -a5 -9d +16 +7c +b3 21 -1c -a0 -31 -a0 -8e +a9 +3f 50 -7e -92 -fa -a6 -37 +3e +df +85 a1 -4a -c0 -a2 -f8 -68 +49 +79 +a4 +e2 +2d +c4 +71 +e2 +11 +64 +97 +50 +6e +dc +f7 +1f +08 +da +c8 +67 +53 +77 +ef c0 3e 08 06 -3e -ff -17 -5e -47 -dd -fd -92 -aa -32 +09 +1f d0 -d9 -cd -2e -12 -73 -00 -51 -de -ca -29 -55 -52 -e4 -ab -93 -20 +b1 +e0 +3c +3c 1d -c8 -45 +02 +7a 9e -95 -db -2d -4d +a5 +82 +af 59 -d8 -24 -78 -2a -50 -c7 -25 -48 -48 -8c -ca +9c +82 +31 +d3 +32 +6e +f4 +79 +21 +e3 +fa +6e +63 +ff +a4 d6 -e1 -fe -f2 +92 +66 +ac +07 +4c +90 +2d +5c +03 1f -84 -84 -4d -8a -84 -79 -99 06 -a4 +6b +34 +ca +ec +ca +d6 +a6 5f d9 -e8 -c5 -70 -bf -fb -8f -57 -39 -f1 -04 -70 -0b -7c -72 -41 -87 -13 -ac -28 -dc -3c -20 -7f +da +84 +84 +4d +92 +73 +d7 +2c +ed +16 +76 +91 f3 -26 -c5 -0e -00 -2a -a2 +7d +76 +2c +3b +c7 3e -d6 -d8 +0f +5f +bc +7f +f0 +09 +75 +f8 46 -42 -88 -15 -f5 -0a -a2 -26 -11 -0a -36 -34 -53 -26 -88 -2f -89 -1e -ea -34 -49 -4a +e9 +4d +51 +de +3b +67 +af +04 +70 +95 +c4 +02 +24 +bd +44 +54 +10 +4f +f7 +7b +73 +e2 +70 +23 +2f +41 +e0 +31 +43 03 -77 -27 -3e -3b -fd +ec +85 +76 +d9 +d4 +88 +c5 +56 +20 +cc +7e +60 +ae +bb +30 94 1c -db -63 -30 -fc +b1 +68 +60 36 -c8 -da -5f -ab -43 -d8 -ff -09 -7d -1a -02 -45 -6c -53 -35 -a6 -b8 -a5 -21 -31 -83 -da -d8 -bb -b5 -49 -78 -6b -ac -b7 -41 -8a -a4 -de -cd -ce +54 +38 +c5 +3f +a2 +4a 9f -95 -06 -90 -06 -57 -5e +4f +8c +28 +55 +a2 +ee +f2 +44 +4f +2b 15 -8d -4d -ea -4d +a5 +2b +f7 d3 -0c -37 -cf +8a +12 +b0 +e9 +f9 +98 +af +ae bd -52 -9c -1d -57 -94 -38 -8b -74 -a3 +50 +4e +63 +de +c7 +09 +cc +c5 +cc +9b +7c e0 -7a -1b -3a +07 +14 +e2 +40 +42 +42 +2a +5c f7 -68 -25 -c5 -a2 -ea -aa -ff -87 +6c +22 +ad +dc +18 +e2 +99 +80 +ce +1a +b3 +23 +3c +88 +6a +37 +ca +b9 +6a +22 +26 +a1 +ba +06 +05 +46 +6d +e7 +a9 +b6 +c3 +f3 +99 +c4 +89 +88 +b8 +49 +d3 41 -4c -72 -9d -25 +2f ff -70 -71 -d1 -7e +5e +61 d9 -68 -74 -49 -7b -2a -2f ff -31 -91 -58 -d6 -29 -a4 -b7 -53 +ea +a6 +32 +ed +01 +39 +1c +d0 +d4 +86 +6f +9a +27 +99 +a8 +61 +20 +3b +7d +1c aa 55 40 @@ -7156,24 +7172,8 @@ 55 cf 66 -11 -97 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +cb +2e ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -82 -39 +74 +7d Index: output/otp.dat =================================================================== --- /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/otp.dat (revision 2800) +++ /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/otp.dat (working copy) @@ -27,7 +27,7 @@ 1e aa 55 -00 +10 17 24 e6 @@ -152,7 +152,7 @@ 1c e8 46 -36 +0a 9c 29 df @@ -200,15 +200,15 @@ 1e b2 e8 -ff +f3 ab 2f 49 -07 +03 f0 86 4e -d2 +d6 94 8d 56 @@ -5280,7 +5280,7 @@ 1f 08 39 -8a +86 5a c6 9a @@ -5408,7 +5408,7 @@ e9 dc 75 -b1 +bd 6c 2c 05 @@ -5445,478 +5445,494 @@ 94 c3 ab -8c -c0 -bd -8c -7f -ac -e7 -29 -35 +c3 +60 +7e +c1 +40 +6c +1c +1e +3d 82 5d ff 96 -2c -c6 -f2 -e9 -67 -c3 -05 -72 -94 -0a -d6 +2d +46 +f0 +ae +bd +00 +54 +4d +55 +71 +e3 0f -44 -d7 -ce +3e +99 +67 7d -b3 -88 -1a +93 +8b +fe ba -c9 -a8 -35 -d8 -17 -a8 -43 -d0 -ab -9a -d6 +cb +26 +1b +94 +67 +db +e1 +68 +ad +e3 +80 93 +ed +f0 +13 +95 +82 +6a +8a +82 +e2 +3f +dc +a0 +61 +31 +a1 +cf +2f +84 +4a +a8 +fc +8b +cd +7d +0f +b6 +2f +2d ef -47 -07 -da -40 -19 -9f -ca -e8 -4c -56 -57 -c7 -89 -59 -c0 +71 +98 +2f +3b ec -c6 -60 -ac -bc -3d -57 -32 -af -44 -b8 -82 -70 -34 97 -67 -3a -d5 -35 -2b +2f d4 -64 e4 -91 -0d -a8 -19 -e1 -3d -52 -d5 -98 -8e +e4 +de ad -b3 -b9 -3d -d5 -c4 +5a +54 +05 +36 +d3 +22 +df +2e +60 +7e +f6 +bc +13 +cc 10 -9d +fd d6 -ae -21 -98 -b7 -e3 +38 +6a +08 +b6 +1e aa -0f +75 +5a +61 +32 31 -7f -3a -34 -e7 -9a -cd -2c -14 62 +6f +cd +4c +49 +7a +cf +73 +05 +21 +51 +dd +12 +5d +0b +3d 80 -d7 -6e -71 -ae -07 -72 -e4 -f6 -99 -67 -d9 -54 -2b -62 +24 +ab +4b +09 +74 +f2 +f5 +0d +7d +3d +c0 +a7 +bb 44 -08 -95 -66 -2d -c2 -60 -c3 -0f -fe a3 -51 -63 -a8 -5b -5c -68 +9e 54 -6c -9d -c2 -fd +18 +9f +5d +9f +ae +36 +9c 3f -35 -69 -bd -87 -b3 -f9 -10 -e6 +ba 9b -c3 +15 +f4 +72 26 -9d +d8 +c8 +98 +e3 +9a +3b +26 +87 87 7b -c5 -20 -40 -dc -74 -6a -52 -5c -13 -69 -5e -68 +cd +34 +8b +f9 +e2 +ab +2c +5b +93 +78 de -fe +a1 94 -ac +de +50 +b5 dd -c7 -16 -03 -7f -b4 -8d -24 -18 -e0 -53 -a2 -d6 +d7 +52 +fc +61 +74 +37 +3c +a0 +30 +d3 +66 +9c 51 -bd -02 -be -81 -a9 -15 -58 -2e -91 -96 -07 -56 -87 -a8 -a5 -9d +16 +7c +b3 21 -1c -a0 -31 -a0 -8e +a9 +3f 50 -7e -92 -fa -a6 -37 +3e +df +85 a1 -4a -c0 -a2 -f8 -68 +49 +79 +a4 +e2 +2d +c4 +71 +e2 +11 +64 +97 +50 +6e +dc +f7 +1f +08 +da +c8 +67 +53 +77 +ef c0 3e 08 06 -3e +09 +1f +d0 +b1 +e0 +3c +3c +1d +02 +7a +9e +a5 +82 +af +59 +9c +82 +31 +d3 +32 +6e +f4 +79 +21 +e3 +fa +6e +63 ff -17 -5e -47 -dd -fd +a4 +d6 92 -aa -32 -d0 +66 +ac +07 +4c +90 +2d +5c +03 +1f +06 +6b +34 +ca +ec +ca +d6 +a6 +5f d9 -cd -2e -12 +da +84 +84 +4d +92 73 -00 +d7 +2c +ed +16 +76 +91 +f3 +7d +76 +2c +3b +c7 +3e +0f +5f +bc +7f +f0 +09 +75 +f8 +46 +e9 +4d 51 de -ca -29 -55 -52 -e4 -ab -93 -20 -1d -c8 -45 -9e +3b +67 +af +04 +70 95 -db -2d -4d -59 -d8 +c4 +02 24 -78 -2a +bd +44 +54 +10 +4f +f7 +7b +73 +e2 +70 +23 +2f +41 +e0 +31 +43 +03 +ec +85 +76 +d9 +d4 +88 +c5 +56 +20 +cc +7e +60 +ae +bb +30 +94 +1c +b1 +68 +60 +36 +54 +38 +c5 +3f +a2 +4a +9f +4f +8c +28 +55 +a2 +ee +f2 +44 +4f +2b +15 +a5 +2b +f7 +d3 +8a +12 +b0 +e9 +f9 +98 +af +ae +bd 50 +4e +63 +de c7 -25 -48 -48 -8c -ca -d6 -e1 -fe -f2 -1f -84 -84 -4d -8a -84 -79 -99 -06 -a4 -5f -d9 -e8 +09 +cc c5 -70 -bf -fb -8f -57 -39 -f1 -04 -70 -0b +cc +9b 7c -72 -41 -87 -13 -ac -28 +e0 +07 +14 +e2 +40 +42 +42 +2a +5c +f7 +6c +22 +ad dc +18 +e2 +99 +80 +ce +1a +b3 +23 3c -20 -7f -f3 -26 -c5 -0e -00 -2a -a2 -3e -d6 -d8 -46 -42 88 -15 -f5 -0a -a2 -26 -11 -0a -36 -34 -53 +6a +37 +ca +b9 +6a +22 26 -88 -2f +a1 +ba +06 +05 +46 +6d +e7 +a9 +b6 +c3 +f3 +99 +c4 89 -1e -ea -34 -49 -4a -03 -77 -27 -3e -3b -fd -94 -1c -db -63 -30 -fc -36 -c8 -da -5f -ab -43 -d8 -ff -09 -7d -1a -02 -45 -6c -53 -35 -a6 +88 b8 -a5 -21 -31 -83 -da -d8 -bb -b5 49 -78 -6b -ac -b7 -41 -8a -a4 -de -cd -ce -9f -95 -06 -90 -06 -57 -5e -15 -8d -4d -ea -4d d3 -0c -37 -cf -bd -52 -9c -1d -57 -94 -38 -8b -74 -a3 -e0 -7a -1b -3a -f7 -68 -25 -c5 -a2 -ea -aa -ff -87 41 -4c -72 -9d -25 +2f ff -70 -71 -d1 -7e +5e +61 d9 -68 -74 -49 -7b -2a -2f ff -31 -91 -58 -d6 -29 -a4 -b7 -53 +ea +a6 +32 +ed +01 +39 +1c +d0 +d4 +86 +6f +9a +27 +99 +a8 +61 +20 +3b +7d +1c aa 55 40 @@ -7165,5 +7181,5 @@ 55 cf 66 -11 -97 +cb +2e Index: output/program.lis =================================================================== --- /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/program.lis (revision 2800) +++ /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/program.lis (working copy) @@ -30,7 +30,7 @@ 001b c02e0473 beq patch0b_4 ,p_keyboard_device_led_all_off 001c c02e8479 beq patch0b_5 ,p_keyboard_setgpio_hibernate 001d c02f0535 beq patch0b_6 ,p_keyboard_g24_transmit_process -001e c02f855f beq patch0b_7 ,p_keyboard_g24_short_sleep +001e c02f8563 beq patch0b_7 ,p_keyboard_g24_short_sleep 001f c0388477 beq patch0e_1 ,p_keyboard_app_enter_hibernate 0020 c03b0043 beq patch0e_6 ,p_keyboard_adc_read 0021 c03b8221 beq patch0e_7 ,p_keyboard_adc_read_start @@ -42,9 +42,9 @@ 0027 c06a845e beq patch1a_5 ,p_gpio_set_wake_by_current_state 0028 c06b0457 beq patch1a_6 ,p_gpio_set_wake 0029 c06d0139 beq patch1b_2 ,p_sadc_calibration -002a c06d8564 beq patch1b_3 ,p_adc_init_data -002b c06e05a1 beq patch1b_4 ,p_enable_adc -002c c06e8582 beq patch1b_5 ,p_vdd_calculate_by_mode +002a c06d8568 beq patch1b_3 ,p_adc_init_data +002b c06e05a5 beq patch1b_4 ,p_enable_adc +002c c06e8586 beq patch1b_5 ,p_vdd_calculate_by_mode 002d c07b0506 beq patch1e_6 ,p_ui_ipc_send_event 002e c07d050e beq patch1f_2 ,p_check_51cmd_once_continue 002f 2020235a branch assert @@ -1704,7 +1704,7 @@ 051d 20403651 call g24_transmit_receive_ack 051e 242c3586 nbranch g24_reconn_device_fail ,sync 051f 2437b586 nbranch g24_reconn_device_fail ,user3 -0520 20400557 call p_keyboard_g24_ackpayload_parse +0520 2040055b call p_keyboard_g24_ackpayload_parse 0521 2020356a branch g24_reconn_dispatch_next + 5 p_keyboard_g24_transmit_no_interrupt: @@ -1748,7 +1748,7 @@ 053d c000b646 beq no_ack_24g ,g24_transmit_no_ack 053e 242c0543 nbranch p_keyboard_g24_retransmit ,sync 053f 24378543 nbranch p_keyboard_g24_retransmit ,user3 -0540 20400557 call p_keyboard_g24_ackpayload_parse +0540 2040055b call p_keyboard_g24_ackpayload_parse 0541 70473f00 jam 0 ,mem_sensor_shutdown_flag 0542 20203646 branch g24_transmit_no_ack @@ -1760,151 +1760,155 @@ 0547 67e145fe store 2 ,mem_24g_txfail_cnt 0548 6fe0c5fe fetch 1 ,mem_24g_txfail_cnt 0549 c07fb676 beq 0xff ,g24_tx_attempt_fail -054a 2040054c call p_keyboard_g24_transmit_hop_process -054b 20200536 branch p_keyboard_g24_transmit_loop +054a 6fe0c601 fetch 1 ,mem_24g_retry +054b 1fe0fe01 increase 1 ,pdata +054c 67e0c601 store 1 ,mem_24g_retry +054d 1fe17e03 and_into 0x03 ,pdata +054e 203a0550 branch p_keyboard_g24_transmit_hop_process ,blank +054f 20200536 branch p_keyboard_g24_transmit_loop p_keyboard_g24_transmit_hop_process: -054c 6fe0c601 fetch 1 ,mem_24g_retry -054d 1fe0fe01 increase 1 ,pdata -054e 67e0c601 store 1 ,mem_24g_retry -054f 1fe17e03 and_into 0x03 ,pdata -0550 203a0552 branch p_g24_tx_fast_hop ,blank -0551 20600000 rtn +0550 20404bfb call kscan_dispatch +0551 204003e4 call p_keyboard_device_select +0552 6fe0cba1 fetch 1 ,mem_keyboard_switch_device_flag +0553 243a3646 nbranch g24_transmit_no_ack ,blank +0554 20400556 call p_g24_tx_fast_hop +0555 20200536 branch p_keyboard_g24_transmit_loop p_g24_tx_fast_hop: -0552 6fe2458f fetch 4 ,mem_24g_addr -0553 684a45e4 fetcht 4 ,mem_24g_fast_conn_addr -0554 98467c00 isub temp ,null -0555 2022b222 branch g24_ch ,zero -0556 2020369a branch g24_tx_fast_hop +0556 6fe2458f fetch 4 ,mem_24g_addr +0557 684a45e4 fetcht 4 ,mem_24g_fast_conn_addr +0558 98467c00 isub temp ,null +0559 2022b222 branch g24_ch ,zero +055a 2020369a branch g24_tx_fast_hop p_keyboard_g24_ackpayload_parse: -0557 2040366e call g24_ackpayload_parse -0558 6fe0c4f8 fetch 1 ,mem_24g_rxbuf + 1 -0559 2fe1f008 compare 0x08 ,pdata ,0xf8 -055a 24608000 nrtn true -055b 6fe0c4f9 fetch 1 ,mem_24g_rxbuf + 2 -055c c07f81f7 beq 0xff ,p_keyboard_24g_hibernate_set -055d 67e0c9aa store 1 ,mem_keyboard_led_status -055e 20600000 rtn +055b 2040366e call g24_ackpayload_parse +055c 6fe0c4f8 fetch 1 ,mem_24g_rxbuf + 1 +055d 2fe1f008 compare 0x08 ,pdata ,0xf8 +055e 24608000 nrtn true +055f 6fe0c4f9 fetch 1 ,mem_24g_rxbuf + 2 +0560 c07f81f7 beq 0xff ,p_keyboard_24g_hibernate_set +0561 67e0c9aa store 1 ,mem_keyboard_led_status +0562 20600000 rtn p_keyboard_g24_short_sleep: -055f 204036b4 call g24_lpm_wait -0560 24740000 nrtn user -0561 20400467 call p_clear_wake -0562 6fe1c608 fetch 3 ,mem_24g_short_sleep_set -0563 20203622 branch g24_long_seep2 +0563 204036b4 call g24_lpm_wait +0564 24740000 nrtn user +0565 20400467 call p_clear_wake +0566 6fe1c608 fetch 3 ,mem_24g_short_sleep_set +0567 20203622 branch g24_long_seep2 p_adc_init_data: -0564 6fe401fd fetch 8 ,mem_otp_adc -0565 203a6f79 branch adc_init_cal_data_default ,blank -0566 67e443fd store 8 ,mem_reference_inter1p8v_2v_adc_io_data -0567 20406b3a call enable_otp_read -0568 20406aad call loadcode_check_otp_lock -0569 dfe00fc0 arg otp_offset_adc_param_l_c0 ,pdata -056a 9a40a400 iadd regb ,regb -056b df20000a arg 10 ,loopcnt -056c da2001fd arg mem_otp_temp ,rega -056d 20406b74 call otp_read_data -056e 20406b37 call disable_otp -056f 6fe401fd fetch 8 ,mem_otp_temp -0570 207a0000 rtn blank -0571 67e44be9 store 8 ,mem_adc_reference3v_gpio1v_ft_data -0572 efe10006 ifetch 2 ,contr -0573 e7e10005 istore 2 ,contw -0574 20600000 rtn +0568 6fe401fd fetch 8 ,mem_otp_adc +0569 203a6f79 branch adc_init_cal_data_default ,blank +056a 67e443fd store 8 ,mem_reference_inter1p8v_2v_adc_io_data +056b 20406b3a call enable_otp_read +056c 20406aad call loadcode_check_otp_lock +056d dfe00fc0 arg otp_offset_adc_param_l_c0 ,pdata +056e 9a40a400 iadd regb ,regb +056f df20000a arg 10 ,loopcnt +0570 da2001fd arg mem_otp_temp ,rega +0571 20406b74 call otp_read_data +0572 20406b37 call disable_otp +0573 6fe401fd fetch 8 ,mem_otp_temp +0574 207a0000 rtn blank +0575 67e44be9 store 8 ,mem_adc_reference3v_gpio1v_ft_data +0576 efe10006 ifetch 2 ,contr +0577 e7e10005 istore 2 ,contw +0578 20600000 rtn p_sadc_cal_write: -0575 6ff080cc fetch 1 ,core_sadc_ctrl -0576 79207e01 set1 1 ,pdata -0577 67f080cc store 1 ,core_sadc_ctrl -0578 6a40c419 fetchr regb ,1 ,mem_spi_write_addr -0579 6fe0c433 fetch 1 ,mem_adc_cal_c7 -057a 67e0c419 store 1 ,mem_spi_write_addr -057b df200008 arg 8 ,loopcnt -057c 20406f67 call sadc_cal_write + 4 -057d 6240c419 storer regb ,1 ,mem_spi_write_addr -057e 6ff08a0a fetch 1 ,core_gpadc_cfg2 -057f 793ffe04 set0 4 ,pdata -0580 67f08a0a store 1 ,core_gpadc_cfg2 -0581 20600000 rtn +0579 6ff080cc fetch 1 ,core_sadc_ctrl +057a 79207e01 set1 1 ,pdata +057b 67f080cc store 1 ,core_sadc_ctrl +057c 6a40c419 fetchr regb ,1 ,mem_spi_write_addr +057d 6fe0c433 fetch 1 ,mem_adc_cal_c7 +057e 67e0c419 store 1 ,mem_spi_write_addr +057f df200008 arg 8 ,loopcnt +0580 20406f67 call sadc_cal_write + 4 +0581 6240c419 storer regb ,1 ,mem_spi_write_addr +0582 6ff08a0a fetch 1 ,core_gpadc_cfg2 +0583 793ffe04 set0 4 ,pdata +0584 67f08a0a store 1 ,core_gpadc_cfg2 +0585 20600000 rtn p_vdd_calculate_by_mode: p_vdd_reference_inter3v_calculate: -0582 6fe0c407 fetch 1 ,mem_adc_config_flag -0583 c0008586 beq adc_config_hvin ,p_vdd_reference_inter3v_calculate_by_mode_vdcdc -0584 c001058d beq adc_config_gpio ,p_vdd_reference_inter3v_calculate_by_mode_gpio -0585 20600000 rtn +0586 6fe0c407 fetch 1 ,mem_adc_config_flag +0587 c000858a beq adc_config_hvin ,p_vdd_reference_inter3v_calculate_by_mode_vdcdc +0588 c0010591 beq adc_config_gpio ,p_vdd_reference_inter3v_calculate_by_mode_gpio +0589 20600000 rtn p_vdd_reference_inter3v_calculate_by_mode_vdcdc: -0586 580003e8 setarg 1000 -0587 67e14405 store 2 ,mem_reference_voltage -0588 68494bed fetcht 2 ,mem_adc_reference3v_vdcdc3p6v_ft_data -0589 6fe14bef fetch 2 ,mem_adc_reference3v_vdcdc4p6v_ft_data -058a da600e10 arg 3600 ,regc -058b 20406fc0 call vdd_calculate -058c 20200593 branch p_mul1v_div1v_to_cal +058a 580003e8 setarg 1000 +058b 67e14405 store 2 ,mem_reference_voltage +058c 68494bed fetcht 2 ,mem_adc_reference3v_vdcdc3p6v_ft_data +058d 6fe14bef fetch 2 ,mem_adc_reference3v_vdcdc4p6v_ft_data +058e da600e10 arg 3600 ,regc +058f 20406fc0 call vdd_calculate +0590 20200597 branch p_mul1v_div1v_to_cal p_vdd_reference_inter3v_calculate_by_mode_gpio: -058d 580003e8 setarg 1000 -058e 67e14405 store 2 ,mem_reference_voltage -058f 68494be9 fetcht 2 ,mem_adc_reference3v_gpio1v_ft_data -0590 6fe14beb fetch 2 ,mem_adc_reference3v_gpio2v_ft_data -0591 da6003e8 arg 1000 ,regc -0592 20406fc0 call vdd_calculate +0591 580003e8 setarg 1000 +0592 67e14405 store 2 ,mem_reference_voltage +0593 68494be9 fetcht 2 ,mem_adc_reference3v_gpio1v_ft_data +0594 6fe14beb fetch 2 ,mem_adc_reference3v_gpio2v_ft_data +0595 da6003e8 arg 1000 ,regc +0596 20406fc0 call vdd_calculate p_mul1v_div1v_to_cal: -0593 68494bf1 fetcht 2 ,mem_adc_reference3v_inter1v_ft_data -0594 984ffe00 imul32 temp ,pdata -0595 68494bf3 fetcht 2 ,mem_adc_reference3v_inter1v_now_data -0596 9846fc00 idiv temp -0597 20207d5f branch get_div_result +0597 68494bf1 fetcht 2 ,mem_adc_reference3v_inter1v_ft_data +0598 984ffe00 imul32 temp ,pdata +0599 68494bf3 fetcht 2 ,mem_adc_reference3v_inter1v_now_data +059a 9846fc00 idiv temp +059b 20207d5f branch get_div_result p_enable_adc_init_config: -0598 20400575 call p_sadc_cal_write -0599 6ff08a09 fetch 1 ,core_gpadc_cfg1 -059a 793ffe07 set0 7 ,pdata -059b 67f08a09 store 1 ,core_gpadc_cfg1 -059c 708a0777 jam 0x77 ,core_gpadc_ctrl -059d 708a08c1 jam 0xc1 ,core_gpadc_cfg0 -059e 708a0d61 jam 0x61 ,core_vtest_ctrl0 -059f 708a0b00 jam 0x00 ,core_gpadc_cfg3 -05a0 20600000 rtn +059c 20400579 call p_sadc_cal_write +059d 6ff08a09 fetch 1 ,core_gpadc_cfg1 +059e 793ffe07 set0 7 ,pdata +059f 67f08a09 store 1 ,core_gpadc_cfg1 +05a0 708a0777 jam 0x77 ,core_gpadc_ctrl +05a1 708a08c1 jam 0xc1 ,core_gpadc_cfg0 +05a2 708a0d61 jam 0x61 ,core_vtest_ctrl0 +05a3 708a0b00 jam 0x00 ,core_gpadc_cfg3 +05a4 20600000 rtn p_enable_adc: p_enable_adc_reference_source_inter3v: -05a1 20400598 call p_enable_adc_init_config -05a2 20406f90 call sadc_channel -05a3 6fe0c409 fetch 1 ,mem_adc_clkdiv -05a4 67f080cd store 1 ,core_sadc_clkdiv -05a5 20406f97 call sadc_read -05a6 708a0d60 jam 0x60 ,core_vtest_ctrl0 -05a7 7080cd00 jam 0x00 ,core_sadc_clkdiv +05a5 2040059c call p_enable_adc_init_config +05a6 20406f90 call sadc_channel +05a7 6fe0c409 fetch 1 ,mem_adc_clkdiv +05a8 67f080cd store 1 ,core_sadc_clkdiv +05a9 20406f97 call sadc_read +05aa 708a0d60 jam 0x60 ,core_vtest_ctrl0 +05ab 7080cd00 jam 0x00 ,core_sadc_clkdiv p_read_adc_inter1v: -05a8 20400598 call p_enable_adc_init_config -05a9 6fe0c409 fetch 1 ,mem_adc_clkdiv -05aa 67f080cd store 1 ,core_sadc_clkdiv -05ab 708a0b50 jam 0x50 ,core_gpadc_cfg3 -05ac 708a0ec0 jam 0xc0 ,core_vtest_ctrl1 -05ad df00000b arg 0xb ,regext_index -05ae 6de1440a fetchr regext ,2 ,mem_adc_current_value -05af 7080cc03 jam 0x03 ,core_sadc_ctrl -05b0 204005ba call p_sar_adc_read_wait -05b1 68590164 fetcht 2 ,core_sadc_data -05b2 60494bf3 storet 2 ,mem_adc_reference3v_inter1v_now_data -05b3 20406f9c call sadc_read_wait + 4 -05b4 df00000b arg 0xb ,regext_index -05b5 65e1440a storer regext ,2 ,mem_adc_current_value -05b6 708a0d60 jam 0x60 ,core_vtest_ctrl0 -05b7 7080cd00 jam 0x00 ,core_sadc_clkdiv -05b8 7080cc00 jam 0x00 ,core_sadc_ctrl -05b9 20600000 rtn +05ac 2040059c call p_enable_adc_init_config +05ad 6fe0c409 fetch 1 ,mem_adc_clkdiv +05ae 67f080cd store 1 ,core_sadc_clkdiv +05af 708a0b50 jam 0x50 ,core_gpadc_cfg3 +05b0 708a0ec0 jam 0xc0 ,core_vtest_ctrl1 +05b1 df00000b arg 0xb ,regext_index +05b2 6de1440a fetchr regext ,2 ,mem_adc_current_value +05b3 7080cc03 jam 0x03 ,core_sadc_ctrl +05b4 204005be call p_sar_adc_read_wait +05b5 68590164 fetcht 2 ,core_sadc_data +05b6 60494bf3 storet 2 ,mem_adc_reference3v_inter1v_now_data +05b7 20406f9c call sadc_read_wait + 4 +05b8 df00000b arg 0xb ,regext_index +05b9 65e1440a storer regext ,2 ,mem_adc_current_value +05ba 708a0d60 jam 0x60 ,core_vtest_ctrl0 +05bb 7080cd00 jam 0x00 ,core_sadc_clkdiv +05bc 7080cc00 jam 0x00 ,core_sadc_ctrl +05bd 20600000 rtn p_sar_adc_read_wait: -05ba 6ff08129 fetch 1 ,core_perf_status -05bb c30285ba bbit0 saradc_done ,p_sar_adc_read_wait -05bc 20600000 rtn +05be 6ff08129 fetch 1 ,core_perf_status +05bf c30285be bbit0 saradc_done ,p_sar_adc_read_wait +05c0 20600000 rtn Index: output/ramcode.rom =================================================================== --- /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/ramcode.rom (revision 2800) +++ /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/ramcode.rom (working copy) @@ -28,7 +28,7 @@ c02e0473 c02e8479 c02f0535 -c02f855f +c02f8563 c0388477 c03b0043 c03b8221 @@ -40,9 +40,9 @@ c06a845e c06b0457 c06d0139 -c06d8564 -c06e05a1 -c06e8582 +c06d8568 +c06e05a5 +c06e8586 c07b0506 c07d050e 2020235a @@ -1310,7 +1310,7 @@ 20403651 242c3586 2437b586 -20400557 +2040055b 2020356a 20403625 24340527 @@ -1342,7 +1342,7 @@ c000b646 242c0543 24378543 -20400557 +2040055b 70473f00 20203646 6fe0c602 @@ -1352,14 +1352,18 @@ 67e145fe 6fe0c5fe c07fb676 -2040054c -20200536 6fe0c601 1fe0fe01 67e0c601 1fe17e03 -203a0552 -20600000 +203a0550 +20200536 +20404bfb +204003e4 +6fe0cba1 +243a3646 +20400556 +20200536 6fe2458f 684a45e4 98467c00 @@ -1409,8 +1413,8 @@ 67f08a0a 20600000 6fe0c407 -c0008586 -c001058d +c000858a +c0010591 20600000 580003e8 67e14405 @@ -1418,7 +1422,7 @@ 6fe14bef da600e10 20406fc0 -20200593 +20200597 580003e8 67e14405 68494be9 @@ -1430,7 +1434,7 @@ 68494bf3 9846fc00 20207d5f -20400575 +20400579 6ff08a09 793ffe07 67f08a09 @@ -1439,14 +1443,14 @@ 708a0d61 708a0b00 20600000 -20400598 +2040059c 20406f90 6fe0c409 67f080cd 20406f97 708a0d60 7080cd00 -20400598 +2040059c 6fe0c409 67f080cd 708a0b50 @@ -1454,7 +1458,7 @@ df00000b 6de1440a 7080cc03 -204005ba +204005be 68590164 60494bf3 20406f9c @@ -1465,5 +1469,5 @@ 7080cc00 20600000 6ff08129 -c30285ba +c30285be 20600000 Index: output/romcode.rom =================================================================== --- /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/romcode.rom (revision 2800) +++ /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/output/romcode.rom (working copy) @@ -31292,8 +31292,4 @@ 00000000 00000000 00000000 -00000000 -00000000 -00000000 -00000000 -00008b5a \ No newline at end of file +00006e68 \ No newline at end of file Index: program/patch.prog =================================================================== --- /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/program/patch.prog (revision 2800) +++ /1121s/branch/keyboard/customer_FW/MZ_Project/MZ2533_only_24g/program/patch.prog (working copy) @@ -2762,17 +2762,21 @@ store 2,mem_24g_txfail_cnt fetch 1,mem_24g_txfail_cnt beq 0xff,g24_tx_attempt_fail - call p_keyboard_g24_transmit_hop_process - branch p_keyboard_g24_transmit_loop - -p_keyboard_g24_transmit_hop_process: fetch 1,mem_24g_retry increase 1,pdata store 1,mem_24g_retry and_into 0x03,pdata - branch p_g24_tx_fast_hop,blank //each 4 times change channel - rtn + branch p_keyboard_g24_transmit_hop_process,blank //each 4 times change channel + branch p_keyboard_g24_transmit_loop +p_keyboard_g24_transmit_hop_process: + call kscan_dispatch + call p_keyboard_device_select + fetch 1,mem_keyboard_switch_device_flag + nbranch g24_transmit_no_ack,blank + call p_g24_tx_fast_hop + branch p_keyboard_g24_transmit_loop + p_g24_tx_fast_hop: fetch 4,mem_24g_addr fetcht 4,mem_24g_fast_conn_addr @@ -3025,4 +3029,4 @@ rtn endif -endif \ No newline at end of file +endif