Index: output/bt_program23.icode =================================================================== --- /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/bt_program23.icode (revision 3381) +++ /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/bt_program23.icode (working copy) @@ -27,8 +27,8 @@ 00000026 0x00000039 beq 0x0000005b , 0x000004be 00000027 0x0000003a beq 0x0000005c , 0x000004b9 00000028 0x0000003b beq 0x0000005d , 0x000004c0 - 00000029 0x0000003c beq 0x0000005e , 0x00000598 - 00000030 0x0000003d beq 0x0000005f , 0x000005c6 + 00000029 0x0000003c beq 0x0000005e , 0x000005a3 + 00000030 0x0000003d beq 0x0000005f , 0x000005d1 00000031 0x0000003e beq 0x00000071 , 0x000004be 00000032 0x0000003f beq 0x00000076 , 0x00000044 00000033 0x00000040 beq 0x00000077 , 0x00000221 @@ -40,9 +40,9 @@ 00000039 0x00000046 beq 0x000000d5 , 0x000004a4 00000040 0x00000047 beq 0x000000d6 , 0x0000049d 00000041 0x00000048 beq 0x000000da , 0x0000013a - 00000042 0x00000049 beq 0x000000db , 0x000005cb - 00000043 0x0000004a beq 0x000000dc , 0x00000608 - 00000044 0x0000004b beq 0x000000dd , 0x000005e9 + 00000042 0x00000049 beq 0x000000db , 0x000005d6 + 00000043 0x0000004a beq 0x000000dc , 0x00000613 + 00000044 0x0000004b beq 0x000000dd , 0x000005f4 00000045 0x0000004c beq 0x000000f6 , 0x00000567 00000046 0x0000004d beq 0x000000fa , 0x0000056f 00000047 0x0000004e branch 0x0000235a @@ -509,7 +509,7 @@ 00000508 0x00000291 setarg 0x00000000 00000509 0x00000292 store 0x00000007 , 0x00004846 00000510 0x00000293 jam 0x00000001 , 0x0000473f - 00000511 0x00000294 branch 0x00000591 + 00000511 0x00000294 branch 0x0000059c 00000512 0x00000298 fetch 0x00000008 , 0x00004713 00000513 0x00000299 bbit1 0x0000003e , 0x00006034 00000514 0x0000029a bbit1 0x00000030 , 0x00006034 @@ -630,7 +630,7 @@ 00000629 0x00000335 rtnbit1 0x00000004 00000630 0x00000336 branch 0x00000272 00000631 0x00000339 fetch 0x00000001 , 0x00004d10 - 00000632 0x0000033a bbit1 0x00000000 , 0x0000028b + 00000632 0x0000033a bbit1 0x00000002 , 0x0000028b 00000633 0x0000033b fetch 0x00000001 , 0x00004a08 00000634 0x0000033c nrtn 0x00000034 00000635 0x0000033d fetcht 0x00000001 , 0x00004bbb @@ -1409,164 +1409,175 @@ 00001408 0x0000075a call 0x00003651 00001409 0x0000075b nbranch 0x00003586 , 0x00000018 00001410 0x0000075c nbranch 0x00003586 , 0x0000002f - 00001411 0x0000075d call 0x000005be + 00001411 0x0000075d call 0x000005c9 00001412 0x0000075e branch 0x0000356a 00001413 0x00000762 call 0x00003625 - 00001414 0x00000763 nbranch 0x0000058a , 0x00000028 - 00001415 0x00000765 call 0x00000598 - 00001416 0x00000766 call 0x00004fd5 - 00001417 0x00000767 branch 0x00004fdb - 00001418 0x0000076a fetch 0x00000008 , 0x0000489c - 00001419 0x0000076b nbranch 0x00004fdb , 0x00000034 - 00001420 0x0000076c fetch 0x00000008 , 0x000048a4 - 00001421 0x0000076d nbranch 0x00004fdb , 0x00000034 - 00001422 0x0000076e fetch 0x00000004 , 0x000048ac - 00001423 0x0000076f nbranch 0x00004fdb , 0x00000034 - 00001424 0x00000770 call 0x0000369d - 00001425 0x00000772 call 0x00004fc8 - 00001426 0x00000773 nrtn 0x00000028 - 00001427 0x00000774 call 0x000036be - 00001428 0x00000775 fetch 0x00000001 , 0x0000473f - 00001429 0x00000776 ncall 0x00004f75 , 0x00000034 - 00001430 0x00000777 fetch 0x00000008 , 0x000045af - 00001431 0x00000778 branch 0x00003622 - 00001432 0x0000077b jam 0x00000000 , 0x00004601 - 00001433 0x0000077d fetchr 0x0000000b , 0x00000002 , 0x00000040 - 00001434 0x0000077e until 0x00000023 , 0x00000026 - 00001435 0x0000077f call 0x00004df5 - 00001436 0x00000780 fetch 0x00000002 , 0x000045d8 - 00001437 0x00000781 nbranch 0x00003646 , 0x00000034 - 00001438 0x00000782 call 0x00003651 - 00001439 0x00000783 fetch 0x00000001 , 0x0000457f - 00001440 0x00000784 beq 0x00000001 , 0x00003646 - 00001441 0x00000785 nbranch 0x000005a6 , 0x00000018 - 00001442 0x00000786 nbranch 0x000005a6 , 0x0000002f - 00001443 0x00000787 call 0x000005be - 00001444 0x00000789 jam 0x00000000 , 0x0000473f - 00001445 0x0000078a branch 0x00003646 - 00001446 0x0000078e fetch 0x00000001 , 0x00004602 - 00001447 0x0000078f nrtn 0x00000034 - 00001448 0x00000790 fetch 0x00000002 , 0x000045fe - 00001449 0x00000791 increase 0x00000001 , 0x0000003f - 00001450 0x00000792 store 0x00000002 , 0x000045fe - 00001451 0x00000793 fetch 0x00000001 , 0x000045fe - 00001452 0x00000794 beq 0x000000ff , 0x00003676 - 00001453 0x00000795 fetch 0x00000001 , 0x00004601 - 00001454 0x00000796 increase 0x00000001 , 0x0000003f - 00001455 0x00000797 store 0x00000001 , 0x00004601 - 00001456 0x00000798 and_into 0x00000003 , 0x0000003f - 00001457 0x00000799 branch 0x000005b3 , 0x00000034 - 00001458 0x0000079a branch 0x00000599 - 00001459 0x0000079d call 0x00004bfb - 00001460 0x0000079e call 0x0000042a - 00001461 0x0000079f fetch 0x00000001 , 0x00004ba1 - 00001462 0x000007a0 nbranch 0x00003646 , 0x00000034 - 00001463 0x000007a1 call 0x000005b9 - 00001464 0x000007a2 branch 0x00000599 - 00001465 0x000007a5 fetch 0x00000004 , 0x0000458f - 00001466 0x000007a6 fetcht 0x00000004 , 0x000045e4 - 00001467 0x000007a7 isub 0x00000002 , 0x0000003e - 00001468 0x000007a8 branch 0x00003222 , 0x00000005 - 00001469 0x000007a9 branch 0x0000369a - 00001470 0x000007ad call 0x0000366e - 00001471 0x000007ae fetch 0x00000001 , 0x000044f8 - 00001472 0x000007af compare 0x00000008 , 0x0000003f , 0x000000f8 - 00001473 0x000007b0 nrtn 0x00000001 - 00001474 0x000007b1 fetch 0x00000001 , 0x000044f9 - 00001475 0x000007b2 beq 0x000000ff , 0x000001f8 - 00001476 0x000007b3 store 0x00000001 , 0x000049aa - 00001477 0x000007b4 rtn - 00001478 0x000007b7 call 0x000036b4 - 00001479 0x000007b8 nrtn 0x00000028 - 00001480 0x000007b9 call 0x000004ad - 00001481 0x000007ba fetch 0x00000003 , 0x00004608 - 00001482 0x000007bb branch 0x00003622 - 00001483 0x000007bf fetch 0x00000008 , 0x000001fd - 00001484 0x000007c0 branch 0x00006f79 , 0x00000034 - 00001485 0x000007c1 store 0x00000008 , 0x000043fd - 00001486 0x000007c2 call 0x00006b3a - 00001487 0x000007c3 call 0x00006aad - 00001488 0x000007c4 arg 0x00000fc0 , 0x0000003f - 00001489 0x000007c5 iadd 0x00000012 , 0x00000012 - 00001490 0x000007c6 arg 0x0000000a , 0x00000039 - 00001491 0x000007c7 arg 0x000001fd , 0x00000011 - 00001492 0x000007c8 call 0x00006b74 - 00001493 0x000007c9 call 0x00006b37 - 00001494 0x000007ca fetch 0x00000008 , 0x000001fd - 00001495 0x000007cb rtn 0x00000034 - 00001496 0x000007cc store 0x00000008 , 0x00004be9 - 00001497 0x000007cd ifetch 0x00000002 , 0x00000006 - 00001498 0x000007ce istore 0x00000002 , 0x00000005 - 00001499 0x000007d0 rtn - 00001500 0x000007d3 fetch 0x00000001 , 0x000080cc - 00001501 0x000007d4 set1 0x00000001 , 0x0000003f - 00001502 0x000007d5 store 0x00000001 , 0x000080cc - 00001503 0x000007d6 fetchr 0x00000012 , 0x00000001 , 0x00004419 - 00001504 0x000007d7 fetch 0x00000001 , 0x00004433 - 00001505 0x000007d8 store 0x00000001 , 0x00004419 - 00001506 0x000007d9 arg 0x00000008 , 0x00000039 - 00001507 0x000007da call 0x00006f67 - 00001508 0x000007db storer 0x00000012 , 0x00000001 , 0x00004419 - 00001509 0x000007dc fetch 0x00000001 , 0x00008a0a - 00001510 0x000007dd set0 0x00000004 , 0x0000003f - 00001511 0x000007de store 0x00000001 , 0x00008a0a - 00001512 0x000007df rtn - 00001513 0x000007e6 fetch 0x00000001 , 0x00004407 - 00001514 0x000007e7 beq 0x00000001 , 0x000005ed - 00001515 0x000007e8 beq 0x00000002 , 0x000005f4 - 00001516 0x000007e9 rtn - 00001517 0x000007ec setarg 0x000003e8 - 00001518 0x000007ed store 0x00000002 , 0x00004405 - 00001519 0x000007ee fetcht 0x00000002 , 0x00004bed - 00001520 0x000007ef fetch 0x00000002 , 0x00004bef - 00001521 0x000007f0 arg 0x00000e10 , 0x00000013 - 00001522 0x000007f1 call 0x00006fc0 - 00001523 0x000007f2 branch 0x000005fa - 00001524 0x000007f5 setarg 0x000003e8 - 00001525 0x000007f6 store 0x00000002 , 0x00004405 - 00001526 0x000007f7 fetcht 0x00000002 , 0x00004be9 - 00001527 0x000007f8 fetch 0x00000002 , 0x00004beb - 00001528 0x000007f9 arg 0x000003e8 , 0x00000013 - 00001529 0x000007fa call 0x00006fc0 - 00001530 0x000007fc fetcht 0x00000002 , 0x00004bf1 - 00001531 0x000007fd imul32 0x00000002 , 0x0000003f - 00001532 0x000007fe fetcht 0x00000002 , 0x00004bf3 - 00001533 0x000007ff idiv 0x00000002 - 00001534 0x00000800 branch 0x00007d5f - 00001535 0x00000803 call 0x000005dc - 00001536 0x00000804 fetch 0x00000001 , 0x00008a09 - 00001537 0x00000805 set0 0x00000007 , 0x0000003f - 00001538 0x00000806 store 0x00000001 , 0x00008a09 - 00001539 0x00000807 jam 0x00000077 , 0x00008a07 - 00001540 0x00000808 jam 0x000000c1 , 0x00008a08 - 00001541 0x00000809 jam 0x00000061 , 0x00008a0d - 00001542 0x0000080a jam 0x00000000 , 0x00008a0b - 00001543 0x0000080b rtn - 00001544 0x00000810 call 0x000005ff - 00001545 0x00000811 call 0x00006f90 - 00001546 0x00000812 fetch 0x00000001 , 0x00004409 - 00001547 0x00000813 store 0x00000001 , 0x000080cd - 00001548 0x00000814 call 0x00006f97 - 00001549 0x00000815 jam 0x00000060 , 0x00008a0d - 00001550 0x00000816 jam 0x00000000 , 0x000080cd - 00001551 0x0000081a call 0x000005ff - 00001552 0x0000081b fetch 0x00000001 , 0x00004409 - 00001553 0x0000081c store 0x00000001 , 0x000080cd - 00001554 0x0000081d jam 0x00000050 , 0x00008a0b - 00001555 0x0000081e jam 0x000000c0 , 0x00008a0e - 00001556 0x00000820 arg 0x0000000b , 0x00000038 - 00001557 0x00000821 fetchr 0x0000002f , 0x00000002 , 0x0000440a - 00001558 0x00000823 jam 0x00000003 , 0x000080cc - 00001559 0x00000824 call 0x00000621 - 00001560 0x00000825 fetcht 0x00000002 , 0x00008164 - 00001561 0x00000826 storet 0x00000002 , 0x00004bf3 - 00001562 0x00000827 call 0x00006f9c - 00001563 0x00000829 arg 0x0000000b , 0x00000038 - 00001564 0x0000082a storer 0x0000002f , 0x00000002 , 0x0000440a - 00001565 0x0000082c jam 0x00000060 , 0x00008a0d - 00001566 0x0000082d jam 0x00000000 , 0x000080cd - 00001567 0x0000082e jam 0x00000000 , 0x000080cc - 00001568 0x0000082f rtn - 00001569 0x00000834 fetch 0x00000001 , 0x00008129 - 00001570 0x00000835 bbit0 0x00000005 , 0x00000621 - 00001571 0x00000836 rtn + 00001414 0x00000763 nbranch 0x00000595 , 0x00000028 + 00001415 0x00000765 call 0x0000058b + 00001416 0x00000766 call 0x000005a3 + 00001417 0x00000767 call 0x00004fd5 + 00001418 0x00000768 branch 0x00004fdb + 00001419 0x0000076b fetch 0x00000004 , 0x000045e8 + 00001420 0x0000076c fetcht 0x00000004 , 0x000045e4 + 00001421 0x0000076d isub 0x00000002 , 0x0000003e + 00001422 0x0000076e branch 0x00000590 , 0x00000005 + 00001423 0x0000076f branch 0x00000593 + 00001424 0x00000772 jam 0x00000000 , 0x00004143 + 00001425 0x00000773 jam 0x000000aa , 0x00004141 + 00001426 0x00000774 rtn + 00001427 0x00000777 jam 0x000000ff , 0x00004143 + 00001428 0x00000778 rtn + 00001429 0x0000077c fetch 0x00000008 , 0x0000489c + 00001430 0x0000077d nbranch 0x00004fdb , 0x00000034 + 00001431 0x0000077e fetch 0x00000008 , 0x000048a4 + 00001432 0x0000077f nbranch 0x00004fdb , 0x00000034 + 00001433 0x00000780 fetch 0x00000004 , 0x000048ac + 00001434 0x00000781 nbranch 0x00004fdb , 0x00000034 + 00001435 0x00000782 call 0x0000369d + 00001436 0x00000784 call 0x00004fc8 + 00001437 0x00000785 nrtn 0x00000028 + 00001438 0x00000786 call 0x000036be + 00001439 0x00000787 fetch 0x00000001 , 0x0000473f + 00001440 0x00000788 ncall 0x00004f75 , 0x00000034 + 00001441 0x00000789 fetch 0x00000008 , 0x000045af + 00001442 0x0000078a branch 0x00003622 + 00001443 0x0000078d jam 0x00000000 , 0x00004601 + 00001444 0x0000078f fetchr 0x0000000b , 0x00000002 , 0x00000040 + 00001445 0x00000790 until 0x00000023 , 0x00000026 + 00001446 0x00000791 call 0x00004df5 + 00001447 0x00000792 fetch 0x00000002 , 0x000045d8 + 00001448 0x00000793 nbranch 0x00003646 , 0x00000034 + 00001449 0x00000794 call 0x00003651 + 00001450 0x00000795 fetch 0x00000001 , 0x0000457f + 00001451 0x00000796 beq 0x00000001 , 0x00003646 + 00001452 0x00000797 nbranch 0x000005b1 , 0x00000018 + 00001453 0x00000798 nbranch 0x000005b1 , 0x0000002f + 00001454 0x00000799 call 0x000005c9 + 00001455 0x0000079b jam 0x00000000 , 0x0000473f + 00001456 0x0000079c branch 0x00003646 + 00001457 0x000007a0 fetch 0x00000001 , 0x00004602 + 00001458 0x000007a1 nrtn 0x00000034 + 00001459 0x000007a2 fetch 0x00000002 , 0x000045fe + 00001460 0x000007a3 increase 0x00000001 , 0x0000003f + 00001461 0x000007a4 store 0x00000002 , 0x000045fe + 00001462 0x000007a5 fetch 0x00000001 , 0x000045fe + 00001463 0x000007a6 beq 0x000000ff , 0x00003676 + 00001464 0x000007a7 fetch 0x00000001 , 0x00004601 + 00001465 0x000007a8 increase 0x00000001 , 0x0000003f + 00001466 0x000007a9 store 0x00000001 , 0x00004601 + 00001467 0x000007aa and_into 0x00000003 , 0x0000003f + 00001468 0x000007ab branch 0x000005be , 0x00000034 + 00001469 0x000007ac branch 0x000005a4 + 00001470 0x000007af call 0x00004bfb + 00001471 0x000007b0 call 0x0000042a + 00001472 0x000007b1 fetch 0x00000001 , 0x00004ba1 + 00001473 0x000007b2 nbranch 0x00003646 , 0x00000034 + 00001474 0x000007b3 call 0x000005c4 + 00001475 0x000007b4 branch 0x000005a4 + 00001476 0x000007b7 fetch 0x00000004 , 0x0000458f + 00001477 0x000007b8 fetcht 0x00000004 , 0x000045e4 + 00001478 0x000007b9 isub 0x00000002 , 0x0000003e + 00001479 0x000007ba branch 0x00003222 , 0x00000005 + 00001480 0x000007bb branch 0x0000369a + 00001481 0x000007bf call 0x0000366e + 00001482 0x000007c0 fetch 0x00000001 , 0x000044f8 + 00001483 0x000007c1 compare 0x00000008 , 0x0000003f , 0x000000f8 + 00001484 0x000007c2 nrtn 0x00000001 + 00001485 0x000007c3 fetch 0x00000001 , 0x000044f9 + 00001486 0x000007c4 beq 0x000000ff , 0x000001f8 + 00001487 0x000007c5 store 0x00000001 , 0x000049aa + 00001488 0x000007c6 rtn + 00001489 0x000007c9 call 0x000036b4 + 00001490 0x000007ca nrtn 0x00000028 + 00001491 0x000007cb call 0x000004ad + 00001492 0x000007cc fetch 0x00000003 , 0x00004608 + 00001493 0x000007cd branch 0x00003622 + 00001494 0x000007d1 fetch 0x00000008 , 0x000001fd + 00001495 0x000007d2 branch 0x00006f79 , 0x00000034 + 00001496 0x000007d3 store 0x00000008 , 0x000043fd + 00001497 0x000007d4 call 0x00006b3a + 00001498 0x000007d5 call 0x00006aad + 00001499 0x000007d6 arg 0x00000fc0 , 0x0000003f + 00001500 0x000007d7 iadd 0x00000012 , 0x00000012 + 00001501 0x000007d8 arg 0x0000000a , 0x00000039 + 00001502 0x000007d9 arg 0x000001fd , 0x00000011 + 00001503 0x000007da call 0x00006b74 + 00001504 0x000007db call 0x00006b37 + 00001505 0x000007dc fetch 0x00000008 , 0x000001fd + 00001506 0x000007dd rtn 0x00000034 + 00001507 0x000007de store 0x00000008 , 0x00004be9 + 00001508 0x000007df ifetch 0x00000002 , 0x00000006 + 00001509 0x000007e0 istore 0x00000002 , 0x00000005 + 00001510 0x000007e2 rtn + 00001511 0x000007e5 fetch 0x00000001 , 0x000080cc + 00001512 0x000007e6 set1 0x00000001 , 0x0000003f + 00001513 0x000007e7 store 0x00000001 , 0x000080cc + 00001514 0x000007e8 fetchr 0x00000012 , 0x00000001 , 0x00004419 + 00001515 0x000007e9 fetch 0x00000001 , 0x00004433 + 00001516 0x000007ea store 0x00000001 , 0x00004419 + 00001517 0x000007eb arg 0x00000008 , 0x00000039 + 00001518 0x000007ec call 0x00006f67 + 00001519 0x000007ed storer 0x00000012 , 0x00000001 , 0x00004419 + 00001520 0x000007ee fetch 0x00000001 , 0x00008a0a + 00001521 0x000007ef set0 0x00000004 , 0x0000003f + 00001522 0x000007f0 store 0x00000001 , 0x00008a0a + 00001523 0x000007f1 rtn + 00001524 0x000007f8 fetch 0x00000001 , 0x00004407 + 00001525 0x000007f9 beq 0x00000001 , 0x000005f8 + 00001526 0x000007fa beq 0x00000002 , 0x000005ff + 00001527 0x000007fb rtn + 00001528 0x000007fe setarg 0x000003e8 + 00001529 0x000007ff store 0x00000002 , 0x00004405 + 00001530 0x00000800 fetcht 0x00000002 , 0x00004bed + 00001531 0x00000801 fetch 0x00000002 , 0x00004bef + 00001532 0x00000802 arg 0x00000e10 , 0x00000013 + 00001533 0x00000803 call 0x00006fc0 + 00001534 0x00000804 branch 0x00000605 + 00001535 0x00000807 setarg 0x000003e8 + 00001536 0x00000808 store 0x00000002 , 0x00004405 + 00001537 0x00000809 fetcht 0x00000002 , 0x00004be9 + 00001538 0x0000080a fetch 0x00000002 , 0x00004beb + 00001539 0x0000080b arg 0x000003e8 , 0x00000013 + 00001540 0x0000080c call 0x00006fc0 + 00001541 0x0000080e fetcht 0x00000002 , 0x00004bf1 + 00001542 0x0000080f imul32 0x00000002 , 0x0000003f + 00001543 0x00000810 fetcht 0x00000002 , 0x00004bf3 + 00001544 0x00000811 idiv 0x00000002 + 00001545 0x00000812 branch 0x00007d5f + 00001546 0x00000815 call 0x000005e7 + 00001547 0x00000816 fetch 0x00000001 , 0x00008a09 + 00001548 0x00000817 set0 0x00000007 , 0x0000003f + 00001549 0x00000818 store 0x00000001 , 0x00008a09 + 00001550 0x00000819 jam 0x00000077 , 0x00008a07 + 00001551 0x0000081a jam 0x000000c1 , 0x00008a08 + 00001552 0x0000081b jam 0x00000061 , 0x00008a0d + 00001553 0x0000081c jam 0x00000000 , 0x00008a0b + 00001554 0x0000081d rtn + 00001555 0x00000822 call 0x0000060a + 00001556 0x00000823 call 0x00006f90 + 00001557 0x00000824 fetch 0x00000001 , 0x00004409 + 00001558 0x00000825 store 0x00000001 , 0x000080cd + 00001559 0x00000826 call 0x00006f97 + 00001560 0x00000827 jam 0x00000060 , 0x00008a0d + 00001561 0x00000828 jam 0x00000000 , 0x000080cd + 00001562 0x0000082c call 0x0000060a + 00001563 0x0000082d fetch 0x00000001 , 0x00004409 + 00001564 0x0000082e store 0x00000001 , 0x000080cd + 00001565 0x0000082f jam 0x00000050 , 0x00008a0b + 00001566 0x00000830 jam 0x000000c0 , 0x00008a0e + 00001567 0x00000832 arg 0x0000000b , 0x00000038 + 00001568 0x00000833 fetchr 0x0000002f , 0x00000002 , 0x0000440a + 00001569 0x00000835 jam 0x00000003 , 0x000080cc + 00001570 0x00000836 call 0x0000062c + 00001571 0x00000837 fetcht 0x00000002 , 0x00008164 + 00001572 0x00000838 storet 0x00000002 , 0x00004bf3 + 00001573 0x00000839 call 0x00006f9c + 00001574 0x0000083b arg 0x0000000b , 0x00000038 + 00001575 0x0000083c storer 0x0000002f , 0x00000002 , 0x0000440a + 00001576 0x0000083e jam 0x00000060 , 0x00008a0d + 00001577 0x0000083f jam 0x00000000 , 0x000080cd + 00001578 0x00000840 jam 0x00000000 , 0x000080cc + 00001579 0x00000841 rtn + 00001580 0x00000846 fetch 0x00000001 , 0x00008129 + 00001581 0x00000847 bbit0 0x00000005 , 0x0000062c + 00001582 0x00000848 rtn Index: output/bt_program23.list =================================================================== --- /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/bt_program23.list (revision 3381) +++ /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/bt_program23.list (working copy) @@ -706,7 +706,7 @@ 0x276 000822 branch p_keyboard_numlock_led_off + 2 : 000824 p_keyboard_scrolllock_led_off: 0x277 000825 fetch 1 ,mem_keyboard_reuse_led_bit -0x278 000826 bbit1 keyboard_reuse_numled_bit ,p_keyboard_lowpower_scrolllock_led_off +0x278 000826 bbit1 keyboard_reuse_scrollled_bit ,p_keyboard_lowpower_scrolllock_led_off 0x279 000827 fetch 1 ,mem_keyboard_device_poweron_timer_count 0x27a 000828 nrtn blank 0x27b 000829 fetcht 1 ,mem_keyboard_scroll_led_gpio @@ -1628,181 +1628,195 @@ 0x585 001890 call g24_txdata_prep 0x586 001891 nbranch p_keyboard_g24_nodata_transmit ,user : 001892 p_keyboard_g24_transmit_start: -0x587 001893 call p_keyboard_g24_transmit_process -0x588 001894 call keyboard_power_ctrl_start -0x589 001895 branch keyboard_g24_transmit_start_next -: 001897 p_keyboard_g24_nodata_transmit: -0x58a 001898 fetch 8 ,mem_keyscan_value_current -0x58b 001899 nbranch keyboard_g24_transmit_start_next ,blank -0x58c 001900 fetch 8 ,mem_keyscan_value_current + 8 -0x58d 001901 nbranch keyboard_g24_transmit_start_next ,blank -0x58e 001902 fetch 4 ,mem_keyscan_value_current + 16 -0x58f 001903 nbranch keyboard_g24_transmit_start_next ,blank -0x590 001904 call g24_search_receiver -: 001905 p_keyboard_g24_long_sleep: -0x591 001906 call keyboard_g24_lpm_wait -0x592 001907 nrtn user -0x593 001908 call g24_setgpio_lpm_before -0x594 001909 fetch 1 ,mem_sensor_shutdown_flag -0x595 001910 ncall keyboard_setgpio_hibernate ,blank -0x596 001911 fetch 8 ,mem_24g_enter_hibernate -0x597 001912 branch g24_long_seep2 -: 001914 p_keyboard_g24_transmit_process: -0x598 001915 jam 0 ,mem_24g_retry -: 001916 p_keyboard_g24_transmit_loop: -0x599 001917 fetchr timeup ,2 ,mem_param_rx_setup -0x59a 001918 until clkn_rt ,meet -0x59b 001919 call keyboard_special_key_check -0x59c 001920 fetch 2 ,mem_24g_pair_timeout -0x59d 001921 nbranch g24_transmit_no_ack ,blank -0x59e 001922 call g24_transmit_receive_ack -0x59f 001923 fetch 1 ,mem_24g_no_ack -0x5a0 001924 beq no_ack_24g ,g24_transmit_no_ack -0x5a1 001925 nbranch p_keyboard_g24_retransmit ,sync -0x5a2 001926 nbranch p_keyboard_g24_retransmit ,user3 -0x5a3 001927 call p_keyboard_g24_ackpayload_parse -0x5a4 001929 jam 0 ,mem_sensor_shutdown_flag -0x5a5 001930 branch g24_transmit_no_ack -: 001933 p_keyboard_g24_retransmit: -0x5a6 001934 fetch 1 ,mem_24g_abort_pac -0x5a7 001935 nrtn blank -0x5a8 001936 fetch 2 ,mem_24g_txfail_cnt -0x5a9 001937 increase 1 ,pdata -0x5aa 001938 store 2 ,mem_24g_txfail_cnt -0x5ab 001939 fetch 1 ,mem_24g_txfail_cnt -0x5ac 001940 beq 0xff ,g24_tx_attempt_fail -0x5ad 001941 fetch 1 ,mem_24g_retry -0x5ae 001942 increase 1 ,pdata -0x5af 001943 store 1 ,mem_24g_retry -0x5b0 001944 and_into 0x03 ,pdata -0x5b1 001945 branch p_keyboard_g24_transmit_hop_process ,blank -0x5b2 001946 branch p_keyboard_g24_transmit_loop -: 001948 p_keyboard_g24_transmit_hop_process: -0x5b3 001949 call kscan_dispatch -0x5b4 001950 call p_keyboard_device_select -0x5b5 001951 fetch 1 ,mem_keyboard_switch_device_flag -0x5b6 001952 nbranch g24_transmit_no_ack ,blank -0x5b7 001953 call p_g24_tx_fast_hop -0x5b8 001954 branch p_keyboard_g24_transmit_loop -: 001956 p_g24_tx_fast_hop: -0x5b9 001957 fetch 4 ,mem_24g_addr -0x5ba 001958 fetcht 4 ,mem_24g_fast_conn_addr -0x5bb 001959 isub temp ,null -0x5bc 001960 branch g24_ch ,zero -0x5bd 001961 branch g24_tx_fast_hop -: 001964 p_keyboard_g24_ackpayload_parse: -0x5be 001965 call g24_ackpayload_parse -0x5bf 001966 fetch 1 ,mem_24g_rxbuf + 1 -0x5c0 001967 compare 0x08 ,pdata ,0xf8 -0x5c1 001968 nrtn true -0x5c2 001969 fetch 1 ,mem_24g_rxbuf + 2 -0x5c3 001970 beq 0xff ,p_keyboard_24g_hibernate_set -0x5c4 001971 store 1 ,mem_keyboard_led_status -0x5c5 001972 rtn -: 001974 p_keyboard_g24_short_sleep: -0x5c6 001975 call g24_lpm_wait -0x5c7 001976 nrtn user -0x5c8 001977 call p_clear_wake -0x5c9 001978 fetch 3 ,mem_24g_short_sleep_set -0x5ca 001979 branch g24_long_seep2 -: 001982 p_adc_init_data: -0x5cb 001983 fetch 8 ,mem_otp_adc -0x5cc 001984 branch adc_init_cal_data_default ,blank -0x5cd 001985 store 8 ,mem_reference_inter1p8v_2v_adc_io_data -0x5ce 001986 call enable_otp_read -0x5cf 001987 call loadcode_check_otp_lock -0x5d0 001988 arg otp_offset_adc_param_l_c0 ,pdata -0x5d1 001989 iadd regb ,regb -0x5d2 001990 arg 10 ,loopcnt -0x5d3 001991 arg mem_otp_temp ,rega -0x5d4 001992 call otp_read_data -0x5d5 001993 call disable_otp -0x5d6 001994 fetch 8 ,mem_otp_temp -0x5d7 001995 rtn blank -0x5d8 001996 store 8 ,mem_adc_reference3v_gpio1v_ft_data -0x5d9 001997 ifetch 2 ,contr -0x5da 001998 istore 2 ,contw -0x5db 002000 rtn -: 002002 p_sadc_cal_write: -0x5dc 002003 fetch 1 ,core_sadc_ctrl -0x5dd 002004 set1 1 ,pdata -0x5de 002005 store 1 ,core_sadc_ctrl -0x5df 002006 fetchr regb ,1 ,mem_spi_write_addr -0x5e0 002007 fetch 1 ,mem_adc_cal_c7 -0x5e1 002008 store 1 ,mem_spi_write_addr -0x5e2 002009 arg 8 ,loopcnt -0x5e3 002010 call sadc_cal_write + 4 -0x5e4 002011 storer regb ,1 ,mem_spi_write_addr -0x5e5 002012 fetch 1 ,core_gpadc_cfg2 -0x5e6 002013 set0 4 ,pdata -0x5e7 002014 store 1 ,core_gpadc_cfg2 -0x5e8 002015 rtn -: 002019 p_vdd_calculate_by_mode: -: 002021 p_vdd_reference_inter3v_calculate: -0x5e9 002022 fetch 1 ,mem_adc_config_flag -0x5ea 002023 beq adc_config_hvin ,p_vdd_reference_inter3v_calculate_by_mode_vdcdc -0x5eb 002024 beq adc_config_gpio ,p_vdd_reference_inter3v_calculate_by_mode_gpio -0x5ec 002025 rtn -: 002027 p_vdd_reference_inter3v_calculate_by_mode_vdcdc: -0x5ed 002028 setarg 1000 -0x5ee 002029 store 2 ,mem_reference_voltage -0x5ef 002030 fetcht 2 ,mem_adc_reference3v_vdcdc3p6v_ft_data -0x5f0 002031 fetch 2 ,mem_adc_reference3v_vdcdc4p6v_ft_data -0x5f1 002032 arg 3600 ,regc -0x5f2 002033 call vdd_calculate -0x5f3 002034 branch p_mul1v_div1v_to_cal -: 002036 p_vdd_reference_inter3v_calculate_by_mode_gpio: -0x5f4 002037 setarg 1000 -0x5f5 002038 store 2 ,mem_reference_voltage -0x5f6 002039 fetcht 2 ,mem_adc_reference3v_gpio1v_ft_data -0x5f7 002040 fetch 2 ,mem_adc_reference3v_gpio2v_ft_data -0x5f8 002041 arg 1000 ,regc -0x5f9 002042 call vdd_calculate -: 002043 p_mul1v_div1v_to_cal: -0x5fa 002044 fetcht 2 ,mem_adc_reference3v_inter1v_ft_data -0x5fb 002045 imul32 temp ,pdata -0x5fc 002046 fetcht 2 ,mem_adc_reference3v_inter1v_now_data -0x5fd 002047 idiv temp -0x5fe 002048 branch get_div_result -: 002050 p_enable_adc_init_config: -0x5ff 002051 call p_sadc_cal_write -0x600 002052 fetch 1 ,core_gpadc_cfg1 -0x601 002053 set0 7 ,pdata -0x602 002054 store 1 ,core_gpadc_cfg1 -0x603 002055 jam 0x77 ,core_gpadc_ctrl -0x604 002056 jam 0xc1 ,core_gpadc_cfg0 -0x605 002057 jam 0x61 ,core_vtest_ctrl0 -0x606 002058 jam 0x00 ,core_gpadc_cfg3 -0x607 002059 rtn -: 002061 p_enable_adc: -: 002063 p_enable_adc_reference_source_inter3v: -0x608 002064 call p_enable_adc_init_config -0x609 002065 call sadc_channel -0x60a 002066 fetch 1 ,mem_adc_clkdiv -0x60b 002067 store 1 ,core_sadc_clkdiv -0x60c 002068 call sadc_read -0x60d 002069 jam 0x60 ,core_vtest_ctrl0 -0x60e 002070 jam 0x00 ,core_sadc_clkdiv -: 002073 p_read_adc_inter1v: -0x60f 002074 call p_enable_adc_init_config -0x610 002075 fetch 1 ,mem_adc_clkdiv -0x611 002076 store 1 ,core_sadc_clkdiv -0x612 002077 jam 0x50 ,core_gpadc_cfg3 -0x613 002078 jam 0xc0 ,core_vtest_ctrl1 -0x614 002080 arg 0xb ,regext_index -0x615 002081 fetchr regext ,2 ,mem_adc_current_value -0x616 002083 jam 0x03 ,core_sadc_ctrl -0x617 002084 call p_sar_adc_read_wait -0x618 002085 fetcht 2 ,core_sadc_data -0x619 002086 storet 2 ,mem_adc_reference3v_inter1v_now_data -0x61a 002087 call sadc_read_wait + 4 -0x61b 002089 arg 0xb ,regext_index -0x61c 002090 storer regext ,2 ,mem_adc_current_value -0x61d 002092 jam 0x60 ,core_vtest_ctrl0 -0x61e 002093 jam 0x00 ,core_sadc_clkdiv -0x61f 002094 jam 0x00 ,core_sadc_ctrl -0x620 002095 rtn -: 002099 p_sar_adc_read_wait: -0x621 002100 fetch 1 ,core_perf_status -0x622 002101 bbit0 saradc_done ,p_sar_adc_read_wait -0x623 002102 rtn +0x587 001893 call p_keyboard_24g_fast_conn_mode_check +0x588 001894 call p_keyboard_g24_transmit_process +0x589 001895 call keyboard_power_ctrl_start +0x58a 001896 branch keyboard_g24_transmit_start_next +: 001898 p_keyboard_24g_fast_conn_mode_check: +0x58b 001899 fetch 4 ,mem_24g_receiver_addr +0x58c 001900 fetcht 4 ,mem_24g_fast_conn_addr +0x58d 001901 isub temp ,null +0x58e 001902 branch p_keyboard_soft_agc_enable ,zero +0x58f 001903 branch p_keyboard_soft_agc_disable +: 001905 p_keyboard_soft_agc_enable: +0x590 001906 jam 0 ,mem_gain_fix +0x591 001907 jam tx_power_factory ,mem_tx_power +0x592 001908 rtn +: 001910 p_keyboard_soft_agc_disable: +0x593 001911 jam 0xff ,mem_gain_fix +0x594 001912 rtn +: 001915 p_keyboard_g24_nodata_transmit: +0x595 001916 fetch 8 ,mem_keyscan_value_current +0x596 001917 nbranch keyboard_g24_transmit_start_next ,blank +0x597 001918 fetch 8 ,mem_keyscan_value_current + 8 +0x598 001919 nbranch keyboard_g24_transmit_start_next ,blank +0x599 001920 fetch 4 ,mem_keyscan_value_current + 16 +0x59a 001921 nbranch keyboard_g24_transmit_start_next ,blank +0x59b 001922 call g24_search_receiver +: 001923 p_keyboard_g24_long_sleep: +0x59c 001924 call keyboard_g24_lpm_wait +0x59d 001925 nrtn user +0x59e 001926 call g24_setgpio_lpm_before +0x59f 001927 fetch 1 ,mem_sensor_shutdown_flag +0x5a0 001928 ncall keyboard_setgpio_hibernate ,blank +0x5a1 001929 fetch 8 ,mem_24g_enter_hibernate +0x5a2 001930 branch g24_long_seep2 +: 001932 p_keyboard_g24_transmit_process: +0x5a3 001933 jam 0 ,mem_24g_retry +: 001934 p_keyboard_g24_transmit_loop: +0x5a4 001935 fetchr timeup ,2 ,mem_param_rx_setup +0x5a5 001936 until clkn_rt ,meet +0x5a6 001937 call keyboard_special_key_check +0x5a7 001938 fetch 2 ,mem_24g_pair_timeout +0x5a8 001939 nbranch g24_transmit_no_ack ,blank +0x5a9 001940 call g24_transmit_receive_ack +0x5aa 001941 fetch 1 ,mem_24g_no_ack +0x5ab 001942 beq no_ack_24g ,g24_transmit_no_ack +0x5ac 001943 nbranch p_keyboard_g24_retransmit ,sync +0x5ad 001944 nbranch p_keyboard_g24_retransmit ,user3 +0x5ae 001945 call p_keyboard_g24_ackpayload_parse +0x5af 001947 jam 0 ,mem_sensor_shutdown_flag +0x5b0 001948 branch g24_transmit_no_ack +: 001951 p_keyboard_g24_retransmit: +0x5b1 001952 fetch 1 ,mem_24g_abort_pac +0x5b2 001953 nrtn blank +0x5b3 001954 fetch 2 ,mem_24g_txfail_cnt +0x5b4 001955 increase 1 ,pdata +0x5b5 001956 store 2 ,mem_24g_txfail_cnt +0x5b6 001957 fetch 1 ,mem_24g_txfail_cnt +0x5b7 001958 beq 0xff ,g24_tx_attempt_fail +0x5b8 001959 fetch 1 ,mem_24g_retry +0x5b9 001960 increase 1 ,pdata +0x5ba 001961 store 1 ,mem_24g_retry +0x5bb 001962 and_into 0x03 ,pdata +0x5bc 001963 branch p_keyboard_g24_transmit_hop_process ,blank +0x5bd 001964 branch p_keyboard_g24_transmit_loop +: 001966 p_keyboard_g24_transmit_hop_process: +0x5be 001967 call kscan_dispatch +0x5bf 001968 call p_keyboard_device_select +0x5c0 001969 fetch 1 ,mem_keyboard_switch_device_flag +0x5c1 001970 nbranch g24_transmit_no_ack ,blank +0x5c2 001971 call p_g24_tx_fast_hop +0x5c3 001972 branch p_keyboard_g24_transmit_loop +: 001974 p_g24_tx_fast_hop: +0x5c4 001975 fetch 4 ,mem_24g_addr +0x5c5 001976 fetcht 4 ,mem_24g_fast_conn_addr +0x5c6 001977 isub temp ,null +0x5c7 001978 branch g24_ch ,zero +0x5c8 001979 branch g24_tx_fast_hop +: 001982 p_keyboard_g24_ackpayload_parse: +0x5c9 001983 call g24_ackpayload_parse +0x5ca 001984 fetch 1 ,mem_24g_rxbuf + 1 +0x5cb 001985 compare 0x08 ,pdata ,0xf8 +0x5cc 001986 nrtn true +0x5cd 001987 fetch 1 ,mem_24g_rxbuf + 2 +0x5ce 001988 beq 0xff ,p_keyboard_24g_hibernate_set +0x5cf 001989 store 1 ,mem_keyboard_led_status +0x5d0 001990 rtn +: 001992 p_keyboard_g24_short_sleep: +0x5d1 001993 call g24_lpm_wait +0x5d2 001994 nrtn user +0x5d3 001995 call p_clear_wake +0x5d4 001996 fetch 3 ,mem_24g_short_sleep_set +0x5d5 001997 branch g24_long_seep2 +: 002000 p_adc_init_data: +0x5d6 002001 fetch 8 ,mem_otp_adc +0x5d7 002002 branch adc_init_cal_data_default ,blank +0x5d8 002003 store 8 ,mem_reference_inter1p8v_2v_adc_io_data +0x5d9 002004 call enable_otp_read +0x5da 002005 call loadcode_check_otp_lock +0x5db 002006 arg otp_offset_adc_param_l_c0 ,pdata +0x5dc 002007 iadd regb ,regb +0x5dd 002008 arg 10 ,loopcnt +0x5de 002009 arg mem_otp_temp ,rega +0x5df 002010 call otp_read_data +0x5e0 002011 call disable_otp +0x5e1 002012 fetch 8 ,mem_otp_temp +0x5e2 002013 rtn blank +0x5e3 002014 store 8 ,mem_adc_reference3v_gpio1v_ft_data +0x5e4 002015 ifetch 2 ,contr +0x5e5 002016 istore 2 ,contw +0x5e6 002018 rtn +: 002020 p_sadc_cal_write: +0x5e7 002021 fetch 1 ,core_sadc_ctrl +0x5e8 002022 set1 1 ,pdata +0x5e9 002023 store 1 ,core_sadc_ctrl +0x5ea 002024 fetchr regb ,1 ,mem_spi_write_addr +0x5eb 002025 fetch 1 ,mem_adc_cal_c7 +0x5ec 002026 store 1 ,mem_spi_write_addr +0x5ed 002027 arg 8 ,loopcnt +0x5ee 002028 call sadc_cal_write + 4 +0x5ef 002029 storer regb ,1 ,mem_spi_write_addr +0x5f0 002030 fetch 1 ,core_gpadc_cfg2 +0x5f1 002031 set0 4 ,pdata +0x5f2 002032 store 1 ,core_gpadc_cfg2 +0x5f3 002033 rtn +: 002037 p_vdd_calculate_by_mode: +: 002039 p_vdd_reference_inter3v_calculate: +0x5f4 002040 fetch 1 ,mem_adc_config_flag +0x5f5 002041 beq adc_config_hvin ,p_vdd_reference_inter3v_calculate_by_mode_vdcdc +0x5f6 002042 beq adc_config_gpio ,p_vdd_reference_inter3v_calculate_by_mode_gpio +0x5f7 002043 rtn +: 002045 p_vdd_reference_inter3v_calculate_by_mode_vdcdc: +0x5f8 002046 setarg 1000 +0x5f9 002047 store 2 ,mem_reference_voltage +0x5fa 002048 fetcht 2 ,mem_adc_reference3v_vdcdc3p6v_ft_data +0x5fb 002049 fetch 2 ,mem_adc_reference3v_vdcdc4p6v_ft_data +0x5fc 002050 arg 3600 ,regc +0x5fd 002051 call vdd_calculate +0x5fe 002052 branch p_mul1v_div1v_to_cal +: 002054 p_vdd_reference_inter3v_calculate_by_mode_gpio: +0x5ff 002055 setarg 1000 +0x600 002056 store 2 ,mem_reference_voltage +0x601 002057 fetcht 2 ,mem_adc_reference3v_gpio1v_ft_data +0x602 002058 fetch 2 ,mem_adc_reference3v_gpio2v_ft_data +0x603 002059 arg 1000 ,regc +0x604 002060 call vdd_calculate +: 002061 p_mul1v_div1v_to_cal: +0x605 002062 fetcht 2 ,mem_adc_reference3v_inter1v_ft_data +0x606 002063 imul32 temp ,pdata +0x607 002064 fetcht 2 ,mem_adc_reference3v_inter1v_now_data +0x608 002065 idiv temp +0x609 002066 branch get_div_result +: 002068 p_enable_adc_init_config: +0x60a 002069 call p_sadc_cal_write +0x60b 002070 fetch 1 ,core_gpadc_cfg1 +0x60c 002071 set0 7 ,pdata +0x60d 002072 store 1 ,core_gpadc_cfg1 +0x60e 002073 jam 0x77 ,core_gpadc_ctrl +0x60f 002074 jam 0xc1 ,core_gpadc_cfg0 +0x610 002075 jam 0x61 ,core_vtest_ctrl0 +0x611 002076 jam 0x00 ,core_gpadc_cfg3 +0x612 002077 rtn +: 002079 p_enable_adc: +: 002081 p_enable_adc_reference_source_inter3v: +0x613 002082 call p_enable_adc_init_config +0x614 002083 call sadc_channel +0x615 002084 fetch 1 ,mem_adc_clkdiv +0x616 002085 store 1 ,core_sadc_clkdiv +0x617 002086 call sadc_read +0x618 002087 jam 0x60 ,core_vtest_ctrl0 +0x619 002088 jam 0x00 ,core_sadc_clkdiv +: 002091 p_read_adc_inter1v: +0x61a 002092 call p_enable_adc_init_config +0x61b 002093 fetch 1 ,mem_adc_clkdiv +0x61c 002094 store 1 ,core_sadc_clkdiv +0x61d 002095 jam 0x50 ,core_gpadc_cfg3 +0x61e 002096 jam 0xc0 ,core_vtest_ctrl1 +0x61f 002098 arg 0xb ,regext_index +0x620 002099 fetchr regext ,2 ,mem_adc_current_value +0x621 002101 jam 0x03 ,core_sadc_ctrl +0x622 002102 call p_sar_adc_read_wait +0x623 002103 fetcht 2 ,core_sadc_data +0x624 002104 storet 2 ,mem_adc_reference3v_inter1v_now_data +0x625 002105 call sadc_read_wait + 4 +0x626 002107 arg 0xb ,regext_index +0x627 002108 storer regext ,2 ,mem_adc_current_value +0x628 002110 jam 0x60 ,core_vtest_ctrl0 +0x629 002111 jam 0x00 ,core_sadc_clkdiv +0x62a 002112 jam 0x00 ,core_sadc_ctrl +0x62b 002113 rtn +: 002117 p_sar_adc_read_wait: +0x62c 002118 fetch 1 ,core_perf_status +0x62d 002119 bbit0 saradc_done ,p_sar_adc_read_wait +0x62e 002120 rtn Index: output/bt_program23.meta =================================================================== --- /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/bt_program23.meta (revision 3381) +++ /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/bt_program23.meta (working copy) @@ -823,7 +823,7 @@ p_keyboard_scrolllock_led_off: fetch 1,mem_keyboard_reuse_led_bit - bbit1 KEYBOARD_REUSE_NUMLED_BIT,p_keyboard_lowpower_scrolllock_led_off + bbit1 KEYBOARD_REUSE_SCROLLLED_BIT,p_keyboard_lowpower_scrolllock_led_off fetch 1,mem_keyboard_device_poweron_timer_count nrtn blank fetcht 1,mem_keyboard_scroll_led_gpio @@ -1890,10 +1890,28 @@ call g24_txdata_prep nbranch p_keyboard_g24_nodata_transmit,user p_keyboard_g24_transmit_start: + call p_keyboard_24g_fast_conn_mode_check call p_keyboard_g24_transmit_process call keyboard_power_ctrl_start branch keyboard_g24_transmit_start_next +p_keyboard_24g_fast_conn_mode_check: + fetch 4,mem_24g_receiver_addr + fetcht 4,mem_24g_fast_conn_addr + isub temp,null + branch p_keyboard_soft_agc_enable,zero + branch p_keyboard_soft_agc_disable + +p_keyboard_soft_agc_enable: + jam 0,mem_gain_fix + jam TX_POWER_FACTORY,mem_tx_power + rtn + +p_keyboard_soft_agc_disable: + jam 0xff,mem_gain_fix + rtn + + p_keyboard_g24_nodata_transmit: fetch 8,mem_keyscan_value_current nbranch keyboard_g24_transmit_start_next,blank Index: output/bt_program23.rom =================================================================== --- /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/bt_program23.rom (revision 3381) +++ /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/bt_program23.rom (working copy) @@ -27,8 +27,8 @@ 11000000001011011000010010111110 11000000001011100000010010111001 11000000001011101000010011000000 -11000000001011110000010110011000 -11000000001011111000010111000110 +11000000001011110000010110100011 +11000000001011111000010111010001 11000000001110001000010010111110 11000000001110110000000001000100 11000000001110111000001000100001 @@ -40,9 +40,9 @@ 11000000011010101000010010100100 11000000011010110000010010011101 11000000011011010000000100111010 -11000000011011011000010111001011 -11000000011011100000011000001000 -11000000011011101000010111101001 +11000000011011011000010111010110 +11000000011011100000011000010011 +11000000011011101000010111110100 11000000011110110000010101100111 11000000011111010000010101101111 00100000001000000010001101011010 @@ -509,7 +509,7 @@ 01011000000000000000000000000000 01100111111000111100100001000110 01110000010001110011111100000001 -00100000001000000000010110010001 +00100000001000000000010110011100 01101111111001000100011100010011 11000010100111110110000000110100 11000010100110000110000000110100 @@ -630,7 +630,7 @@ 11000011100000100000000000000000 00100000001000000000001001110010 01101111111000001100110100010000 -11000010100000000000001010001011 +11000010100000010000001010001011 01101111111000001100101000001000 00100100011110100000000000000000 01101000010010001100101110111011 @@ -1409,13 +1409,24 @@ 00100000010000000011011001010001 00100100001011000011010110000110 00100100001101111011010110000110 -00100000010000000000010110111110 +00100000010000000000010111001001 00100000001000000011010101101010 00100000010000000011011000100101 -00100100001101000000010110001010 -00100000010000000000010110011000 +00100100001101000000010110010101 +00100000010000000000010110001011 +00100000010000000000010110100011 00100000010000000100111111010101 00100000001000000100111111011011 +01101111111000100100010111101000 +01101000010010100100010111100100 +10011000010001100111110000000000 +00100000001000101000010110010000 +00100000001000000000010110010011 +01110000010000010100001100000000 +01110000010000010100000110101010 +00100000011000000000000000000000 +01110000010000010100001111111111 +00100000011000000000000000000000 01101111111001000100100010011100 00100100001110100100111111011011 01101111111001000100100010100100 @@ -1439,9 +1450,9 @@ 00100000010000000011011001010001 01101111111000001100010101111111 11000000000000001011011001000110 -00100100001011000000010110100110 -00100100001101111000010110100110 -00100000010000000000010110111110 +00100100001011000000010110110001 +00100100001101111000010110110001 +00100000010000000000010111001001 01110000010001110011111100000000 00100000001000000011011001000110 01101111111000001100011000000010 @@ -1455,14 +1466,14 @@ 00011111111000001111111000000001 01100111111000001100011000000001 00011111111000010111111000000011 -00100000001110100000010110110011 -00100000001000000000010110011001 +00100000001110100000010110111110 +00100000001000000000010110100100 00100000010000000100101111111011 00100000010000000000010000101010 01101111111000001100101110100001 00100100001110100011011001000110 -00100000010000000000010110111001 -00100000001000000000010110011001 +00100000010000000000010111000100 +00100000001000000000010110100100 01101111111000100100010110001111 01101000010010100100010111100100 10011000010001100111110000000000 @@ -1512,8 +1523,8 @@ 01100111111100001000101000001010 00100000011000000000000000000000 01101111111000001100010000000111 -11000000000000001000010111101101 -11000000000000010000010111110100 +11000000000000001000010111111000 +11000000000000010000010111111111 00100000011000000000000000000000 01011000000000000000001111101000 01100111111000010100010000000101 @@ -1521,7 +1532,7 @@ 01101111111000010100101111101111 11011010011000000000111000010000 00100000010000000110111111000000 -00100000001000000000010111111010 +00100000001000000000011000000101 01011000000000000000001111101000 01100111111000010100010000000101 01101000010010010100101111101001 @@ -1533,7 +1544,7 @@ 01101000010010010100101111110011 10011000010001101111110000000000 00100000001000000111110101011111 -00100000010000000000010111011100 +00100000010000000000010111100111 01101111111100001000101000001001 01111001001111111111111000000111 01100111111100001000101000001001 @@ -1542,14 +1553,14 @@ 01110000100010100000110101100001 01110000100010100000101100000000 00100000011000000000000000000000 -00100000010000000000010111111111 +00100000010000000000011000001010 00100000010000000110111110010000 01101111111000001100010000001001 01100111111100001000000011001101 00100000010000000110111110010111 01110000100010100000110101100000 01110000100000001100110100000000 -00100000010000000000010111111111 +00100000010000000000011000001010 01101111111000001100010000001001 01100111111100001000000011001101 01110000100010100000101101010000 @@ -1557,7 +1568,7 @@ 11011111000000000000000000001011 01101101111000010100010000001010 01110000100000001100110000000011 -00100000010000000000011000100001 +00100000010000000000011000101100 01101000010110010000000101100100 01100000010010010100101111110011 00100000010000000110111110011100 @@ -1568,5 +1579,5 @@ 01110000100000001100110000000000 00100000011000000000000000000000 01101111111100001000000100101001 -11000011000000101000011000100001 +11000011000000101000011000101100 00100000011000000000000000000000 Index: output/eeprom.dat =================================================================== --- /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/eeprom.dat (revision 3381) +++ /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/eeprom.dat (working copy) @@ -18,7 +18,7 @@ 1e aa 55 -a0 +c0 18 24 e6 @@ -139,11 +139,11 @@ 15 d1 61 -ff +c4 1c e8 46 -af +b8 9c 29 df @@ -191,15 +191,15 @@ 1e b2 e8 -50 +4d ab 2f 4a -ae +b5 f0 86 4e -b9 +a4 94 8d 56 @@ -2067,7 +2067,7 @@ d5 dc d7 -88 +85 9a 5d 5a @@ -2549,7 +2549,7 @@ 97 1f aa -bf +be 40 2d 22 @@ -5667,7 +5667,7 @@ 46 77 21 -72 +05 20 83 c8 @@ -5679,651 +5679,683 @@ 42 cb 11 -3c +23 00 7c bc -0f +1c e2 3b -d4 -e1 +9e +97 82 -ef +8f 16 -47 -b5 -d5 -98 -46 +49 +fa +11 +9f +01 +66 +f7 +78 +cc +e3 +f9 +60 +6a +08 +03 +e1 +7d +9c +ee +8c +cc +90 +4d +36 +50 +4f +67 2d -2f -72 -ff -e4 -57 -6d -2a -b4 -7f -d2 -a6 -d3 -2e -41 -f0 +a3 +e2 +ad +88 94 -57 -7c -18 -1f -66 -58 -3e -b2 -ac -86 -f6 -e5 -ca +e1 +de 9d df -cc -8d -30 -c5 -73 -d6 -a0 -39 -e8 -4c -dd -6e -32 -d2 -06 -54 -8f -57 -72 +9c 8c -54 -76 -0f -09 -74 -d0 -0d -5a -e1 -64 +45 +84 +3c +56 +67 +06 +a3 +f2 +da +87 +79 +0c +0c 20 -3b +c0 +93 +0c +0a +00 +0a +41 +d2 +72 +53 +45 +b6 +f1 +2d +6d +e0 67 cf -34 -da -da -65 -42 -85 +4f +b2 +95 +c4 +48 +95 f6 -8e -e8 -5f +c0 +de +19 16 88 b3 -25 +ca ea 60 -6c -59 -f1 -6a -80 -72 -57 -4a -88 -11 -8d -69 -00 -02 -06 -ea -c2 -c0 -30 -89 -84 +6e +19 +15 30 -94 -7c +79 +41 +1c 82 -b2 +c8 +18 +89 +7e +b3 +86 +56 +ec +c6 +7e +29 +af +bb +70 +80 2f -96 -fd -aa -8e -a5 -66 -43 -97 -5e -49 -1b -6a -02 -7f -64 -53 -24 -63 -8b -ba -4b -ff -2d -6a -2d -03 -03 -f9 -98 -ad -a6 +b6 +f4 +60 +36 +76 +5d c5 -40 -30 -af -c9 -ad -c4 -9d -aa -a7 -eb -bf -1f -3d -11 -5a -0d -83 -03 -b9 -0c -37 -eb -da -ad +3e +23 +9b dc -19 -76 -9e -39 -04 -df -f7 -50 -41 -3d -6a -37 -a0 -9c +85 +3a +a3 +55 +a2 +b7 +34 +5b +25 +e3 +0a +15 +ab +8c 95 -02 -23 -33 +8e +7e b0 -05 -04 -c3 -75 -27 -e1 -32 -2b -35 -28 c4 +b2 +4f +ee +16 +fa +e0 +cb +67 +de +0a +3d +9c +95 +66 +a3 +fa +50 +e7 +d2 +eb +09 d9 +06 +20 +43 +96 +e5 +df +92 +7c +e3 +5d +96 +38 +8a +80 +bc +8a +b2 +85 +8a +08 +13 +53 +da +c2 +e0 +ab +c0 +07 +bf +4d +7a +8d +62 +d7 +ac +92 2a -c6 -6b +c7 +d9 +32 +71 +f7 d3 01 -19 -65 +2a +5b 11 d1 -6e -b8 -46 -44 -73 -ab -0e -b8 -ec -d8 -39 -ed -ef -9a -48 -79 -6c -98 -e0 -44 -fc +13 +2d +09 e4 +b3 +79 +4e +b9 +d7 +71 +39 +b7 +59 +dc +07 +d9 +ad +a5 +00 +1b 78 -26 -a8 -a7 -27 -c9 -19 -99 -7f -6e -d0 -e4 +b8 +70 +24 +24 +82 +6f +e3 +5c +7d +c7 +68 +9a +50 +ab +01 +3b +9c +4a +20 +a1 +e8 +a5 +0c +8a +b1 +c0 af -57 -89 +78 +d5 be -4a -40 -93 -df -ea -ad -7a -d7 +96 +bb +cc +a2 +c4 +b8 8f -6f -8a -0f -fe -93 -4a -39 -a6 -9e -57 -f6 -16 -42 -32 -95 -7a -f0 -6c 1e -bb -3f -f9 -ef -e5 -f6 -82 -30 -a0 +46 +b5 +91 +9a +cf +86 +dc +fc +9f +5a +e8 +1a +76 +8d +f0 +1a 59 -4d +df +07 +44 b3 -bf -e7 8b -f2 -b5 -b9 -68 -e1 -ea -75 -ff -2f +f8 +4f +d9 +6d +b1 +a5 +d4 +52 +53 75 -ce -38 -8a +ae +65 +9f 6e 4c f4 90 40 -a8 -f7 -7d +e8 +98 +04 0b 84 -d0 -7f -a5 -3c -a6 -59 -f4 -83 -5e +d8 +6b +6a +9d +cd +65 +33 +22 +34 +a8 +b4 +aa +96 +b4 00 -4b -2a -99 -74 -f5 -40 -17 -ea -93 +f0 +33 +26 +35 50 -a5 -da -08 -89 -e1 -84 -5e +db +d1 +b5 +59 +60 +b5 +14 83 -5b -9f -15 -05 -3d -f0 -1f -95 -d4 -62 -e9 -7c -58 -5a -b2 -a2 -a4 -a4 +f4 f2 -d5 -bc -03 -7a -b9 -15 -e0 +5a +a5 +92 +f4 +17 +91 +11 +86 16 -75 -69 -e7 -da -31 -c7 -c1 -93 -8a -37 -24 -27 -46 -99 -1f -ca -30 +26 +58 +52 +f5 +06 +80 +2a +7f +74 +78 +1c +f2 +a8 +9f +ef +4f +2a +97 +e3 +d2 +31 cd -e1 -80 -37 -5d -9b +07 +ca +ca +49 +25 +2f +56 +dd +d4 +60 +70 +8c +15 +2f +d6 9c -ac -46 -c0 -20 -94 -62 -ef -ac -79 -c6 -04 -ef -29 +5c +db +2c +82 +d9 +a7 +b4 +61 0f -85 +eb +d8 +ed +66 +e5 +20 +80 +71 ca -7e -a4 -55 -0a -b1 -f1 -8e -16 -aa -f2 -f7 +6f +65 +b0 +a9 +ee +01 +9a +51 +1a +17 +3d cc -74 -61 -5f -04 -2b -0c -91 -9e -c2 -ce -48 -03 -10 -a3 +34 +64 +a5 +33 +cb +cb +7e +39 +23 +0f +b5 +ab +58 +ed +75 +34 +f0 +22 63 -7b -71 -69 -88 -36 -0c +b4 +6c ed 5a -2e -ec -98 -f1 +69 +4d +b3 +34 59 2a d3 -2b -55 +37 +a2 +53 +ce fd -7b -12 -19 -11 -e7 -90 -e6 -c7 -79 -89 +ab +38 +a2 +73 +5e +c1 +ea +49 04 9d -25 -36 -b8 -16 -b9 -4a -41 -05 -0a -3f -89 -20 -b5 -52 -45 -96 -0c -c0 -da -da +5e +6c c0 +56 +bf +7e +49 +14 +c4 33 -31 -3b -51 -72 -34 -ec -78 -5f +98 +56 +00 +bc +4d +87 +cd 22 -fe -7b -13 -69 -be -5d -67 +70 +30 +c4 ac -df -bf -b9 -2e -a9 +61 +f1 +36 +73 2c -fd -f7 -e0 -12 -37 -c8 -c5 -48 +2f +3e +cf +ca +3b +8e +13 +21 +97 +16 +94 +14 +d9 +46 +46 +2e +c9 +3e +32 +b8 40 -37 -3d -66 -86 -f6 -e7 -1d -05 +d3 +d9 +c0 +c5 +42 +84 +6e +42 +f7 +16 +e1 +9d +9a +6c 29 -87 -09 -49 -e3 -c1 -9e -fa -8a -b4 -87 -63 -21 -66 -7c -9f +8d c3 -36 -f1 -a5 -e2 -a0 3e -61 -49 -12 -92 -9e -71 -96 -cd -43 -72 -85 -ef -d9 +b3 +0b +93 +c4 +95 +de +4e +0b +36 +1c +f7 +52 +93 +dc +fa +f5 +b2 +6a +36 +ab +b6 +52 +fd +05 +73 +97 +4d +40 +65 +f5 +a3 +17 74 15 -e1 -14 -b8 -e9 -e0 -b5 -38 +88 +a2 +a0 +3a +ec b1 -56 -c1 +28 +78 +d0 +32 e7 0b -bc -1f -70 -61 -98 -d8 -54 -23 -28 -63 +d5 +89 +c0 +81 +5c +da +56 +32 +ec +a4 5e a1 -23 -eb +25 +db 4d -d2 -bc -05 -d4 -0b -cc -71 -72 -fc -9c -da -f7 -3b -a2 -c4 -6c -f9 +d8 +7f +c5 +7b +8b +00 +7a +3f +7d +d8 +d0 +e8 +4b ef -da -3b -90 -88 -33 -60 -7e -65 +ee +8f +bb 6f +d7 73 -d2 -1a -6f -b6 +a9 +89 +57 +69 +06 +2e +9c +53 +92 +75 +f3 +69 4e 1b -75 +7e +35 +1b +60 +0f +1a +c3 +66 +ce +69 +a0 +36 +cb +32 +9b +7a +16 +34 +7b +d3 +3f +bc +44 +d0 +a3 +02 +5b +2a +dd +bb +68 +19 50 -fa -24 -05 +8e +6e +80 +0e aa 55 40 @@ -7572,40 +7604,8 @@ 55 d3 66 -5d -4c -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +41 +7c ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -34 -ae +0f +1d Index: output/flash.dat =================================================================== --- /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/flash.dat (revision 3381) +++ /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/flash.dat (working copy) @@ -18,7 +18,7 @@ 1e aa 55 -a0 +c0 18 24 e6 @@ -139,11 +139,11 @@ 15 d1 61 -ff +c4 1c e8 46 -af +b8 9c 29 df @@ -191,15 +191,15 @@ 1e b2 e8 -50 +4d ab 2f 4a -ae +b5 f0 86 4e -b9 +a4 94 8d 56 @@ -2067,7 +2067,7 @@ d5 dc d7 -88 +85 9a 5d 5a @@ -2549,7 +2549,7 @@ 97 1f aa -bf +be 40 2d 22 @@ -5667,7 +5667,7 @@ 46 77 21 -72 +05 20 83 c8 @@ -5679,651 +5679,683 @@ 42 cb 11 -3c +23 00 7c bc -0f +1c e2 3b -d4 -e1 +9e +97 82 -ef +8f 16 -47 -b5 -d5 -98 -46 +49 +fa +11 +9f +01 +66 +f7 +78 +cc +e3 +f9 +60 +6a +08 +03 +e1 +7d +9c +ee +8c +cc +90 +4d +36 +50 +4f +67 2d -2f -72 -ff -e4 -57 -6d -2a -b4 -7f -d2 -a6 -d3 -2e -41 -f0 +a3 +e2 +ad +88 94 -57 -7c -18 -1f -66 -58 -3e -b2 -ac -86 -f6 -e5 -ca +e1 +de 9d df -cc -8d -30 -c5 -73 -d6 -a0 -39 -e8 -4c -dd -6e -32 -d2 -06 -54 -8f -57 -72 +9c 8c -54 -76 -0f -09 -74 -d0 -0d -5a -e1 -64 +45 +84 +3c +56 +67 +06 +a3 +f2 +da +87 +79 +0c +0c 20 -3b +c0 +93 +0c +0a +00 +0a +41 +d2 +72 +53 +45 +b6 +f1 +2d +6d +e0 67 cf -34 -da -da -65 -42 -85 +4f +b2 +95 +c4 +48 +95 f6 -8e -e8 -5f +c0 +de +19 16 88 b3 -25 +ca ea 60 -6c -59 -f1 -6a -80 -72 -57 -4a -88 -11 -8d -69 -00 -02 -06 -ea -c2 -c0 -30 -89 -84 +6e +19 +15 30 -94 -7c +79 +41 +1c 82 -b2 +c8 +18 +89 +7e +b3 +86 +56 +ec +c6 +7e +29 +af +bb +70 +80 2f -96 -fd -aa -8e -a5 -66 -43 -97 -5e -49 -1b -6a -02 -7f -64 -53 -24 -63 -8b -ba -4b -ff -2d -6a -2d -03 -03 -f9 -98 -ad -a6 +b6 +f4 +60 +36 +76 +5d c5 -40 -30 -af -c9 -ad -c4 -9d -aa -a7 -eb -bf -1f -3d -11 -5a -0d -83 -03 -b9 -0c -37 -eb -da -ad +3e +23 +9b dc -19 -76 -9e -39 -04 -df -f7 -50 -41 -3d -6a -37 -a0 -9c +85 +3a +a3 +55 +a2 +b7 +34 +5b +25 +e3 +0a +15 +ab +8c 95 -02 -23 -33 +8e +7e b0 -05 -04 -c3 -75 -27 -e1 -32 -2b -35 -28 c4 +b2 +4f +ee +16 +fa +e0 +cb +67 +de +0a +3d +9c +95 +66 +a3 +fa +50 +e7 +d2 +eb +09 d9 +06 +20 +43 +96 +e5 +df +92 +7c +e3 +5d +96 +38 +8a +80 +bc +8a +b2 +85 +8a +08 +13 +53 +da +c2 +e0 +ab +c0 +07 +bf +4d +7a +8d +62 +d7 +ac +92 2a -c6 -6b +c7 +d9 +32 +71 +f7 d3 01 -19 -65 +2a +5b 11 d1 -6e -b8 -46 -44 -73 -ab -0e -b8 -ec -d8 -39 -ed -ef -9a -48 -79 -6c -98 -e0 -44 -fc +13 +2d +09 e4 +b3 +79 +4e +b9 +d7 +71 +39 +b7 +59 +dc +07 +d9 +ad +a5 +00 +1b 78 -26 -a8 -a7 -27 -c9 -19 -99 -7f -6e -d0 -e4 +b8 +70 +24 +24 +82 +6f +e3 +5c +7d +c7 +68 +9a +50 +ab +01 +3b +9c +4a +20 +a1 +e8 +a5 +0c +8a +b1 +c0 af -57 -89 +78 +d5 be -4a -40 -93 -df -ea -ad -7a -d7 +96 +bb +cc +a2 +c4 +b8 8f -6f -8a -0f -fe -93 -4a -39 -a6 -9e -57 -f6 -16 -42 -32 -95 -7a -f0 -6c 1e -bb -3f -f9 -ef -e5 -f6 -82 -30 -a0 +46 +b5 +91 +9a +cf +86 +dc +fc +9f +5a +e8 +1a +76 +8d +f0 +1a 59 -4d +df +07 +44 b3 -bf -e7 8b -f2 -b5 -b9 -68 -e1 -ea -75 -ff -2f +f8 +4f +d9 +6d +b1 +a5 +d4 +52 +53 75 -ce -38 -8a +ae +65 +9f 6e 4c f4 90 40 -a8 -f7 -7d +e8 +98 +04 0b 84 -d0 -7f -a5 -3c -a6 -59 -f4 -83 -5e +d8 +6b +6a +9d +cd +65 +33 +22 +34 +a8 +b4 +aa +96 +b4 00 -4b -2a -99 -74 -f5 -40 -17 -ea -93 +f0 +33 +26 +35 50 -a5 -da -08 -89 -e1 -84 -5e +db +d1 +b5 +59 +60 +b5 +14 83 -5b -9f -15 -05 -3d -f0 -1f -95 -d4 -62 -e9 -7c -58 -5a -b2 -a2 -a4 -a4 +f4 f2 -d5 -bc -03 -7a -b9 -15 -e0 +5a +a5 +92 +f4 +17 +91 +11 +86 16 -75 -69 -e7 -da -31 -c7 -c1 -93 -8a -37 -24 -27 -46 -99 -1f -ca -30 +26 +58 +52 +f5 +06 +80 +2a +7f +74 +78 +1c +f2 +a8 +9f +ef +4f +2a +97 +e3 +d2 +31 cd -e1 -80 -37 -5d -9b +07 +ca +ca +49 +25 +2f +56 +dd +d4 +60 +70 +8c +15 +2f +d6 9c -ac -46 -c0 -20 -94 -62 -ef -ac -79 -c6 -04 -ef -29 +5c +db +2c +82 +d9 +a7 +b4 +61 0f -85 +eb +d8 +ed +66 +e5 +20 +80 +71 ca -7e -a4 -55 -0a -b1 -f1 -8e -16 -aa -f2 -f7 +6f +65 +b0 +a9 +ee +01 +9a +51 +1a +17 +3d cc -74 -61 -5f -04 -2b -0c -91 -9e -c2 -ce -48 -03 -10 -a3 +34 +64 +a5 +33 +cb +cb +7e +39 +23 +0f +b5 +ab +58 +ed +75 +34 +f0 +22 63 -7b -71 -69 -88 -36 -0c +b4 +6c ed 5a -2e -ec -98 -f1 +69 +4d +b3 +34 59 2a d3 -2b -55 +37 +a2 +53 +ce fd -7b -12 -19 -11 -e7 -90 -e6 -c7 -79 -89 +ab +38 +a2 +73 +5e +c1 +ea +49 04 9d -25 -36 -b8 -16 -b9 -4a -41 -05 -0a -3f -89 -20 -b5 -52 -45 -96 -0c -c0 -da -da +5e +6c c0 +56 +bf +7e +49 +14 +c4 33 -31 -3b -51 -72 -34 -ec -78 -5f +98 +56 +00 +bc +4d +87 +cd 22 -fe -7b -13 -69 -be -5d -67 +70 +30 +c4 ac -df -bf -b9 -2e -a9 +61 +f1 +36 +73 2c -fd -f7 -e0 -12 -37 -c8 -c5 -48 +2f +3e +cf +ca +3b +8e +13 +21 +97 +16 +94 +14 +d9 +46 +46 +2e +c9 +3e +32 +b8 40 -37 -3d -66 -86 -f6 -e7 -1d -05 +d3 +d9 +c0 +c5 +42 +84 +6e +42 +f7 +16 +e1 +9d +9a +6c 29 -87 -09 -49 -e3 -c1 -9e -fa -8a -b4 -87 -63 -21 -66 -7c -9f +8d c3 -36 -f1 -a5 -e2 -a0 3e -61 -49 -12 -92 -9e -71 -96 -cd -43 -72 -85 -ef -d9 +b3 +0b +93 +c4 +95 +de +4e +0b +36 +1c +f7 +52 +93 +dc +fa +f5 +b2 +6a +36 +ab +b6 +52 +fd +05 +73 +97 +4d +40 +65 +f5 +a3 +17 74 15 -e1 -14 -b8 -e9 -e0 -b5 -38 +88 +a2 +a0 +3a +ec b1 -56 -c1 +28 +78 +d0 +32 e7 0b -bc -1f -70 -61 -98 -d8 -54 -23 -28 -63 +d5 +89 +c0 +81 +5c +da +56 +32 +ec +a4 5e a1 -23 -eb +25 +db 4d -d2 -bc -05 -d4 -0b -cc -71 -72 -fc -9c -da -f7 -3b -a2 -c4 -6c -f9 +d8 +7f +c5 +7b +8b +00 +7a +3f +7d +d8 +d0 +e8 +4b ef -da -3b -90 -88 -33 -60 -7e -65 +ee +8f +bb 6f +d7 73 -d2 -1a -6f -b6 +a9 +89 +57 +69 +06 +2e +9c +53 +92 +75 +f3 +69 4e 1b -75 +7e +35 +1b +60 +0f +1a +c3 +66 +ce +69 +a0 +36 +cb +32 +9b +7a +16 +34 +7b +d3 +3f +bc +44 +d0 +a3 +02 +5b +2a +dd +bb +68 +19 50 -fa -24 -05 +8e +6e +80 +0e aa 55 40 @@ -7572,40 +7604,8 @@ 55 d3 66 -5d -4c -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +41 +7c ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -34 -ae +0f +1d Index: output/otp.dat =================================================================== --- /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/otp.dat (revision 3381) +++ /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/otp.dat (working copy) @@ -27,7 +27,7 @@ 1e aa 55 -a0 +c0 18 24 e6 @@ -148,11 +148,11 @@ 15 d1 61 -ff +c4 1c e8 46 -af +b8 9c 29 df @@ -200,15 +200,15 @@ 1e b2 e8 -50 +4d ab 2f 4a -ae +b5 f0 86 4e -b9 +a4 94 8d 56 @@ -2076,7 +2076,7 @@ d5 dc d7 -88 +85 9a 5d 5a @@ -2558,7 +2558,7 @@ 97 1f aa -bf +be 40 2d 22 @@ -5676,7 +5676,7 @@ 46 77 21 -72 +05 20 83 c8 @@ -5688,651 +5688,683 @@ 42 cb 11 -3c +23 00 7c bc -0f +1c e2 3b -d4 -e1 +9e +97 82 -ef +8f 16 -47 -b5 -d5 -98 -46 +49 +fa +11 +9f +01 +66 +f7 +78 +cc +e3 +f9 +60 +6a +08 +03 +e1 +7d +9c +ee +8c +cc +90 +4d +36 +50 +4f +67 2d -2f -72 -ff -e4 -57 -6d -2a -b4 -7f -d2 -a6 -d3 -2e -41 -f0 +a3 +e2 +ad +88 94 -57 -7c -18 -1f -66 -58 -3e -b2 -ac -86 -f6 -e5 -ca +e1 +de 9d df -cc -8d -30 -c5 -73 -d6 -a0 -39 -e8 -4c -dd -6e -32 -d2 -06 -54 -8f -57 -72 +9c 8c -54 -76 -0f -09 -74 -d0 -0d -5a -e1 -64 +45 +84 +3c +56 +67 +06 +a3 +f2 +da +87 +79 +0c +0c 20 -3b +c0 +93 +0c +0a +00 +0a +41 +d2 +72 +53 +45 +b6 +f1 +2d +6d +e0 67 cf -34 -da -da -65 -42 -85 +4f +b2 +95 +c4 +48 +95 f6 -8e -e8 -5f +c0 +de +19 16 88 b3 -25 +ca ea 60 -6c -59 -f1 -6a -80 -72 -57 -4a -88 -11 -8d -69 -00 -02 -06 -ea -c2 -c0 -30 -89 -84 +6e +19 +15 30 -94 -7c +79 +41 +1c 82 -b2 +c8 +18 +89 +7e +b3 +86 +56 +ec +c6 +7e +29 +af +bb +70 +80 2f -96 -fd -aa -8e -a5 -66 -43 -97 -5e -49 -1b -6a -02 -7f -64 -53 -24 -63 -8b -ba -4b -ff -2d -6a -2d -03 -03 -f9 -98 -ad -a6 +b6 +f4 +60 +36 +76 +5d c5 -40 -30 -af -c9 -ad -c4 -9d -aa -a7 -eb -bf -1f -3d -11 -5a -0d -83 -03 -b9 -0c -37 -eb -da -ad +3e +23 +9b dc -19 -76 -9e -39 -04 -df -f7 -50 -41 -3d -6a -37 -a0 -9c +85 +3a +a3 +55 +a2 +b7 +34 +5b +25 +e3 +0a +15 +ab +8c 95 -02 -23 -33 +8e +7e b0 -05 -04 -c3 -75 -27 -e1 -32 -2b -35 -28 c4 +b2 +4f +ee +16 +fa +e0 +cb +67 +de +0a +3d +9c +95 +66 +a3 +fa +50 +e7 +d2 +eb +09 d9 +06 +20 +43 +96 +e5 +df +92 +7c +e3 +5d +96 +38 +8a +80 +bc +8a +b2 +85 +8a +08 +13 +53 +da +c2 +e0 +ab +c0 +07 +bf +4d +7a +8d +62 +d7 +ac +92 2a -c6 -6b +c7 +d9 +32 +71 +f7 d3 01 -19 -65 +2a +5b 11 d1 -6e -b8 -46 -44 -73 -ab -0e -b8 -ec -d8 -39 -ed -ef -9a -48 -79 -6c -98 -e0 -44 -fc +13 +2d +09 e4 +b3 +79 +4e +b9 +d7 +71 +39 +b7 +59 +dc +07 +d9 +ad +a5 +00 +1b 78 -26 -a8 -a7 -27 -c9 -19 -99 -7f -6e -d0 -e4 +b8 +70 +24 +24 +82 +6f +e3 +5c +7d +c7 +68 +9a +50 +ab +01 +3b +9c +4a +20 +a1 +e8 +a5 +0c +8a +b1 +c0 af -57 -89 +78 +d5 be -4a -40 -93 -df -ea -ad -7a -d7 +96 +bb +cc +a2 +c4 +b8 8f -6f -8a -0f -fe -93 -4a -39 -a6 -9e -57 -f6 -16 -42 -32 -95 -7a -f0 -6c 1e -bb -3f -f9 -ef -e5 -f6 -82 -30 -a0 +46 +b5 +91 +9a +cf +86 +dc +fc +9f +5a +e8 +1a +76 +8d +f0 +1a 59 -4d +df +07 +44 b3 -bf -e7 8b -f2 -b5 -b9 -68 -e1 -ea -75 -ff -2f +f8 +4f +d9 +6d +b1 +a5 +d4 +52 +53 75 -ce -38 -8a +ae +65 +9f 6e 4c f4 90 40 -a8 -f7 -7d +e8 +98 +04 0b 84 -d0 -7f -a5 -3c -a6 -59 -f4 -83 -5e +d8 +6b +6a +9d +cd +65 +33 +22 +34 +a8 +b4 +aa +96 +b4 00 -4b -2a -99 -74 -f5 -40 -17 -ea -93 +f0 +33 +26 +35 50 -a5 -da -08 -89 -e1 -84 -5e +db +d1 +b5 +59 +60 +b5 +14 83 -5b -9f -15 -05 -3d -f0 -1f -95 -d4 -62 -e9 -7c +f4 +f2 +5a +a5 +92 +f4 +17 +91 +11 +86 +16 +26 58 -5a -b2 -a2 -a4 -a4 +52 +f5 +06 +80 +2a +7f +74 +78 +1c f2 -d5 -bc -03 -7a -b9 -15 -e0 -16 -75 -69 -e7 -da +a8 +9f +ef +4f +2a +97 +e3 +d2 31 -c7 -c1 -93 -8a -37 -24 -27 -46 -99 -1f -ca -30 cd -e1 -80 -37 -5d -9b +07 +ca +ca +49 +25 +2f +56 +dd +d4 +60 +70 +8c +15 +2f +d6 9c -ac -46 -c0 -20 -94 -62 -ef -ac -79 -c6 -04 -ef -29 +5c +db +2c +82 +d9 +a7 +b4 +61 0f -85 +eb +d8 +ed +66 +e5 +20 +80 +71 ca -7e -a4 -55 -0a -b1 -f1 -8e -16 -aa -f2 -f7 +6f +65 +b0 +a9 +ee +01 +9a +51 +1a +17 +3d cc -74 -61 -5f -04 -2b -0c -91 -9e -c2 -ce -48 -03 -10 -a3 +34 +64 +a5 +33 +cb +cb +7e +39 +23 +0f +b5 +ab +58 +ed +75 +34 +f0 +22 63 -7b -71 -69 -88 -36 -0c +b4 +6c ed 5a -2e -ec -98 -f1 +69 +4d +b3 +34 59 2a d3 -2b -55 +37 +a2 +53 +ce fd -7b -12 -19 -11 -e7 -90 -e6 -c7 -79 -89 +ab +38 +a2 +73 +5e +c1 +ea +49 04 9d -25 -36 -b8 -16 -b9 -4a -41 -05 -0a -3f -89 -20 -b5 -52 -45 -96 -0c -c0 -da -da +5e +6c c0 +56 +bf +7e +49 +14 +c4 33 -31 -3b -51 -72 -34 -ec -78 -5f +98 +56 +00 +bc +4d +87 +cd 22 -fe -7b -13 -69 -be -5d -67 +70 +30 +c4 ac -df -bf -b9 +61 +f1 +36 +73 +2c +2f +3e +cf +ca +3b +8e +13 +21 +97 +16 +94 +14 +d9 +46 +46 2e -a9 -2c -fd -f7 -e0 -12 -37 -c8 -c5 -48 +c9 +3e +32 +b8 40 -37 -3d -66 -86 -f6 -e7 -1d -05 +d3 +d9 +c0 +c5 +42 +84 +6e +42 +f7 +16 +e1 +9d +9a +6c 29 -87 -09 -49 -e3 -c1 -9e -fa -8a -b4 -87 -63 -21 -66 -7c -9f +8d c3 -36 -f1 -a5 -e2 -a0 3e -61 -49 -12 -92 -9e -71 -96 -cd -43 -72 -85 -ef -d9 +b3 +0b +93 +c4 +95 +de +4e +0b +36 +1c +f7 +52 +93 +dc +fa +f5 +b2 +6a +36 +ab +b6 +52 +fd +05 +73 +97 +4d +40 +65 +f5 +a3 +17 74 15 -e1 -14 -b8 -e9 -e0 -b5 -38 +88 +a2 +a0 +3a +ec b1 -56 -c1 +28 +78 +d0 +32 e7 0b -bc -1f -70 -61 -98 -d8 -54 -23 -28 -63 +d5 +89 +c0 +81 +5c +da +56 +32 +ec +a4 5e a1 -23 -eb +25 +db 4d -d2 -bc -05 -d4 -0b -cc -71 -72 -fc -9c -da -f7 -3b -a2 -c4 -6c -f9 +d8 +7f +c5 +7b +8b +00 +7a +3f +7d +d8 +d0 +e8 +4b ef -da -3b -90 -88 -33 -60 -7e -65 +ee +8f +bb 6f +d7 73 -d2 -1a -6f -b6 +a9 +89 +57 +69 +06 +2e +9c +53 +92 +75 +f3 +69 4e 1b -75 +7e +35 +1b +60 +0f +1a +c3 +66 +ce +69 +a0 +36 +cb +32 +9b +7a +16 +34 +7b +d3 +3f +bc +44 +d0 +a3 +02 +5b +2a +dd +bb +68 +19 50 -fa -24 -05 +8e +6e +80 +0e aa 55 40 @@ -7581,5 +7613,5 @@ 55 d3 66 -5d -4c +41 +7c Index: output/program.lis =================================================================== --- /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/program.lis (revision 3381) +++ /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/program.lis (working copy) @@ -29,8 +29,8 @@ 001a c02d84be beq patch0b_3 ,p_keyboard_app_enter_hibernate 001b c02e04b9 beq patch0b_4 ,p_keyboard_device_led_all_off 001c c02e84c0 beq patch0b_5 ,p_keyboard_setgpio_hibernate -001d c02f0598 beq patch0b_6 ,p_keyboard_g24_transmit_process -001e c02f85c6 beq patch0b_7 ,p_keyboard_g24_short_sleep +001d c02f05a3 beq patch0b_6 ,p_keyboard_g24_transmit_process +001e c02f85d1 beq patch0b_7 ,p_keyboard_g24_short_sleep 001f c03884be beq patch0e_1 ,p_keyboard_app_enter_hibernate 0020 c03b0044 beq patch0e_6 ,p_keyboard_adc_read 0021 c03b8221 beq patch0e_7 ,p_keyboard_adc_read_start @@ -42,9 +42,9 @@ 0027 c06a84a4 beq patch1a_5 ,p_gpio_set_wake_by_current_state 0028 c06b049d beq patch1a_6 ,p_gpio_set_wake 0029 c06d013a beq patch1b_2 ,p_sadc_calibration -002a c06d85cb beq patch1b_3 ,p_adc_init_data -002b c06e0608 beq patch1b_4 ,p_enable_adc -002c c06e85e9 beq patch1b_5 ,p_vdd_calculate_by_mode +002a c06d85d6 beq patch1b_3 ,p_adc_init_data +002b c06e0613 beq patch1b_4 ,p_enable_adc +002c c06e85f4 beq patch1b_5 ,p_vdd_calculate_by_mode 002d c07b0567 beq patch1e_6 ,p_ui_ipc_send_event 002e c07d056f beq patch1f_2 ,p_check_51cmd_once_continue 002f 2020235a branch assert @@ -623,7 +623,7 @@ 01fc 58000000 setarg 0 01fd 67e3c846 store 7 ,mem_mouse_key 01fe 70473f01 jam 1 ,mem_sensor_shutdown_flag -01ff 20200591 branch p_keyboard_g24_long_sleep +01ff 2020059c branch p_keyboard_g24_long_sleep p_keyboard_24g_fast_conn_attempt_fail: 0200 6fe44713 fetch mouse_flag_len ,mem_mouse_flag @@ -780,7 +780,7 @@ p_keyboard_scrolllock_led_off: 0277 6fe0cd10 fetch 1 ,mem_keyboard_reuse_led_bit -0278 c280028b bbit1 keyboard_reuse_numled_bit ,p_keyboard_lowpower_scrolllock_led_off +0278 c281028b bbit1 keyboard_reuse_scrollled_bit ,p_keyboard_lowpower_scrolllock_led_off 0279 6fe0ca08 fetch 1 ,mem_keyboard_device_poweron_timer_count 027a 247a0000 nrtn blank 027b 6848cbbb fetcht 1 ,mem_keyboard_scroll_led_gpio @@ -1833,211 +1833,228 @@ 0580 20403651 call g24_transmit_receive_ack 0581 242c3586 nbranch g24_reconn_device_fail ,sync 0582 2437b586 nbranch g24_reconn_device_fail ,user3 -0583 204005be call p_keyboard_g24_ackpayload_parse +0583 204005c9 call p_keyboard_g24_ackpayload_parse 0584 2020356a branch g24_reconn_dispatch_next + 5 p_keyboard_g24_transmit_no_interrupt: 0585 20403625 call g24_txdata_prep -0586 2434058a nbranch p_keyboard_g24_nodata_transmit ,user +0586 24340595 nbranch p_keyboard_g24_nodata_transmit ,user p_keyboard_g24_transmit_start: -0587 20400598 call p_keyboard_g24_transmit_process -0588 20404fd5 call keyboard_power_ctrl_start -0589 20204fdb branch keyboard_g24_transmit_start_next +0587 2040058b call p_keyboard_24g_fast_conn_mode_check +0588 204005a3 call p_keyboard_g24_transmit_process +0589 20404fd5 call keyboard_power_ctrl_start +058a 20204fdb branch keyboard_g24_transmit_start_next + +p_keyboard_24g_fast_conn_mode_check: +058b 6fe245e8 fetch 4 ,mem_24g_receiver_addr +058c 684a45e4 fetcht 4 ,mem_24g_fast_conn_addr +058d 98467c00 isub temp ,null +058e 20228590 branch p_keyboard_soft_agc_enable ,zero +058f 20200593 branch p_keyboard_soft_agc_disable + +p_keyboard_soft_agc_enable: +0590 70414300 jam 0 ,mem_gain_fix +0591 704141aa jam tx_power_factory ,mem_tx_power +0592 20600000 rtn + +p_keyboard_soft_agc_disable: +0593 704143ff jam 0xff ,mem_gain_fix +0594 20600000 rtn p_keyboard_g24_nodata_transmit: -058a 6fe4489c fetch 8 ,mem_keyscan_value_current -058b 243a4fdb nbranch keyboard_g24_transmit_start_next ,blank -058c 6fe448a4 fetch 8 ,mem_keyscan_value_current + 8 -058d 243a4fdb nbranch keyboard_g24_transmit_start_next ,blank -058e 6fe248ac fetch 4 ,mem_keyscan_value_current + 16 -058f 243a4fdb nbranch keyboard_g24_transmit_start_next ,blank -0590 2040369d call g24_search_receiver +0595 6fe4489c fetch 8 ,mem_keyscan_value_current +0596 243a4fdb nbranch keyboard_g24_transmit_start_next ,blank +0597 6fe448a4 fetch 8 ,mem_keyscan_value_current + 8 +0598 243a4fdb nbranch keyboard_g24_transmit_start_next ,blank +0599 6fe248ac fetch 4 ,mem_keyscan_value_current + 16 +059a 243a4fdb nbranch keyboard_g24_transmit_start_next ,blank +059b 2040369d call g24_search_receiver p_keyboard_g24_long_sleep: -0591 20404fc8 call keyboard_g24_lpm_wait -0592 24740000 nrtn user -0593 204036be call g24_setgpio_lpm_before -0594 6fe0c73f fetch 1 ,mem_sensor_shutdown_flag -0595 245a4f75 ncall keyboard_setgpio_hibernate ,blank -0596 6fe445af fetch 8 ,mem_24g_enter_hibernate -0597 20203622 branch g24_long_seep2 +059c 20404fc8 call keyboard_g24_lpm_wait +059d 24740000 nrtn user +059e 204036be call g24_setgpio_lpm_before +059f 6fe0c73f fetch 1 ,mem_sensor_shutdown_flag +05a0 245a4f75 ncall keyboard_setgpio_hibernate ,blank +05a1 6fe445af fetch 8 ,mem_24g_enter_hibernate +05a2 20203622 branch g24_long_seep2 p_keyboard_g24_transmit_process: -0598 70460100 jam 0 ,mem_24g_retry +05a3 70460100 jam 0 ,mem_24g_retry p_keyboard_g24_transmit_loop: -0599 69610040 fetchr timeup ,2 ,mem_param_rx_setup -059a 34730200 until clkn_rt ,meet -059b 20404df5 call keyboard_special_key_check -059c 6fe145d8 fetch 2 ,mem_24g_pair_timeout -059d 243a3646 nbranch g24_transmit_no_ack ,blank -059e 20403651 call g24_transmit_receive_ack -059f 6fe0c57f fetch 1 ,mem_24g_no_ack -05a0 c000b646 beq no_ack_24g ,g24_transmit_no_ack -05a1 242c05a6 nbranch p_keyboard_g24_retransmit ,sync -05a2 243785a6 nbranch p_keyboard_g24_retransmit ,user3 -05a3 204005be call p_keyboard_g24_ackpayload_parse -05a4 70473f00 jam 0 ,mem_sensor_shutdown_flag -05a5 20203646 branch g24_transmit_no_ack +05a4 69610040 fetchr timeup ,2 ,mem_param_rx_setup +05a5 34730200 until clkn_rt ,meet +05a6 20404df5 call keyboard_special_key_check +05a7 6fe145d8 fetch 2 ,mem_24g_pair_timeout +05a8 243a3646 nbranch g24_transmit_no_ack ,blank +05a9 20403651 call g24_transmit_receive_ack +05aa 6fe0c57f fetch 1 ,mem_24g_no_ack +05ab c000b646 beq no_ack_24g ,g24_transmit_no_ack +05ac 242c05b1 nbranch p_keyboard_g24_retransmit ,sync +05ad 243785b1 nbranch p_keyboard_g24_retransmit ,user3 +05ae 204005c9 call p_keyboard_g24_ackpayload_parse +05af 70473f00 jam 0 ,mem_sensor_shutdown_flag +05b0 20203646 branch g24_transmit_no_ack p_keyboard_g24_retransmit: -05a6 6fe0c602 fetch 1 ,mem_24g_abort_pac -05a7 247a0000 nrtn blank -05a8 6fe145fe fetch 2 ,mem_24g_txfail_cnt -05a9 1fe0fe01 increase 1 ,pdata -05aa 67e145fe store 2 ,mem_24g_txfail_cnt -05ab 6fe0c5fe fetch 1 ,mem_24g_txfail_cnt -05ac c07fb676 beq 0xff ,g24_tx_attempt_fail -05ad 6fe0c601 fetch 1 ,mem_24g_retry -05ae 1fe0fe01 increase 1 ,pdata -05af 67e0c601 store 1 ,mem_24g_retry -05b0 1fe17e03 and_into 0x03 ,pdata -05b1 203a05b3 branch p_keyboard_g24_transmit_hop_process ,blank -05b2 20200599 branch p_keyboard_g24_transmit_loop +05b1 6fe0c602 fetch 1 ,mem_24g_abort_pac +05b2 247a0000 nrtn blank +05b3 6fe145fe fetch 2 ,mem_24g_txfail_cnt +05b4 1fe0fe01 increase 1 ,pdata +05b5 67e145fe store 2 ,mem_24g_txfail_cnt +05b6 6fe0c5fe fetch 1 ,mem_24g_txfail_cnt +05b7 c07fb676 beq 0xff ,g24_tx_attempt_fail +05b8 6fe0c601 fetch 1 ,mem_24g_retry +05b9 1fe0fe01 increase 1 ,pdata +05ba 67e0c601 store 1 ,mem_24g_retry +05bb 1fe17e03 and_into 0x03 ,pdata +05bc 203a05be branch p_keyboard_g24_transmit_hop_process ,blank +05bd 202005a4 branch p_keyboard_g24_transmit_loop p_keyboard_g24_transmit_hop_process: -05b3 20404bfb call kscan_dispatch -05b4 2040042a call p_keyboard_device_select -05b5 6fe0cba1 fetch 1 ,mem_keyboard_switch_device_flag -05b6 243a3646 nbranch g24_transmit_no_ack ,blank -05b7 204005b9 call p_g24_tx_fast_hop -05b8 20200599 branch p_keyboard_g24_transmit_loop +05be 20404bfb call kscan_dispatch +05bf 2040042a call p_keyboard_device_select +05c0 6fe0cba1 fetch 1 ,mem_keyboard_switch_device_flag +05c1 243a3646 nbranch g24_transmit_no_ack ,blank +05c2 204005c4 call p_g24_tx_fast_hop +05c3 202005a4 branch p_keyboard_g24_transmit_loop p_g24_tx_fast_hop: -05b9 6fe2458f fetch 4 ,mem_24g_addr -05ba 684a45e4 fetcht 4 ,mem_24g_fast_conn_addr -05bb 98467c00 isub temp ,null -05bc 2022b222 branch g24_ch ,zero -05bd 2020369a branch g24_tx_fast_hop +05c4 6fe2458f fetch 4 ,mem_24g_addr +05c5 684a45e4 fetcht 4 ,mem_24g_fast_conn_addr +05c6 98467c00 isub temp ,null +05c7 2022b222 branch g24_ch ,zero +05c8 2020369a branch g24_tx_fast_hop p_keyboard_g24_ackpayload_parse: -05be 2040366e call g24_ackpayload_parse -05bf 6fe0c4f8 fetch 1 ,mem_24g_rxbuf + 1 -05c0 2fe1f008 compare 0x08 ,pdata ,0xf8 -05c1 24608000 nrtn true -05c2 6fe0c4f9 fetch 1 ,mem_24g_rxbuf + 2 -05c3 c07f81f8 beq 0xff ,p_keyboard_24g_hibernate_set -05c4 67e0c9aa store 1 ,mem_keyboard_led_status -05c5 20600000 rtn +05c9 2040366e call g24_ackpayload_parse +05ca 6fe0c4f8 fetch 1 ,mem_24g_rxbuf + 1 +05cb 2fe1f008 compare 0x08 ,pdata ,0xf8 +05cc 24608000 nrtn true +05cd 6fe0c4f9 fetch 1 ,mem_24g_rxbuf + 2 +05ce c07f81f8 beq 0xff ,p_keyboard_24g_hibernate_set +05cf 67e0c9aa store 1 ,mem_keyboard_led_status +05d0 20600000 rtn p_keyboard_g24_short_sleep: -05c6 204036b4 call g24_lpm_wait -05c7 24740000 nrtn user -05c8 204004ad call p_clear_wake -05c9 6fe1c608 fetch 3 ,mem_24g_short_sleep_set -05ca 20203622 branch g24_long_seep2 +05d1 204036b4 call g24_lpm_wait +05d2 24740000 nrtn user +05d3 204004ad call p_clear_wake +05d4 6fe1c608 fetch 3 ,mem_24g_short_sleep_set +05d5 20203622 branch g24_long_seep2 p_adc_init_data: -05cb 6fe401fd fetch 8 ,mem_otp_adc -05cc 203a6f79 branch adc_init_cal_data_default ,blank -05cd 67e443fd store 8 ,mem_reference_inter1p8v_2v_adc_io_data -05ce 20406b3a call enable_otp_read -05cf 20406aad call loadcode_check_otp_lock -05d0 dfe00fc0 arg otp_offset_adc_param_l_c0 ,pdata -05d1 9a40a400 iadd regb ,regb -05d2 df20000a arg 10 ,loopcnt -05d3 da2001fd arg mem_otp_temp ,rega -05d4 20406b74 call otp_read_data -05d5 20406b37 call disable_otp -05d6 6fe401fd fetch 8 ,mem_otp_temp -05d7 207a0000 rtn blank -05d8 67e44be9 store 8 ,mem_adc_reference3v_gpio1v_ft_data -05d9 efe10006 ifetch 2 ,contr -05da e7e10005 istore 2 ,contw -05db 20600000 rtn +05d6 6fe401fd fetch 8 ,mem_otp_adc +05d7 203a6f79 branch adc_init_cal_data_default ,blank +05d8 67e443fd store 8 ,mem_reference_inter1p8v_2v_adc_io_data +05d9 20406b3a call enable_otp_read +05da 20406aad call loadcode_check_otp_lock +05db dfe00fc0 arg otp_offset_adc_param_l_c0 ,pdata +05dc 9a40a400 iadd regb ,regb +05dd df20000a arg 10 ,loopcnt +05de da2001fd arg mem_otp_temp ,rega +05df 20406b74 call otp_read_data +05e0 20406b37 call disable_otp +05e1 6fe401fd fetch 8 ,mem_otp_temp +05e2 207a0000 rtn blank +05e3 67e44be9 store 8 ,mem_adc_reference3v_gpio1v_ft_data +05e4 efe10006 ifetch 2 ,contr +05e5 e7e10005 istore 2 ,contw +05e6 20600000 rtn p_sadc_cal_write: -05dc 6ff080cc fetch 1 ,core_sadc_ctrl -05dd 79207e01 set1 1 ,pdata -05de 67f080cc store 1 ,core_sadc_ctrl -05df 6a40c419 fetchr regb ,1 ,mem_spi_write_addr -05e0 6fe0c433 fetch 1 ,mem_adc_cal_c7 -05e1 67e0c419 store 1 ,mem_spi_write_addr -05e2 df200008 arg 8 ,loopcnt -05e3 20406f67 call sadc_cal_write + 4 -05e4 6240c419 storer regb ,1 ,mem_spi_write_addr -05e5 6ff08a0a fetch 1 ,core_gpadc_cfg2 -05e6 793ffe04 set0 4 ,pdata -05e7 67f08a0a store 1 ,core_gpadc_cfg2 -05e8 20600000 rtn +05e7 6ff080cc fetch 1 ,core_sadc_ctrl +05e8 79207e01 set1 1 ,pdata +05e9 67f080cc store 1 ,core_sadc_ctrl +05ea 6a40c419 fetchr regb ,1 ,mem_spi_write_addr +05eb 6fe0c433 fetch 1 ,mem_adc_cal_c7 +05ec 67e0c419 store 1 ,mem_spi_write_addr +05ed df200008 arg 8 ,loopcnt +05ee 20406f67 call sadc_cal_write + 4 +05ef 6240c419 storer regb ,1 ,mem_spi_write_addr +05f0 6ff08a0a fetch 1 ,core_gpadc_cfg2 +05f1 793ffe04 set0 4 ,pdata +05f2 67f08a0a store 1 ,core_gpadc_cfg2 +05f3 20600000 rtn p_vdd_calculate_by_mode: p_vdd_reference_inter3v_calculate: -05e9 6fe0c407 fetch 1 ,mem_adc_config_flag -05ea c00085ed beq adc_config_hvin ,p_vdd_reference_inter3v_calculate_by_mode_vdcdc -05eb c00105f4 beq adc_config_gpio ,p_vdd_reference_inter3v_calculate_by_mode_gpio -05ec 20600000 rtn +05f4 6fe0c407 fetch 1 ,mem_adc_config_flag +05f5 c00085f8 beq adc_config_hvin ,p_vdd_reference_inter3v_calculate_by_mode_vdcdc +05f6 c00105ff beq adc_config_gpio ,p_vdd_reference_inter3v_calculate_by_mode_gpio +05f7 20600000 rtn p_vdd_reference_inter3v_calculate_by_mode_vdcdc: -05ed 580003e8 setarg 1000 -05ee 67e14405 store 2 ,mem_reference_voltage -05ef 68494bed fetcht 2 ,mem_adc_reference3v_vdcdc3p6v_ft_data -05f0 6fe14bef fetch 2 ,mem_adc_reference3v_vdcdc4p6v_ft_data -05f1 da600e10 arg 3600 ,regc -05f2 20406fc0 call vdd_calculate -05f3 202005fa branch p_mul1v_div1v_to_cal +05f8 580003e8 setarg 1000 +05f9 67e14405 store 2 ,mem_reference_voltage +05fa 68494bed fetcht 2 ,mem_adc_reference3v_vdcdc3p6v_ft_data +05fb 6fe14bef fetch 2 ,mem_adc_reference3v_vdcdc4p6v_ft_data +05fc da600e10 arg 3600 ,regc +05fd 20406fc0 call vdd_calculate +05fe 20200605 branch p_mul1v_div1v_to_cal p_vdd_reference_inter3v_calculate_by_mode_gpio: -05f4 580003e8 setarg 1000 -05f5 67e14405 store 2 ,mem_reference_voltage -05f6 68494be9 fetcht 2 ,mem_adc_reference3v_gpio1v_ft_data -05f7 6fe14beb fetch 2 ,mem_adc_reference3v_gpio2v_ft_data -05f8 da6003e8 arg 1000 ,regc -05f9 20406fc0 call vdd_calculate +05ff 580003e8 setarg 1000 +0600 67e14405 store 2 ,mem_reference_voltage +0601 68494be9 fetcht 2 ,mem_adc_reference3v_gpio1v_ft_data +0602 6fe14beb fetch 2 ,mem_adc_reference3v_gpio2v_ft_data +0603 da6003e8 arg 1000 ,regc +0604 20406fc0 call vdd_calculate p_mul1v_div1v_to_cal: -05fa 68494bf1 fetcht 2 ,mem_adc_reference3v_inter1v_ft_data -05fb 984ffe00 imul32 temp ,pdata -05fc 68494bf3 fetcht 2 ,mem_adc_reference3v_inter1v_now_data -05fd 9846fc00 idiv temp -05fe 20207d5f branch get_div_result +0605 68494bf1 fetcht 2 ,mem_adc_reference3v_inter1v_ft_data +0606 984ffe00 imul32 temp ,pdata +0607 68494bf3 fetcht 2 ,mem_adc_reference3v_inter1v_now_data +0608 9846fc00 idiv temp +0609 20207d5f branch get_div_result p_enable_adc_init_config: -05ff 204005dc call p_sadc_cal_write -0600 6ff08a09 fetch 1 ,core_gpadc_cfg1 -0601 793ffe07 set0 7 ,pdata -0602 67f08a09 store 1 ,core_gpadc_cfg1 -0603 708a0777 jam 0x77 ,core_gpadc_ctrl -0604 708a08c1 jam 0xc1 ,core_gpadc_cfg0 -0605 708a0d61 jam 0x61 ,core_vtest_ctrl0 -0606 708a0b00 jam 0x00 ,core_gpadc_cfg3 -0607 20600000 rtn +060a 204005e7 call p_sadc_cal_write +060b 6ff08a09 fetch 1 ,core_gpadc_cfg1 +060c 793ffe07 set0 7 ,pdata +060d 67f08a09 store 1 ,core_gpadc_cfg1 +060e 708a0777 jam 0x77 ,core_gpadc_ctrl +060f 708a08c1 jam 0xc1 ,core_gpadc_cfg0 +0610 708a0d61 jam 0x61 ,core_vtest_ctrl0 +0611 708a0b00 jam 0x00 ,core_gpadc_cfg3 +0612 20600000 rtn p_enable_adc: p_enable_adc_reference_source_inter3v: -0608 204005ff call p_enable_adc_init_config -0609 20406f90 call sadc_channel -060a 6fe0c409 fetch 1 ,mem_adc_clkdiv -060b 67f080cd store 1 ,core_sadc_clkdiv -060c 20406f97 call sadc_read -060d 708a0d60 jam 0x60 ,core_vtest_ctrl0 -060e 7080cd00 jam 0x00 ,core_sadc_clkdiv +0613 2040060a call p_enable_adc_init_config +0614 20406f90 call sadc_channel +0615 6fe0c409 fetch 1 ,mem_adc_clkdiv +0616 67f080cd store 1 ,core_sadc_clkdiv +0617 20406f97 call sadc_read +0618 708a0d60 jam 0x60 ,core_vtest_ctrl0 +0619 7080cd00 jam 0x00 ,core_sadc_clkdiv p_read_adc_inter1v: -060f 204005ff call p_enable_adc_init_config -0610 6fe0c409 fetch 1 ,mem_adc_clkdiv -0611 67f080cd store 1 ,core_sadc_clkdiv -0612 708a0b50 jam 0x50 ,core_gpadc_cfg3 -0613 708a0ec0 jam 0xc0 ,core_vtest_ctrl1 -0614 df00000b arg 0xb ,regext_index -0615 6de1440a fetchr regext ,2 ,mem_adc_current_value -0616 7080cc03 jam 0x03 ,core_sadc_ctrl -0617 20400621 call p_sar_adc_read_wait -0618 68590164 fetcht 2 ,core_sadc_data -0619 60494bf3 storet 2 ,mem_adc_reference3v_inter1v_now_data -061a 20406f9c call sadc_read_wait + 4 -061b df00000b arg 0xb ,regext_index -061c 65e1440a storer regext ,2 ,mem_adc_current_value -061d 708a0d60 jam 0x60 ,core_vtest_ctrl0 -061e 7080cd00 jam 0x00 ,core_sadc_clkdiv -061f 7080cc00 jam 0x00 ,core_sadc_ctrl -0620 20600000 rtn +061a 2040060a call p_enable_adc_init_config +061b 6fe0c409 fetch 1 ,mem_adc_clkdiv +061c 67f080cd store 1 ,core_sadc_clkdiv +061d 708a0b50 jam 0x50 ,core_gpadc_cfg3 +061e 708a0ec0 jam 0xc0 ,core_vtest_ctrl1 +061f df00000b arg 0xb ,regext_index +0620 6de1440a fetchr regext ,2 ,mem_adc_current_value +0621 7080cc03 jam 0x03 ,core_sadc_ctrl +0622 2040062c call p_sar_adc_read_wait +0623 68590164 fetcht 2 ,core_sadc_data +0624 60494bf3 storet 2 ,mem_adc_reference3v_inter1v_now_data +0625 20406f9c call sadc_read_wait + 4 +0626 df00000b arg 0xb ,regext_index +0627 65e1440a storer regext ,2 ,mem_adc_current_value +0628 708a0d60 jam 0x60 ,core_vtest_ctrl0 +0629 7080cd00 jam 0x00 ,core_sadc_clkdiv +062a 7080cc00 jam 0x00 ,core_sadc_ctrl +062b 20600000 rtn p_sar_adc_read_wait: -0621 6ff08129 fetch 1 ,core_perf_status -0622 c3028621 bbit0 saradc_done ,p_sar_adc_read_wait -0623 20600000 rtn +062c 6ff08129 fetch 1 ,core_perf_status +062d c302862c bbit0 saradc_done ,p_sar_adc_read_wait +062e 20600000 rtn Index: output/ramcode.rom =================================================================== --- /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/ramcode.rom (revision 3381) +++ /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/ramcode.rom (working copy) @@ -27,8 +27,8 @@ c02d84be c02e04b9 c02e84c0 -c02f0598 -c02f85c6 +c02f05a3 +c02f85d1 c03884be c03b0044 c03b8221 @@ -40,9 +40,9 @@ c06a84a4 c06b049d c06d013a -c06d85cb -c06e0608 -c06e85e9 +c06d85d6 +c06e0613 +c06e85f4 c07b0567 c07d056f 2020235a @@ -509,7 +509,7 @@ 58000000 67e3c846 70473f01 -20200591 +2020059c 6fe44713 c29f6034 c2986034 @@ -630,7 +630,7 @@ c3820000 20200272 6fe0cd10 -c280028b +c281028b 6fe0ca08 247a0000 6848cbbb @@ -1409,13 +1409,24 @@ 20403651 242c3586 2437b586 -204005be +204005c9 2020356a 20403625 -2434058a -20400598 +24340595 +2040058b +204005a3 20404fd5 20204fdb +6fe245e8 +684a45e4 +98467c00 +20228590 +20200593 +70414300 +704141aa +20600000 +704143ff +20600000 6fe4489c 243a4fdb 6fe448a4 @@ -1439,9 +1450,9 @@ 20403651 6fe0c57f c000b646 -242c05a6 -243785a6 -204005be +242c05b1 +243785b1 +204005c9 70473f00 20203646 6fe0c602 @@ -1455,14 +1466,14 @@ 1fe0fe01 67e0c601 1fe17e03 -203a05b3 -20200599 +203a05be +202005a4 20404bfb 2040042a 6fe0cba1 243a3646 -204005b9 -20200599 +204005c4 +202005a4 6fe2458f 684a45e4 98467c00 @@ -1512,8 +1523,8 @@ 67f08a0a 20600000 6fe0c407 -c00085ed -c00105f4 +c00085f8 +c00105ff 20600000 580003e8 67e14405 @@ -1521,7 +1532,7 @@ 6fe14bef da600e10 20406fc0 -202005fa +20200605 580003e8 67e14405 68494be9 @@ -1533,7 +1544,7 @@ 68494bf3 9846fc00 20207d5f -204005dc +204005e7 6ff08a09 793ffe07 67f08a09 @@ -1542,14 +1553,14 @@ 708a0d61 708a0b00 20600000 -204005ff +2040060a 20406f90 6fe0c409 67f080cd 20406f97 708a0d60 7080cd00 -204005ff +2040060a 6fe0c409 67f080cd 708a0b50 @@ -1557,7 +1568,7 @@ df00000b 6de1440a 7080cc03 -20400621 +2040062c 68590164 60494bf3 20406f9c @@ -1568,5 +1579,5 @@ 7080cc00 20600000 6ff08129 -c3028621 +c302862c 20600000 Index: output/romcode.rom =================================================================== --- /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/romcode.rom (revision 3381) +++ /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/output/romcode.rom (working copy) @@ -31182,15 +31182,4 @@ 00000000 00000000 00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00000000 -00001cfe \ No newline at end of file +0000023b \ No newline at end of file Index: program/patch.prog =================================================================== --- /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/program/patch.prog (revision 3381) +++ /1121s/branch/keyboard/internal/YC1031s_only_24g_sdk/program/patch.prog (working copy) @@ -980,7 +980,7 @@ ifdef scroll_led_enable p_keyboard_scrolllock_led_off: fetch 1,mem_keyboard_reuse_led_bit - bbit1 KEYBOARD_REUSE_NUMLED_BIT,p_keyboard_lowpower_scrolllock_led_off + bbit1 KEYBOARD_REUSE_SCROLLLED_BIT,p_keyboard_lowpower_scrolllock_led_off fetch 1,mem_keyboard_device_poweron_timer_count nrtn blank fetcht 1,mem_keyboard_scroll_led_gpio @@ -2814,10 +2814,28 @@ call g24_txdata_prep nbranch p_keyboard_g24_nodata_transmit,user p_keyboard_g24_transmit_start: + call p_keyboard_24g_fast_conn_mode_check call p_keyboard_g24_transmit_process call keyboard_power_ctrl_start branch keyboard_g24_transmit_start_next +p_keyboard_24g_fast_conn_mode_check: + fetch 4,mem_24g_receiver_addr + fetcht 4,mem_24g_fast_conn_addr + isub temp,null + branch p_keyboard_soft_agc_enable,zero + branch p_keyboard_soft_agc_disable + +p_keyboard_soft_agc_enable: + jam 0,mem_gain_fix + jam TX_POWER_FACTORY,mem_tx_power + rtn + +p_keyboard_soft_agc_disable: + jam 0xff,mem_gain_fix + rtn + + p_keyboard_g24_nodata_transmit: fetch 8,mem_keyscan_value_current nbranch keyboard_g24_transmit_start_next,blank