Index: format/app_mouse.format =================================================================== --- /branch/mouse_project/SA/24G&BLE_PB/format/app_mouse.format (revision 2043) +++ /branch/mouse_project/SA/24G&BLE_PB/format/app_mouse.format (working copy) @@ -239,7 +239,7 @@ 1 mem_mouse_fast_conn_flag -19 mem_le_adv_swift_pair +20 mem_le_adv_swift_pair 1 mem_mouse_send_secutiry_request_timer 1 mem_le_send_security_request_flag @@ -247,6 +247,8 @@ 3 mem_le_lap_high_3B 6 mem_mouse_24g_addr_init + +2 mem_firmware_version ) ( Index: output/eeprom.dat =================================================================== --- /branch/mouse_project/SA/24G&BLE_PB/output/eeprom.dat (revision 2043) +++ /branch/mouse_project/SA/24G&BLE_PB/output/eeprom.dat (working copy) @@ -131,11 +131,11 @@ 68 08 c9 -f3 +f6 58 00 49 -fa +fd 98 40 8a @@ -159,7 +159,7 @@ 60 08 c9 -f3 +f6 20 60 00 @@ -223,7 +223,7 @@ 68 00 ca -78 +7b c0 00 80 @@ -247,7 +247,7 @@ 68 00 c9 -48 +4b c1 ff 80 @@ -287,7 +287,7 @@ 60 01 c9 -67 +6a 70 48 0e @@ -311,7 +311,7 @@ 68 01 4a -79 +7c 1f e0 fe @@ -319,11 +319,11 @@ 60 01 4a -79 +7c 68 09 4a -7b +7e 98 46 7c @@ -338,7 +338,7 @@ 38 70 4a -78 +7b 00 58 00 @@ -347,7 +347,7 @@ 60 01 4a -79 +7c 58 00 00 @@ -355,19 +355,19 @@ 60 01 4a -7b +7e 70 49 -73 +76 00 68 00 c9 -5e +61 60 00 c9 -5d +60 20 60 00 @@ -375,11 +375,11 @@ 68 00 c9 -5f +62 60 00 c9 -5d +60 20 60 00 @@ -387,7 +387,7 @@ 68 00 c9 -73 +76 1f e0 fe @@ -395,7 +395,7 @@ 60 00 c9 -73 +76 c0 02 00 @@ -410,7 +410,7 @@ 00 70 4a -78 +7b 01 58 00 @@ -419,7 +419,7 @@ 60 01 4a -79 +7c 20 60 00 @@ -427,7 +427,7 @@ 68 00 c9 -64 +67 20 5a 00 @@ -443,7 +443,7 @@ 68 01 c9 -67 +6a 20 40 7f @@ -491,7 +491,7 @@ 68 00 ca -78 +7b c0 00 ff @@ -502,11 +502,11 @@ 9d 70 49 -64 +67 01 70 4a -6d +70 00 20 40 @@ -515,7 +515,7 @@ 60 00 c8 -d4 +d7 58 00 00 @@ -523,23 +523,23 @@ 60 03 c8 -d5 +d8 68 02 49 -6f +72 60 02 48 -dc +df 70 49 -38 +3b 0c 68 00 c9 -39 +3c 79 20 7e @@ -547,7 +547,7 @@ 60 00 c9 -39 +3c 20 40 06 @@ -763,7 +763,7 @@ 60 00 c9 -ef +f2 20 40 04 @@ -791,7 +791,7 @@ 68 00 c9 -ef +f2 60 00 c1 @@ -823,7 +823,7 @@ 60 01 c8 -a9 +aa 20 40 01 @@ -970,7 +970,7 @@ 00 70 48 -a7 +a8 01 70 47 @@ -1095,7 +1095,7 @@ 60 01 49 -65 +68 20 40 42 @@ -1739,7 +1739,7 @@ 68 03 48 -ac +ad 68 0b 47 @@ -1779,7 +1779,7 @@ 68 03 4a -7d +80 60 03 44 @@ -1887,7 +1887,7 @@ 60 01 4a -7b +7e 20 60 00 @@ -1899,7 +1899,7 @@ 60 01 4a -7b +7e 24 55 81 @@ -1955,7 +1955,7 @@ d8 c0 49 -60 +63 20 40 7f @@ -2007,7 +2007,7 @@ 60 01 4a -69 +6c 58 00 00 @@ -2163,7 +2163,7 @@ 70 48 0b -05 +0a 20 60 00 @@ -2318,7 +2318,7 @@ 62 70 48 -a8 +a9 01 68 00 @@ -2330,7 +2330,7 @@ 46 70 48 -a6 +a7 14 70 48 @@ -2362,7 +2362,7 @@ c3 70 48 -a8 +a9 00 58 00 @@ -2483,7 +2483,7 @@ da 20 49 -60 +63 da 40 00 @@ -2498,7 +2498,7 @@ 00 70 4a -78 +7b 00 20 40 @@ -2647,7 +2647,7 @@ 60 01 c9 -67 +6a 70 48 0c @@ -2711,7 +2711,7 @@ 68 00 c8 -a8 +a9 20 7a 00 @@ -2719,7 +2719,7 @@ da 60 48 -a6 +a7 da 40 02 @@ -2731,7 +2731,7 @@ 68 00 c8 -a7 +a8 24 7a 00 @@ -3174,7 +3174,7 @@ 35 70 48 -a7 +a8 00 20 40 @@ -3227,7 +3227,7 @@ 68 01 c8 -a9 +aa 60 01 c4 @@ -3978,7 +3978,7 @@ f6 70 48 -a7 +a8 01 20 20 @@ -4203,23 +4203,23 @@ 60 02 49 -6f +72 20 60 00 00 70 4a -6e +71 01 70 4a -70 +73 00 68 00 c9 -39 +3c 1f e1 7e @@ -4227,7 +4227,7 @@ 60 00 c9 -39 +3c 20 60 00 @@ -4235,7 +4235,7 @@ 68 00 c9 -39 +3c 79 20 7e @@ -4243,11 +4243,11 @@ 60 00 c9 -39 +3c 60 00 c8 -f4 +f7 20 60 00 @@ -4255,7 +4255,7 @@ 68 00 c9 -39 +3c 79 3f fe @@ -4263,7 +4263,7 @@ 60 00 c9 -39 +3c 20 60 00 @@ -4275,7 +4275,7 @@ 68 00 ca -6f +72 c0 00 84 @@ -4290,15 +4290,15 @@ 00 70 4a -70 +73 02 70 4a -6c +6f 00 70 4a -6e +71 00 20 20 @@ -4306,7 +4306,7 @@ 1d 70 4a -6d +70 00 20 20 @@ -4315,7 +4315,7 @@ 68 01 49 -3e +41 1f e0 fe @@ -4323,7 +4323,7 @@ 60 01 49 -3e +41 c2 85 04 @@ -4331,19 +4331,19 @@ 68 00 ca -6d +70 c0 00 84 3e 70 4a -6d +70 01 68 00 ca -6d +70 c0 80 84 @@ -4351,7 +4351,7 @@ 68 00 ca -6b +6e 1f e0 fe @@ -4359,7 +4359,7 @@ 60 00 ca -6b +6e c0 02 04 @@ -4370,7 +4370,7 @@ 33 70 49 -7d +80 02 20 20 @@ -4382,7 +4382,7 @@ ee 70 4a -6b +6e 00 20 20 @@ -4390,15 +4390,15 @@ 1d 70 4a -70 +73 02 70 4a -6e +71 01 70 4a -6d +70 00 20 20 @@ -4407,7 +4407,7 @@ 68 00 ca -6f +72 c0 01 84 @@ -4415,7 +4415,7 @@ 68 00 c9 -39 +3c 2f ec 00 @@ -4427,7 +4427,7 @@ 68 00 ca -6f +72 c0 00 84 @@ -4443,7 +4443,7 @@ 68 00 c9 -48 +4b c1 ff 80 @@ -4467,7 +4467,7 @@ 68 00 ca -6e +71 c1 80 80 @@ -4475,18 +4475,18 @@ 68 00 ca -70 +73 c1 80 00 00 70 4a -6f +72 01 70 49 -7d +80 04 20 20 @@ -4495,7 +4495,7 @@ 68 00 ca -70 +73 20 3a 04 @@ -4507,10 +4507,10 @@ 60 00 ca -70 +73 70 4a -6f +72 02 20 40 @@ -4518,7 +4518,7 @@ 33 70 49 -7d +80 04 20 60 @@ -4526,12 +4526,12 @@ 00 70 4a -6f +72 03 68 00 ca -6d +70 24 3a 04 @@ -4542,7 +4542,7 @@ 33 70 49 -7d +80 02 20 60 @@ -4551,7 +4551,7 @@ 68 00 c9 -48 +4b c0 ff 85 @@ -4566,7 +4566,7 @@ 21 70 49 -3d +40 01 20 60 @@ -4575,7 +4575,7 @@ 68 01 4a -69 +6c 20 40 7f @@ -4587,7 +4587,7 @@ 68 03 c8 -d5 +d8 20 7a 00 @@ -4602,7 +4602,7 @@ 93 70 49 -64 +67 00 1a 20 @@ -4611,7 +4611,7 @@ 60 00 c9 -38 +3b 20 40 04 @@ -4619,7 +4619,7 @@ 60 00 c8 -d4 +d7 e8 a8 80 @@ -4655,7 +4655,7 @@ d8 a0 48 -da +dd df 20 00 @@ -4714,7 +4714,7 @@ 84 70 49 -41 +44 00 d9 60 @@ -4731,7 +4731,7 @@ 68 00 c9 -74 +77 c1 00 80 @@ -4759,7 +4759,7 @@ 68 00 c9 -37 +3a 1f e0 fe @@ -4767,11 +4767,11 @@ 60 00 c9 -37 +3a 68 00 c9 -48 +4b c0 ff 84 @@ -4787,18 +4787,18 @@ 60 01 49 -3e +41 60 00 c9 -40 +43 60 00 ca -6c +6f 70 49 -3d +40 00 20 60 @@ -4811,7 +4811,7 @@ d8 a0 48 -d4 +d7 20 20 7e @@ -4835,7 +4835,7 @@ 68 00 c9 -74 +77 c0 00 84 @@ -4847,7 +4847,7 @@ 68 02 49 -60 +63 98 00 12 @@ -4887,7 +4887,7 @@ 68 00 c9 -40 +43 1f e0 fe @@ -4895,11 +4895,11 @@ 60 00 c9 -40 +43 68 00 c9 -48 +4b c0 ff 84 @@ -4907,7 +4907,7 @@ 68 08 c9 -41 +44 18 40 84 @@ -4915,11 +4915,11 @@ 60 08 c9 -41 +44 68 00 c9 -7d +80 98 46 7e @@ -4931,7 +4931,7 @@ 68 00 ca -6f +72 c0 01 84 @@ -4939,7 +4939,7 @@ 68 00 ca -6c +6f 1f e0 fe @@ -4947,7 +4947,7 @@ 60 00 ca -6c +6f c0 01 04 @@ -4958,7 +4958,7 @@ 21 70 49 -7d +80 01 20 20 @@ -4967,14 +4967,14 @@ 68 00 c9 -40 +43 c1 ff 80 00 70 49 -40 +43 00 20 20 @@ -4987,7 +4987,7 @@ 60 01 49 -3e +41 70 0a 99 @@ -5003,7 +5003,7 @@ 68 00 c9 -36 +39 20 7a 00 @@ -5015,22 +5015,22 @@ d8 c0 48 -b4 +b7 d8 a0 49 -16 +19 20 20 7f 01 70 4a -74 +77 01 70 4a -71 +74 00 20 60 @@ -5039,7 +5039,7 @@ 68 00 ca -71 +74 1f e0 fe @@ -5047,7 +5047,7 @@ 60 00 ca -71 +74 20 60 00 @@ -5055,7 +5055,7 @@ 68 00 ca -71 +74 1f e6 7c @@ -5067,7 +5067,7 @@ 68 00 ca -71 +74 c1 00 00 @@ -5079,14 +5079,14 @@ 60 00 ca -71 +74 20 60 00 00 70 4a -71 +74 03 20 60 @@ -5103,7 +5103,7 @@ da 20 49 -fa +fd 20 40 06 @@ -5111,7 +5111,7 @@ 60 08 ca -72 +75 58 00 00 @@ -5135,7 +5135,7 @@ 68 00 ca -71 +74 1f e6 7c @@ -5147,7 +5147,7 @@ 68 00 ca -71 +74 c0 00 05 @@ -5159,19 +5159,19 @@ 68 00 ca -71 +74 c1 90 00 00 70 4a -71 +74 00 68 08 ca -72 +75 58 00 00 @@ -5195,7 +5195,7 @@ 68 00 ca -74 +77 c0 00 05 @@ -5207,7 +5207,7 @@ 60 00 ca -74 +77 c0 00 05 @@ -5222,12 +5222,12 @@ 00 70 4a -71 +74 00 68 00 ca -74 +77 c0 01 05 @@ -5239,7 +5239,7 @@ 60 00 ca -74 +77 c0 00 85 @@ -5270,7 +5270,7 @@ 26 70 49 -48 +4b 01 20 60 @@ -5282,16 +5282,16 @@ 20 70 49 -37 +3a 00 70 49 -42 +45 4e 68 02 49 -44 +47 20 20 06 @@ -5299,7 +5299,7 @@ 68 00 c9 -3d +40 c0 00 ff @@ -5307,7 +5307,7 @@ 68 00 c9 -48 +4b c0 00 85 @@ -5326,7 +5326,7 @@ 8c 70 49 -48 +4b 11 70 11 @@ -5338,7 +5338,7 @@ 3a 70 49 -48 +4b 12 70 11 @@ -5350,7 +5350,7 @@ 3a 70 49 -48 +4b 13 70 11 @@ -5359,7 +5359,7 @@ 68 00 c9 -39 +3c 1f e1 7e @@ -5371,7 +5371,7 @@ 68 02 49 -6f +72 60 02 11 @@ -5407,7 +5407,7 @@ 68 00 c9 -48 +4b c1 7f 80 @@ -5430,7 +5430,7 @@ 00 70 49 -48 +4b 02 20 20 @@ -5438,7 +5438,7 @@ aa 70 49 -48 +4b 03 20 20 @@ -5446,7 +5446,7 @@ aa 70 49 -48 +4b ff 70 0a @@ -5459,7 +5459,7 @@ 68 02 49 -18 +1b 20 40 06 @@ -5479,7 +5479,7 @@ 68 00 c9 -48 +4b c1 ff 80 @@ -5495,7 +5495,7 @@ 60 01 49 -65 +68 20 40 2a @@ -5507,7 +5507,7 @@ 68 00 c9 -65 +68 c0 7f 84 @@ -5535,7 +5535,7 @@ 60 01 49 -65 +68 70 48 0c @@ -5563,7 +5563,7 @@ 68 00 c9 -39 +3c 60 00 91 @@ -5571,7 +5571,7 @@ 68 02 49 -6f +72 60 02 11 @@ -5595,7 +5595,7 @@ 68 01 49 -65 +68 1f e0 fe @@ -5603,7 +5603,7 @@ 60 01 49 -65 +68 20 40 06 @@ -5626,7 +5626,7 @@ 6c 70 49 -65 +68 00 20 40 @@ -5639,7 +5639,7 @@ 68 00 c9 -65 +68 c0 7f 84 @@ -5667,11 +5667,11 @@ 68 02 49 -60 +63 68 0a 49 -44 +47 98 46 7c @@ -5687,7 +5687,7 @@ 68 00 c9 -65 +68 1f e0 fe @@ -5695,11 +5695,11 @@ 60 00 c9 -65 +68 68 00 ca -76 +79 1f e0 fe @@ -5711,7 +5711,7 @@ 60 00 ca -76 +79 c0 00 05 @@ -5731,11 +5731,11 @@ 68 02 4a -7d +80 60 02 49 -60 +63 20 40 06 @@ -5779,7 +5779,7 @@ 60 08 c9 -38 +3b 18 42 72 @@ -5787,7 +5787,7 @@ d8 a0 48 -d4 +d7 1a 22 0c @@ -5799,7 +5799,7 @@ 68 00 c8 -b3 +b6 1f e9 7e @@ -5807,7 +5807,7 @@ 60 00 c9 -36 +39 1f e0 fe @@ -5815,7 +5815,7 @@ d8 c0 48 -b3 +b6 98 c0 8c @@ -5827,11 +5827,11 @@ 60 01 c9 -75 +78 68 00 c8 -b3 +b6 1f e3 7e @@ -5843,7 +5843,7 @@ 60 00 c9 -7b +7e 20 60 00 @@ -6051,7 +6051,7 @@ 68 0a 49 -59 +5c 1c 42 7e @@ -6071,11 +6071,11 @@ 68 02 49 -59 +5c 68 08 c9 -5d +60 98 40 84 @@ -6099,7 +6099,7 @@ 60 02 49 -59 +5c 20 20 7f @@ -6115,7 +6115,7 @@ 68 08 c9 -f2 +f5 da 20 0d @@ -6127,7 +6127,7 @@ 60 08 c9 -f2 +f5 20 60 00 @@ -6227,7 +6227,7 @@ 60 02 49 -60 +63 da 20 00 @@ -6239,7 +6239,7 @@ d8 c0 49 -60 +63 e8 c0 80 @@ -6259,15 +6259,15 @@ 60 01 49 -e9 +ec 68 00 c9 -e9 +ec 68 08 c9 -ea +ed 98 40 fe @@ -6275,7 +6275,7 @@ 60 00 c9 -eb +ee 20 60 00 @@ -6283,7 +6283,7 @@ 68 00 c9 -38 +3b 1f e0 fe @@ -6291,19 +6291,19 @@ 60 00 c9 -3a +3d 68 00 c9 -39 +3c 60 00 c8 -f4 +f7 68 00 c9 -38 +3b 1f e9 fe @@ -6311,7 +6311,7 @@ 68 08 c9 -37 +3a 18 41 04 @@ -6327,7 +6327,7 @@ 68 08 c9 -74 +77 98 40 fe @@ -6339,7 +6339,7 @@ 68 00 c9 -38 +3b 98 00 72 @@ -6347,7 +6347,7 @@ d8 c0 48 -d4 +d7 20 20 7f @@ -6355,7 +6355,7 @@ 68 08 c9 -43 +46 20 40 06 @@ -6363,7 +6363,7 @@ 60 08 c9 -43 +46 20 60 00 @@ -6387,7 +6387,7 @@ 68 00 c9 -60 +63 1f e1 7e @@ -6399,7 +6399,7 @@ 58 00 49 -49 +4c 9a 20 fe @@ -6415,7 +6415,7 @@ 60 00 c9 -42 +45 20 60 00 @@ -6439,7 +6439,7 @@ 68 00 c9 -42 +45 1f ed 84 @@ -6463,7 +6463,7 @@ 68 02 49 -60 +63 98 00 12 @@ -6475,7 +6475,7 @@ 68 08 c9 -42 +45 20 40 29 @@ -6519,7 +6519,7 @@ 68 01 49 -3b +3e 98 00 36 @@ -6555,11 +6555,11 @@ 60 00 c9 -ec +ef 68 08 c9 -eb +ee 98 46 7c @@ -6575,11 +6575,11 @@ 60 00 c8 -b2 +b5 68 00 c9 -7e +81 1f e6 7c @@ -6591,11 +6591,11 @@ 68 00 c8 -b2 +b5 68 08 c9 -39 +3c a8 40 0e @@ -6647,7 +6647,7 @@ 60 00 ca -73 +76 1a 22 0a @@ -6711,7 +6711,7 @@ 68 00 ca -73 +76 20 20 00 @@ -6751,7 +6751,7 @@ 68 08 c9 -42 +45 20 20 29 @@ -6763,7 +6763,7 @@ 68 02 49 -60 +63 98 00 12 @@ -6827,7 +6827,7 @@ 68 00 c9 -eb +ee 08 00 86 @@ -6835,7 +6835,7 @@ 68 00 c9 -3a +3d 98 00 72 @@ -6843,7 +6843,7 @@ d8 c0 48 -f4 +f7 e8 c0 80 @@ -7396,8 +7396,8 @@ 20 07 33 -49 -c1 +97 +3a aa 55 08 @@ -7964,9 +7964,9 @@ 65 aa 55 -06 +08 00 -ac +ad 48 ff ff @@ -7974,11 +7974,13 @@ ff ff ff +01 +00 aa 55 04 00 -39 +3c 49 01 00 @@ -7988,7 +7990,7 @@ 55 15 00 -44 +47 49 20 15 @@ -8015,7 +8017,7 @@ 55 03 00 -5d +60 49 19 19 @@ -8024,7 +8026,7 @@ 55 03 00 -67 +6a 49 80 ee @@ -8033,7 +8035,7 @@ 55 02 00 -7d +80 49 04 01 @@ -8041,7 +8043,7 @@ 55 06 00 -7d +80 4a 0f 0f @@ -8049,5 +8051,5 @@ 0f 0f 0f -77 -9f +85 +21 Index: output/memmap.format =================================================================== --- /branch/mouse_project/SA/24G&BLE_PB/output/memmap.format (revision 2043) +++ /branch/mouse_project/SA/24G&BLE_PB/output/memmap.format (working copy) @@ -1780,126 +1780,127 @@ 0x4890 mem_mouse_y_pre 0x4892 mem_mouse_fast_conn_flag 0x4893 mem_le_adv_swift_pair -0x48a6 mem_mouse_send_secutiry_request_timer -0x48a7 mem_le_send_security_request_flag -0x48a8 mem_mouse_le_bb_connected_flag -0x48a9 mem_le_lap_high_3B -0x48ac mem_mouse_24g_addr_init -0x48b2 mem_24g_rxbuf -0x48d4 mem_24g_txbuf -0x48f4 mem_24g_txpayload -0x4916 mem_24g_rxpayload -0x4936 mem_24g_rxdata_length -0x4937 mem_24g_pid -0x4938 mem_24g_datalen -0x4939 mem_24g_data_type -0x493a mem_24g_txlen -0x493b mem_24g_rx_window -0x493d mem_24g_ensure -0x493e mem_24g_txfail_cnt -0x4940 mem_24g_get_ack_fail -0x4941 mem_24g_retry -0x4942 mem_24g_ch -0x4943 mem_24g_current_ch_number -0x4944 mem_24g_paring_addr -0x4948 mem_24g_pairing_sm -0x4949 mem_24g_ch_map1 -0x494d mem_24g_ch_map2 -0x4951 mem_24g_ch_map3 -0x4955 mem_24g_ch_map4 -0x4959 mem_24g_tx_btclk -0x495d mem_24g_interval -0x495e mem_24g_interval_min -0x495f mem_24g_interval_max -0x4960 mem_24g_addr -0x4964 mem_24g_abort_pac -0x4965 mem_24g_check_dongle_times -0x4967 mem_24g_enter_hibernate -0x496f mem_24g_device_addr -0x4973 mem_24g_pac_index -0x4974 mem_24g_no_ack -0x4975 mem_24g_sta_crc -0x4978 mem_24g_last_crc -0x497b mem_24g_sta_pid -0x497c mem_24g_last_pid -0x497d mem_24g_max_retry -0x497e mem_24g_mode -0x497f mem_24g_rxdata_temp -0x49a1 mem_24g_rx_addr -0x49a5 mem_dongle_mode_init -0x49a6 mem_dongle_work_mode -0x49a7 mem_dongle_ms_bind_step -0x49a8 mem_dongle_kb_bind_step -0x49a9 mem_dongle_bind_device_status -0x49aa mem_24g_bind_payload -0x49b2 mem_24g_abort_packet -0x49b3 mem_24g_rf_laststa -0x49b4 mem_24g_hop_btclk -0x49b8 mem_24g_hop_interval -0x49b9 mem_24g_mode_switch -0x49ba mem_24g_ackpayload_enable -0x49bb mem_24g_hop_packet -0x49bc mem_24g_pair_mode -0x49bd mem_24g_nodata_timer_enable -0x49be mem_24g_time_slice -0x49bf mem_24g_kb_data_sta_data -0x49c7 mem_24g_kb_data_last_data -0x49cf mem_24g_kb_multikey_sta_data -0x49d2 mem_24g_kb_multikey_last_data -0x49d5 mem_24g_kb_blank_data_enable -0x49d6 mem_24g_kb_mul_blank_data_enable -0x49d7 mem_24g_ms_blank_data_enable -0x49d8 mem_24g_kb_addr -0x49dc mem_24g_ms_addr -0x49e0 mem_24g_dg_last_ch -0x49e1 mem_24g_dg_ch_number -0x49e2 mem_24g_dg_config_ch_once -0x49e3 mem_24g_kb_last_ch -0x49e4 mem_24g_kb_ch_number -0x49e5 mem_24g_kb_config_ch_once -0x49e6 mem_24g_ms_last_ch -0x49e7 mem_24g_ms_ch_number -0x49e8 mem_24g_ms_config_ch_once -0x49e9 mem_24g_syncword -0x49eb mem_24g_syncword_crc8 -0x49ec mem_24g_get_syncword_crc8 -0x49ed mem_24g_ota_sta_pid -0x49ef mem_tx_power_temp -0x49f0 mem_rssi_hex -0x49f1 mem_rssi_noise_avg -0x49f2 mem_rssi_noise_index -0x49f3 mem_rssi_signal_index -0x49f4 mem_rssi_noise_dg_avg -0x49f5 mem_rssi_noise_kb_avg -0x49f6 mem_rssi_noise_ms_avg -0x49f7 mem_rssi_noise_dg_index -0x49f8 mem_rssi_noise_kb_index -0x49f9 mem_rssi_noise_ms_index -0x49fa mem_rssi_signal_buf -0x4a02 mem_queue_ele_num -0x4a03 mem_queue_read -0x4a05 mem_queue_write -0x4a07 mem_queue_start -0x4a07 mem_data_ele0 -0x4a27 mem_data_ele1 -0x4a47 mem_data_ele2 -0x4a67 mem_queue_end -0x4a67 mem_queue_temp -0x4a69 mem_cb_24g_data -0x4a6b mem_24g_hop_fastly_cnt -0x4a6c mem_24g_hop_pac_retry -0x4a6d mem_24g_rf_hop_ch -0x4a6e mem_24g_rf_last_sta -0x4a6f mem_24g_rf_work_stage -0x4a70 mem_24g_sync_cnt -0x4a71 mem_power_ctrl_pac_succ_cnt -0x4a72 mem_rssi_avg_received -0x4a73 mem_rssi_hex_received -0x4a74 mem_power_ctrl_level -0x4a75 mem_seqi -0x4a76 mem_24g_auto_paring_switch -0x4a77 mem_24g_paccnt -0x4a78 mem_24g_transmit_by_interrupt -0x4a79 mem_24g_transmit_by_interrupt_exit_count -0x4a7b mem_24g_transmit_by_interrupt_exit_count_init -0x4a7d mem_24g_allpowerful_addr +0x48a7 mem_mouse_send_secutiry_request_timer +0x48a8 mem_le_send_security_request_flag +0x48a9 mem_mouse_le_bb_connected_flag +0x48aa mem_le_lap_high_3B +0x48ad mem_mouse_24g_addr_init +0x48b3 mem_firmware_version +0x48b5 mem_24g_rxbuf +0x48d7 mem_24g_txbuf +0x48f7 mem_24g_txpayload +0x4919 mem_24g_rxpayload +0x4939 mem_24g_rxdata_length +0x493a mem_24g_pid +0x493b mem_24g_datalen +0x493c mem_24g_data_type +0x493d mem_24g_txlen +0x493e mem_24g_rx_window +0x4940 mem_24g_ensure +0x4941 mem_24g_txfail_cnt +0x4943 mem_24g_get_ack_fail +0x4944 mem_24g_retry +0x4945 mem_24g_ch +0x4946 mem_24g_current_ch_number +0x4947 mem_24g_paring_addr +0x494b mem_24g_pairing_sm +0x494c mem_24g_ch_map1 +0x4950 mem_24g_ch_map2 +0x4954 mem_24g_ch_map3 +0x4958 mem_24g_ch_map4 +0x495c mem_24g_tx_btclk +0x4960 mem_24g_interval +0x4961 mem_24g_interval_min +0x4962 mem_24g_interval_max +0x4963 mem_24g_addr +0x4967 mem_24g_abort_pac +0x4968 mem_24g_check_dongle_times +0x496a mem_24g_enter_hibernate +0x4972 mem_24g_device_addr +0x4976 mem_24g_pac_index +0x4977 mem_24g_no_ack +0x4978 mem_24g_sta_crc +0x497b mem_24g_last_crc +0x497e mem_24g_sta_pid +0x497f mem_24g_last_pid +0x4980 mem_24g_max_retry +0x4981 mem_24g_mode +0x4982 mem_24g_rxdata_temp +0x49a4 mem_24g_rx_addr +0x49a8 mem_dongle_mode_init +0x49a9 mem_dongle_work_mode +0x49aa mem_dongle_ms_bind_step +0x49ab mem_dongle_kb_bind_step +0x49ac mem_dongle_bind_device_status +0x49ad mem_24g_bind_payload +0x49b5 mem_24g_abort_packet +0x49b6 mem_24g_rf_laststa +0x49b7 mem_24g_hop_btclk +0x49bb mem_24g_hop_interval +0x49bc mem_24g_mode_switch +0x49bd mem_24g_ackpayload_enable +0x49be mem_24g_hop_packet +0x49bf mem_24g_pair_mode +0x49c0 mem_24g_nodata_timer_enable +0x49c1 mem_24g_time_slice +0x49c2 mem_24g_kb_data_sta_data +0x49ca mem_24g_kb_data_last_data +0x49d2 mem_24g_kb_multikey_sta_data +0x49d5 mem_24g_kb_multikey_last_data +0x49d8 mem_24g_kb_blank_data_enable +0x49d9 mem_24g_kb_mul_blank_data_enable +0x49da mem_24g_ms_blank_data_enable +0x49db mem_24g_kb_addr +0x49df mem_24g_ms_addr +0x49e3 mem_24g_dg_last_ch +0x49e4 mem_24g_dg_ch_number +0x49e5 mem_24g_dg_config_ch_once +0x49e6 mem_24g_kb_last_ch +0x49e7 mem_24g_kb_ch_number +0x49e8 mem_24g_kb_config_ch_once +0x49e9 mem_24g_ms_last_ch +0x49ea mem_24g_ms_ch_number +0x49eb mem_24g_ms_config_ch_once +0x49ec mem_24g_syncword +0x49ee mem_24g_syncword_crc8 +0x49ef mem_24g_get_syncword_crc8 +0x49f0 mem_24g_ota_sta_pid +0x49f2 mem_tx_power_temp +0x49f3 mem_rssi_hex +0x49f4 mem_rssi_noise_avg +0x49f5 mem_rssi_noise_index +0x49f6 mem_rssi_signal_index +0x49f7 mem_rssi_noise_dg_avg +0x49f8 mem_rssi_noise_kb_avg +0x49f9 mem_rssi_noise_ms_avg +0x49fa mem_rssi_noise_dg_index +0x49fb mem_rssi_noise_kb_index +0x49fc mem_rssi_noise_ms_index +0x49fd mem_rssi_signal_buf +0x4a05 mem_queue_ele_num +0x4a06 mem_queue_read +0x4a08 mem_queue_write +0x4a0a mem_queue_start +0x4a0a mem_data_ele0 +0x4a2a mem_data_ele1 +0x4a4a mem_data_ele2 +0x4a6a mem_queue_end +0x4a6a mem_queue_temp +0x4a6c mem_cb_24g_data +0x4a6e mem_24g_hop_fastly_cnt +0x4a6f mem_24g_hop_pac_retry +0x4a70 mem_24g_rf_hop_ch +0x4a71 mem_24g_rf_last_sta +0x4a72 mem_24g_rf_work_stage +0x4a73 mem_24g_sync_cnt +0x4a74 mem_power_ctrl_pac_succ_cnt +0x4a75 mem_rssi_avg_received +0x4a76 mem_rssi_hex_received +0x4a77 mem_power_ctrl_level +0x4a78 mem_seqi +0x4a79 mem_24g_auto_paring_switch +0x4a7a mem_24g_paccnt +0x4a7b mem_24g_transmit_by_interrupt +0x4a7c mem_24g_transmit_by_interrupt_exit_count +0x4a7e mem_24g_transmit_by_interrupt_exit_count_init +0x4a80 mem_24g_allpowerful_addr Index: output/program.lis =================================================================== --- /branch/mouse_project/SA/24G&BLE_PB/output/program.lis (revision 2043) +++ /branch/mouse_project/SA/24G&BLE_PB/output/program.lis (working copy) @@ -35,14 +35,14 @@ p_rssi_signal: 001e 1fe22200 copy pdata ,rega -001f 6808c9f3 fetcht 1 ,mem_rssi_signal_index -0020 580049fa setarg mem_rssi_signal_buf +001f 6808c9f6 fetcht 1 ,mem_rssi_signal_index +0020 580049fd setarg mem_rssi_signal_buf 0021 98408a00 iadd temp ,contw 0022 1a227e00 copy rega ,pdata 0023 e0a08000 istore 1 ,contw 0024 18408401 increase 1 ,temp 0025 18410407 and_into rssi_buf_len_signal ,temp -0026 6008c9f3 storet 1 ,mem_rssi_signal_index +0026 6008c9f6 storet 1 ,mem_rssi_signal_index 0027 20600000 rtn p_soft_reset_0: @@ -66,7 +66,7 @@ p_g24_dispatch: 0035 c6930000 rtnmark0 mark_24g -0036 6800ca78 fetch 1 ,mem_24g_transmit_by_interrupt +0036 6800ca7b fetch 1 ,mem_24g_transmit_by_interrupt 0037 c0008049 beq g24_tx_timer_int_enable ,p_g24_transmit_by_interrupt p_g24_transmit_process: @@ -76,7 +76,7 @@ p_g24_transmit_start: 003b 20400499 call p_g24_transmit_packet -003c 6800c948 fetch 1 ,mem_24g_pairing_sm +003c 6800c94b fetch 1 ,mem_24g_pairing_sm 003d c1ff8000 rtnne state_24g_pairing_success 003e 204004f8 call power_ctrl_start 003f 20400045 call g24_long_sleep_shorter_param_update @@ -90,7 +90,7 @@ g24_long_sleep_shorter_param_update: 0045 58017700 setarg g24_long_sleep_step1 -0046 6001c967 store 3 ,mem_24g_enter_hibernate +0046 6001c96a store 3 ,mem_24g_enter_hibernate 0047 70480e1e jam 30 ,mem_24g_long_sleep_param_update_timer 0048 20600000 rtn @@ -98,54 +98,54 @@ 0049 204005e6 call p_g24_timer_check 004a 24740000 nrtn user 004b 2040005f call p_g24_interval_calibrate -004c 68014a79 fetch 2 ,mem_24g_transmit_by_interrupt_exit_count +004c 68014a7c fetch 2 ,mem_24g_transmit_by_interrupt_exit_count 004d 1fe0fe01 increase 1 ,pdata -004e 60014a79 store 2 ,mem_24g_transmit_by_interrupt_exit_count -004f 68094a7b fetcht 2 ,mem_24g_transmit_by_interrupt_exit_count_init +004e 60014a7c store 2 ,mem_24g_transmit_by_interrupt_exit_count +004f 68094a7e fetcht 2 ,mem_24g_transmit_by_interrupt_exit_count_init 0050 98467c00 isub temp ,null 0051 20428053 call p_g24_transmit_by_interrupt_exit ,zero 0052 20200038 branch p_g24_transmit_process p_g24_transmit_by_interrupt_exit: -0053 704a7800 jam g24_tx_timer_int_disable ,mem_24g_transmit_by_interrupt +0053 704a7b00 jam g24_tx_timer_int_disable ,mem_24g_transmit_by_interrupt 0054 58000000 setarg 0 -0055 60014a79 store 2 ,mem_24g_transmit_by_interrupt_exit_count +0055 60014a7c store 2 ,mem_24g_transmit_by_interrupt_exit_count 0056 58000019 setarg 25 -0057 60014a7b store 2 ,mem_24g_transmit_by_interrupt_exit_count_init +0057 60014a7e store 2 ,mem_24g_transmit_by_interrupt_exit_count_init p_g24_interval_min: -0058 70497300 jam 0 ,mem_24g_pac_index -0059 6800c95e fetch 1 ,mem_24g_interval_min -005a 6000c95d store 1 ,mem_24g_interval +0058 70497600 jam 0 ,mem_24g_pac_index +0059 6800c961 fetch 1 ,mem_24g_interval_min +005a 6000c960 store 1 ,mem_24g_interval 005b 20600000 rtn p_g24_interval_max: -005c 6800c95f fetch 1 ,mem_24g_interval_max -005d 6000c95d store 1 ,mem_24g_interval +005c 6800c962 fetch 1 ,mem_24g_interval_max +005d 6000c960 store 1 ,mem_24g_interval 005e 20600000 rtn p_g24_interval_calibrate: -005f 6800c973 fetch 1 ,mem_24g_pac_index +005f 6800c976 fetch 1 ,mem_24g_pac_index 0060 1fe0fe01 increase 1 ,pdata -0061 6000c973 store 1 ,mem_24g_pac_index +0061 6000c976 store 1 ,mem_24g_pac_index 0062 c002005c beq 4 ,p_g24_interval_max 0063 c0028058 beq 5 ,p_g24_interval_min 0064 20600000 rtn p_g24_transmit_by_interrupt_enable: -0065 704a7801 jam g24_tx_timer_int_enable ,mem_24g_transmit_by_interrupt +0065 704a7b01 jam g24_tx_timer_int_enable ,mem_24g_transmit_by_interrupt 0066 58000000 setarg 0 -0067 60014a79 store 2 ,mem_24g_transmit_by_interrupt_exit_count +0067 60014a7c store 2 ,mem_24g_transmit_by_interrupt_exit_count 0068 20600000 rtn p_g24_nodata_transmit: -0069 6800c964 fetch 1 ,mem_24g_abort_pac +0069 6800c967 fetch 1 ,mem_24g_abort_pac 006a 205a007c call p_g24_send_abort_packet ,blank p_g24_long_sleep: 006b 20400071 call p_g24_lpm_wait 006c 24740000 nrtn user -006d 6801c967 fetch 3 ,mem_24g_enter_hibernate +006d 6801c96a fetch 3 ,mem_24g_enter_hibernate 006e 20407f49 call clk2lpo 006f 600a415b storet 4 ,mem_sleep_counter 0070 20202b2a branch lpm_sleep @@ -159,23 +159,23 @@ 0076 203a7fe9 branch disable_user ,blank 0077 6800c5b1 fetch 1 ,mem_sp_local_key_invalid 0078 203a7fe9 branch disable_user ,blank -0079 6800ca78 fetch 1 ,mem_24g_transmit_by_interrupt +0079 6800ca7b fetch 1 ,mem_24g_transmit_by_interrupt 007a c000ffe9 beq g24_tx_timer_int_enable ,disable_user 007b 2020009d branch p_mouse_setgpio_lpm p_g24_send_abort_packet: -007c 70496401 jam 1 ,mem_24g_abort_pac -007d 704a6d00 jam 0 ,mem_24g_rf_hop_ch +007c 70496701 jam 1 ,mem_24g_abort_pac +007d 704a7000 jam 0 ,mem_24g_rf_hop_ch 007e 2040041d call p_g24_transmit_rf_ctrl_clear -007f 6000c8d4 store 1 ,mem_24g_txbuf +007f 6000c8d7 store 1 ,mem_24g_txbuf 0080 58000000 setarg 0 -0081 6003c8d5 store 7 ,mem_24g_txbuf + 1 -0082 6802496f fetch 4 ,mem_24g_device_addr -0083 600248dc store 4 ,mem_24g_txbuf + 8 -0084 7049380c jam 12 ,mem_24g_datalen -0085 6800c939 fetch 1 ,mem_24g_data_type +0081 6003c8d8 store 7 ,mem_24g_txbuf + 1 +0082 68024972 fetch 4 ,mem_24g_device_addr +0083 600248df store 4 ,mem_24g_txbuf + 8 +0084 70493b0c jam 12 ,mem_24g_datalen +0085 6800c93c fetch 1 ,mem_24g_data_type 0086 79207e03 set1 bit_abort ,pdata -0087 6000c939 store 1 ,mem_24g_data_type +0087 6000c93c store 1 ,mem_24g_data_type 0088 20400621 call p_g24_transmit_prep 0089 20400474 call p_g24_txdata_enable_tx 008a 2020003b branch p_g24_transmit_start @@ -247,7 +247,7 @@ 00ba 203580c2 branch p_device_init_common ,wake 00bb 204006b9 call p_mouse_data_init 00bc 6800c1de fetch 1 ,mem_tx_power -00bd 6000c9ef store 1 ,mem_tx_power_temp +00bd 6000c9f2 store 1 ,mem_tx_power_temp 00be 204004e7 call power_ctrl_pac_succ_cnt_init 00bf 6800c685 fetch 1 ,mem_ui_button_timeout 00c0 6000c6da store 1 ,mem_combination_ui_button_count @@ -258,7 +258,7 @@ 00c3 202074b9 branch enable_authrom p_mouse_tx_power_init: -00c4 6800c9ef fetch 1 ,mem_tx_power_temp +00c4 6800c9f2 fetch 1 ,mem_tx_power_temp 00c5 6000c1de store 1 ,mem_tx_power 00c6 20600000 rtn @@ -268,7 +268,7 @@ 00c9 20758000 rtn wake 00ca 204006d3 call p_drawing_optima_init 00cb 6801c4a3 fetch 3 ,mem_le_lap + 3 -00cc 6001c8a9 store 3 ,mem_le_lap_high_3b +00cc 6001c8aa store 3 ,mem_le_lap_high_3b 00cd 204001ef call p_mouse_cb_fuction 00ce 204002d2 call p_mouse_check_key_gpio 00cf c0028107 beq mouse_lm_button ,p_mouse_24g_pairing_button @@ -317,7 +317,7 @@ 00f0 20600000 rtn p_mouse4_0_check_reconn_target: -00f1 7048a701 jam 1 ,mem_le_send_security_request_flag +00f1 7048a801 jam 1 ,mem_le_send_security_request_flag 00f2 7047a301 jam 1 ,mem_mouse_le_reconnect_flag 00f3 680146a8 fetch 2 ,mem_mouse_direct_timeout 00f4 6808c892 fetcht 1 ,mem_mouse_fast_conn_flag @@ -356,7 +356,7 @@ 010d 58000000 setarg 0 010e 600146ae store 2 ,mem_mouse_direct_timer 010f 6000c6b4 store 1 ,mem_mouse_send_blank_timer -0110 60014965 store 2 ,mem_24g_check_dongle_times +0110 60014968 store 2 ,mem_24g_check_dongle_times 0111 204042ca call mouse_stop_discovery 0112 20200522 branch p_g24_start_pairing_sm1 @@ -589,7 +589,7 @@ 01ae 204001be call p_mouse_init_environment 01af 2040026b call p_mouse_set_24g_addr_eeprom 01b0 204065df call iicd_read_eep_data -01b1 680348ac fetch 6 ,mem_mouse_24g_addr_init +01b1 680348ad fetch 6 ,mem_mouse_24g_addr_init 01b2 680b4722 fetcht 6 ,mem_device1_addr 01b3 98467c00 isub temp ,null 01b4 242281b7 nbranch p_mouse_le_fast_conn_disable ,zero @@ -603,7 +603,7 @@ p_mouse_fast_conn_init: 01b9 704892ff jam 0xff ,mem_mouse_fast_conn_flag 01ba 70421034 jam 0x34 ,mem_xrecord_mode -01bb 68034a7d fetch 6 ,mem_24g_allpowerful_addr +01bb 68034a80 fetch 6 ,mem_24g_allpowerful_addr 01bc 600344a0 store 6 ,mem_le_lap 01bd 20600000 rtn @@ -642,12 +642,12 @@ p_mouse_24g_transmit_by_interrupt_exit_count_max: 01d5 58000177 setarg 375 -01d6 60014a7b store 2 ,mem_24g_transmit_by_interrupt_exit_count_init +01d6 60014a7e store 2 ,mem_24g_transmit_by_interrupt_exit_count_init 01d7 20600000 rtn p_mouse_wakeup_from_power: 01d8 58000019 setarg 25 -01d9 60014a7b store 2 ,mem_24g_transmit_by_interrupt_exit_count_init +01d9 60014a7e store 2 ,mem_24g_transmit_by_interrupt_exit_count_init 01da 245581d5 ncall p_mouse_24g_transmit_by_interrupt_exit_count_max ,wake 01db 6800c87b fetch 1 ,mem_mouse_switch_device_flag 01dc c00081de beq 0x01 ,p_mouse_start_24g_mode @@ -665,7 +665,7 @@ p_g24_factory_check: 01e6 df200002 arg 2 ,loopcnt -01e7 d8c04960 arg mem_24g_addr ,contr +01e7 d8c04963 arg mem_24g_addr ,contr p_pdata_0xff_check: 01e8 20407fe7 call enable_user @@ -684,7 +684,7 @@ 01f1 580003fd setarg p_le_mouse_bb_event_connect_complete 01f2 600141f9 store 2 ,mem_cb_att_write 01f3 58000200 setarg p_mouse_g24_package_data -01f4 60014a69 store 2 ,mem_cb_24g_data +01f4 60014a6c store 2 ,mem_cb_24g_data 01f5 58000093 setarg p_mouse_before_lpm 01f6 600141ed store 2 ,mem_cb_before_lpm 01f7 5800022d setarg p_mouse_priority_bb_event @@ -733,7 +733,7 @@ 0218 6801469f fetch 2 ,mem_mouse_z 0219 207a0000 rtn blank 021a 70480a01 jam 1 ,mem_mouse_wheel_trigger -021b 70480b05 jam 5 ,mem_mouse_wheel_trigger_timer +021b 70480b0a jam 10 ,mem_mouse_wheel_trigger_timer 021c 20600000 rtn p_mouse_clear_sensor_data: @@ -788,10 +788,10 @@ 0241 20200362 branch p_mouse_le_conn_param_lpm_disable p_mouse_le_bb_event_connected: -0242 7048a801 jam 1 ,mem_mouse_le_bb_connected_flag +0242 7048a901 jam 1 ,mem_mouse_le_bb_connected_flag 0243 6800c7a3 fetch 1 ,mem_mouse_le_reconnect_flag 0244 243a0246 nbranch p_mouse_le_bb_event_connected_next ,blank -0245 7048a614 jam 0x14 ,mem_mouse_send_secutiry_request_timer +0245 7048a714 jam 0x14 ,mem_mouse_send_secutiry_request_timer p_mouse_le_bb_event_connected_next: 0246 70488500 jam 0 ,mem_mouse_ble_led_on_enable @@ -803,7 +803,7 @@ 024c 202041c3 branch mouse_le_bb_event_connected p_mouse_bb_disconnected: -024d 7048a800 jam 0 ,mem_mouse_le_bb_connected_flag +024d 7048a900 jam 0 ,mem_mouse_le_bb_connected_flag 024e 58000007 setarg le_interval_8_75ms 024f 60014496 store 2 ,mem_le_interval_min 0250 60014498 store 2 ,mem_le_interval_min + 2 @@ -847,13 +847,13 @@ 026a 202065d1 branch iicd_write_protect_eep_data p_mouse_set_24g_addr_eeprom: -026b da204960 arg mem_24g_addr ,rega +026b da204963 arg mem_24g_addr ,rega 026c da40005b arg mouse_g24_addr_eeprom_offect ,regb 026d d8400004 arg 4 ,temp 026e 20600000 rtn p_mouse_24g_attempt_fail: -026f 704a7800 jam g24_tx_timer_int_disable ,mem_24g_transmit_by_interrupt +026f 704a7b00 jam g24_tx_timer_int_disable ,mem_24g_transmit_by_interrupt 0270 204000c4 call p_mouse_tx_power_init 0271 2040059f call p_g24_check_51cmd_stop_24g @@ -904,7 +904,7 @@ p_mouse_24g_long_sleep_normal_param: 0293 58249f00 setarg g24_long_sleep_step2 -0294 6001c967 store 3 ,mem_24g_enter_hibernate +0294 6001c96a store 3 ,mem_24g_enter_hibernate p_mouse_enter_long_mult: 0295 70480c01 jam 1 ,mem_mouse_long_mult_flag @@ -932,14 +932,14 @@ 02a3 202043b8 branch mouse_long_button_bt_discovry p_le_send_smp_security_request_timer: -02a4 6800c8a8 fetch 1 ,mem_mouse_le_bb_connected_flag +02a4 6800c8a9 fetch 1 ,mem_mouse_le_bb_connected_flag 02a5 207a0000 rtn blank -02a6 da6048a6 arg mem_mouse_send_secutiry_request_timer ,regc +02a6 da6048a7 arg mem_mouse_send_secutiry_request_timer ,regc 02a7 da4002a9 arg p_le_pairing_sm_start_check ,regb 02a8 2020336d branch timer_single_step p_le_pairing_sm_start_check: -02a9 6800c8a7 fetch 1 ,mem_le_send_security_request_flag +02a9 6800c8a8 fetch 1 ,mem_le_send_security_request_flag 02aa 247a0000 nrtn blank 02ab 20205bf5 branch le_pairing_sm_start @@ -1104,7 +1104,7 @@ 0317 20200335 branch p_mouse_store_eerpom_random_addr_increase_count p_mouse_start_discovery: -0318 7048a700 jam 0 ,mem_le_send_security_request_flag +0318 7048a800 jam 0 ,mem_le_send_security_request_flag 0319 204000c4 call p_mouse_tx_power_init 031a 7047a000 jam 0 ,mem_mouse_clear_sensor_data_flag 031b 68014682 fetch 2 ,mem_ui_state_map @@ -1119,7 +1119,7 @@ 0324 6000c4a0 store 1 ,mem_le_lap p_mouse_start_discovery_norandom: -0325 6801c8a9 fetch 3 ,mem_le_lap_high_3b +0325 6801c8aa fetch 3 ,mem_le_lap_high_3b 0326 6001c4a3 store 3 ,mem_le_lap + 3 0327 204001b7 call p_mouse_le_fast_conn_disable 0328 20403418 call app_lpm_mult_disable @@ -1369,7 +1369,7 @@ 03e0 20205af6 branch le_parse_smp + 2 p_le_parse_smp_pairing_request: -03e1 7048a701 jam 1 ,mem_le_send_security_request_flag +03e1 7048a801 jam 1 ,mem_le_send_security_request_flag 03e2 20205b09 branch le_parse_smp_pairing_request p_le_parse_smp_pairing_failed: @@ -1445,99 +1445,99 @@ p_g24_set_device_addr: 0418 680240a0 fetch 4 ,mem_lap -0419 6002496f store 4 ,mem_24g_device_addr +0419 60024972 store 4 ,mem_24g_device_addr 041a 20600000 rtn p_g24_transmit_rf_sta_init: -041b 704a6e01 jam 1 ,mem_24g_rf_last_sta -041c 704a7000 jam 0 ,mem_24g_sync_cnt +041b 704a7101 jam 1 ,mem_24g_rf_last_sta +041c 704a7300 jam 0 ,mem_24g_sync_cnt p_g24_transmit_rf_ctrl_clear: -041d 6800c939 fetch 1 ,mem_24g_data_type +041d 6800c93c fetch 1 ,mem_24g_data_type 041e 1fe17e07 and_into bits_data ,pdata -041f 6000c939 store 1 ,mem_24g_data_type +041f 6000c93c store 1 ,mem_24g_data_type 0420 20600000 rtn p_g24_hop_ch_enable: -0421 6800c939 fetch 1 ,mem_24g_data_type +0421 6800c93c fetch 1 ,mem_24g_data_type 0422 79207e04 set1 bit_hop ,pdata -0423 6000c939 store 1 ,mem_24g_data_type -0424 6000c8f4 store 1 ,mem_24g_txpayload +0423 6000c93c store 1 ,mem_24g_data_type +0424 6000c8f7 store 1 ,mem_24g_txpayload 0425 20600000 rtn p_g24_hop_ch_disable: -0426 6800c939 fetch 1 ,mem_24g_data_type +0426 6800c93c fetch 1 ,mem_24g_data_type 0427 793ffe04 set0 bit_hop ,pdata -0428 6000c939 store 1 ,mem_24g_data_type +0428 6000c93c store 1 ,mem_24g_data_type 0429 20600000 rtn p_g24_transmit_hop_pac_fail: 042a 204004ee call power_ctrl_pac_succ_decrs -042b 6800ca6f fetch 1 ,mem_24g_rf_work_stage +042b 6800ca72 fetch 1 ,mem_24g_rf_work_stage 042c c000842f beq 1 ,p_g24_transmit_hop_pac_fail_wo_hop 042d c0010433 beq 2 ,p_g24_transmit_hop_pac_fail_hop_stage2 042e 20600000 rtn p_g24_transmit_hop_pac_fail_wo_hop: -042f 704a7002 jam 2 ,mem_24g_sync_cnt +042f 704a7302 jam 2 ,mem_24g_sync_cnt p_g24_transmit_hop_pac_fail_stage1: -0430 704a6c00 jam 0 ,mem_24g_hop_pac_retry -0431 704a6e00 jam 0 ,mem_24g_rf_last_sta +0430 704a6f00 jam 0 ,mem_24g_hop_pac_retry +0431 704a7100 jam 0 ,mem_24g_rf_last_sta 0432 2020041d branch p_g24_transmit_rf_ctrl_clear p_g24_transmit_hop_pac_fail_hop_stage2: -0433 704a6d00 jam 0 ,mem_24g_rf_hop_ch +0433 704a7000 jam 0 ,mem_24g_rf_hop_ch 0434 20200430 branch p_g24_transmit_hop_pac_fail_stage1 p_g24_transmit_pac_fail_hop_stage3: -0435 6801493e fetch 2 ,mem_24g_txfail_cnt +0435 68014941 fetch 2 ,mem_24g_txfail_cnt 0436 1fe0fe01 increase 1 ,pdata -0437 6001493e store 2 ,mem_24g_txfail_cnt +0437 60014941 store 2 ,mem_24g_txfail_cnt 0438 c28504dc bbit1 10 ,p_g24_tx_attempt_fail -0439 6800ca6d fetch 1 ,mem_24g_rf_hop_ch +0439 6800ca70 fetch 1 ,mem_24g_rf_hop_ch 043a c000843e beq 1 ,p_g24_rf_hop_fastly -043b 704a6d01 jam 1 ,mem_24g_rf_hop_ch +043b 704a7001 jam 1 ,mem_24g_rf_hop_ch p_g24_rf_hop_attemp_again: -043c 6800ca6d fetch 1 ,mem_24g_rf_hop_ch +043c 6800ca70 fetch 1 ,mem_24g_rf_hop_ch 043d c080841d bne 1 ,p_g24_transmit_rf_ctrl_clear p_g24_rf_hop_fastly: -043e 6800ca6b fetch 1 ,mem_24g_hop_fastly_cnt +043e 6800ca6e fetch 1 ,mem_24g_hop_fastly_cnt 043f 1fe0fe01 increase 1 ,pdata -0440 6000ca6b store 1 ,mem_24g_hop_fastly_cnt +0440 6000ca6e store 1 ,mem_24g_hop_fastly_cnt 0441 c0020445 beq 4 ,p_g24_rf_hop_fastly_exit 0442 20400633 call p_g24_ch -0443 70497d02 jam 2 ,mem_24g_max_retry +0443 70498002 jam 2 ,mem_24g_max_retry 0444 20200499 branch p_g24_transmit_packet p_g24_rf_hop_fastly_exit: 0445 204004ee call power_ctrl_pac_succ_decrs -0446 704a6b00 jam 0 ,mem_24g_hop_fastly_cnt +0446 704a6e00 jam 0 ,mem_24g_hop_fastly_cnt 0447 2020041d branch p_g24_transmit_rf_ctrl_clear p_g24_transmit_hop_pac_succ_wo_hop: -0448 704a7002 jam 2 ,mem_24g_sync_cnt +0448 704a7302 jam 2 ,mem_24g_sync_cnt p_g24_transmit_hop_pac_succ: -0449 704a6e01 jam 1 ,mem_24g_rf_last_sta -044a 704a6d00 jam 0 ,mem_24g_rf_hop_ch +0449 704a7101 jam 1 ,mem_24g_rf_last_sta +044a 704a7000 jam 0 ,mem_24g_rf_hop_ch 044b 2020041d branch p_g24_transmit_rf_ctrl_clear p_g24_transmit_succ_rf_config: -044c 6800ca6f fetch 1 ,mem_24g_rf_work_stage +044c 6800ca72 fetch 1 ,mem_24g_rf_work_stage 044d c0018449 beq 3 ,p_g24_transmit_hop_pac_succ -044e 6800c939 fetch 1 ,mem_24g_data_type +044e 6800c93c fetch 1 ,mem_24g_data_type 044f 2fec0004 isolate0 bit_hop ,pdata 0450 2020841b branch p_g24_transmit_rf_sta_init ,true -0451 6800ca6f fetch 1 ,mem_24g_rf_work_stage +0451 6800ca72 fetch 1 ,mem_24g_rf_work_stage 0452 c0008448 beq 1 ,p_g24_transmit_hop_pac_succ_wo_hop 0453 c0010449 beq 2 ,p_g24_transmit_hop_pac_succ 0454 20600000 rtn p_g24_rf_sta_check: -0455 6800c948 fetch 1 ,mem_24g_pairing_sm +0455 6800c94b fetch 1 ,mem_24g_pairing_sm 0456 c1ff8000 rtnne state_24g_pairing_success 0457 2040045a call p_g24_rf_laststa_synccnt_check 0458 24560462 ncall p_g24_rf_sync_cnt_check ,user2 @@ -1545,34 +1545,34 @@ p_g24_rf_laststa_synccnt_check: 045a 78567c00 disable user2 -045b 6800ca6e fetch 1 ,mem_24g_rf_last_sta +045b 6800ca71 fetch 1 ,mem_24g_rf_last_sta 045c c1808000 rtnne 1 -045d 6800ca70 fetch 1 ,mem_24g_sync_cnt +045d 6800ca73 fetch 1 ,mem_24g_sync_cnt 045e c1800000 rtnne 0 -045f 704a6f01 jam 1 ,mem_24g_rf_work_stage -0460 70497d04 jam 4 ,mem_24g_max_retry +045f 704a7201 jam 1 ,mem_24g_rf_work_stage +0460 70498004 jam 4 ,mem_24g_max_retry 0461 20207feb branch enable_user2 p_g24_rf_sync_cnt_check: -0462 6800ca70 fetch 1 ,mem_24g_sync_cnt +0462 6800ca73 fetch 1 ,mem_24g_sync_cnt 0463 203a046a branch p_g24_rf_hop_attemp ,blank 0464 1fe0ffff increase -1 ,pdata -0465 6000ca70 store 1 ,mem_24g_sync_cnt -0466 704a6f02 jam 2 ,mem_24g_rf_work_stage +0465 6000ca73 store 1 ,mem_24g_sync_cnt +0466 704a7202 jam 2 ,mem_24g_rf_work_stage 0467 20400633 call p_g24_ch -0468 70497d04 jam 4 ,mem_24g_max_retry +0468 70498004 jam 4 ,mem_24g_max_retry 0469 20600000 rtn p_g24_rf_hop_attemp: -046a 704a6f03 jam 3 ,mem_24g_rf_work_stage -046b 6800ca6d fetch 1 ,mem_24g_rf_hop_ch +046a 704a7203 jam 3 ,mem_24g_rf_work_stage +046b 6800ca70 fetch 1 ,mem_24g_rf_hop_ch 046c 243a043c nbranch p_g24_rf_hop_attemp_again ,blank 046d 20400633 call p_g24_ch -046e 70497d02 jam 2 ,mem_24g_max_retry +046e 70498002 jam 2 ,mem_24g_max_retry 046f 20600000 rtn p_g24_txdata_prep: -0470 6800c948 fetch 1 ,mem_24g_pairing_sm +0470 6800c94b fetch 1 ,mem_24g_pairing_sm 0471 c0ff852b bne state_24g_pairing_success ,p_g24_pairing_sm p_g24_txdata_prep_packeage_data: @@ -1580,24 +1580,24 @@ 0473 20400621 call p_g24_transmit_prep p_g24_txdata_enable_tx: -0474 70493d01 jam ensure_on_24g ,mem_24g_ensure +0474 70494001 jam ensure_on_24g ,mem_24g_ensure 0475 20600000 rtn p_g24_package_data: -0476 68014a69 fetch 2 ,mem_cb_24g_data +0476 68014a6c fetch 2 ,mem_cb_24g_data 0477 20407f9c call callback_func 0478 2034047c branch p_g24_accumulate_mouse_data ,user -0479 6803c8d5 fetch 7 ,mem_24g_txbuf + 1 +0479 6803c8d8 fetch 7 ,mem_24g_txbuf + 1 047a 207a0000 rtn blank 047b 20207fe7 branch enable_user p_g24_accumulate_mouse_data: 047c 20400493 call p_mouse_data_xy_release -047d 70496400 jam 0 ,mem_24g_abort_pac +047d 70496700 jam 0 ,mem_24g_abort_pac 047e 1a20fe01 add rega ,1 ,pdata -047f 6000c938 store 1 ,mem_24g_datalen +047f 6000c93b store 1 ,mem_24g_datalen 0480 2040041d call p_g24_transmit_rf_ctrl_clear -0481 6000c8d4 store 1 ,mem_24g_txbuf +0481 6000c8d7 store 1 ,mem_24g_txbuf 0482 e8a88000 ifetcht 1 ,contw 0483 ea408000 ifetch 1 ,regb 0484 9841fe00 ior temp ,pdata @@ -1606,7 +1606,7 @@ 0487 ea420000 ifetch 4 ,regb 0488 e0a20000 istore 4 ,contw 0489 1a40a404 increase 4 ,regb -048a d8a048da arg mem_24g_txbuf + 6 ,contw +048a d8a048dd arg mem_24g_txbuf + 6 ,contw 048b df200002 arg 2 ,loopcnt p_g24_accumulation_loop2: @@ -1627,13 +1627,13 @@ 0498 20200184 branch p_mouse_sensor_poweron p_g24_transmit_packet: -0499 70494100 jam 0 ,mem_24g_retry +0499 70494400 jam 0 ,mem_24g_retry p_g24_transmit_loop: 049a d9600d00 arg param_rx_setup ,timeup 049b 34730200 until clkn_rt ,meet 049c 204004b5 call p_g24_transmit_receive_ack -049d 6800c974 fetch 1 ,mem_24g_no_ack +049d 6800c977 fetch 1 ,mem_24g_no_ack 049e c1008000 rtneq no_ack_24g 049f 242c04c4 nbranch p_g24_retransmit ,sync 04a0 243784c4 nbranch p_g24_retransmit ,user3 @@ -1642,24 +1642,24 @@ 04a3 204004ea call power_ctrl_pac_succ_incrs p_g24_transmit_next_packet: -04a4 6800c937 fetch 1 ,mem_24g_pid +04a4 6800c93a fetch 1 ,mem_24g_pid 04a5 1fe0fe01 increase 1 ,pdata -04a6 6000c937 store 1 ,mem_24g_pid -04a7 6800c948 fetch 1 ,mem_24g_pairing_sm +04a6 6000c93a store 1 ,mem_24g_pid +04a7 6800c94b fetch 1 ,mem_24g_pairing_sm 04a8 c0ff84b3 bne state_24g_pairing_success ,p_g24_paring_mode_start 04a9 2040044c call p_g24_transmit_succ_rf_config p_g24_transmit_abandon: 04aa 58000000 setarg 0 -04ab 6001493e store 2 ,mem_24g_txfail_cnt -04ac 6000c940 store 1 ,mem_24g_get_ack_fail -04ad 6000ca6c store 1 ,mem_24g_hop_pac_retry -04ae 70493d00 jam ensure_off_24g ,mem_24g_ensure +04ab 60014941 store 2 ,mem_24g_txfail_cnt +04ac 6000c943 store 1 ,mem_24g_get_ack_fail +04ad 6000ca6f store 1 ,mem_24g_hop_pac_retry +04ae 70494000 jam ensure_off_24g ,mem_24g_ensure 04af 20600000 rtn p_g24_txbuf_clear: 04b0 df200004 arg 4 ,loopcnt -04b1 d8a048d4 arg mem_24g_txbuf ,contw +04b1 d8a048d7 arg mem_24g_txbuf ,contw 04b2 20207ec6 branch memset0 p_g24_paring_mode_start: @@ -1669,10 +1669,10 @@ p_g24_transmit_receive_ack: 04b5 7857fc00 disable user3 04b6 20400698 call p_g24_transmit -04b7 6800c974 fetch 1 ,mem_24g_no_ack +04b7 6800c977 fetch 1 ,mem_24g_no_ack 04b8 c00084c2 beq no_ack_24g ,p_g24_transmit_no_ack 04b9 18002a00 force 0 ,radio_ctrl -04ba 68024960 fetch 4 ,mem_24g_addr +04ba 68024963 fetch 4 ,mem_24g_addr 04bb 98001200 iforce access 04bc 68088017 fetcht 1 ,mem_last_freq 04bd 2040291f call set_freq_rx @@ -1686,36 +1686,36 @@ 04c3 202004a4 branch p_g24_transmit_next_packet p_g24_retransmit: -04c4 6800c940 fetch 1 ,mem_24g_get_ack_fail +04c4 6800c943 fetch 1 ,mem_24g_get_ack_fail 04c5 1fe0fe01 increase 1 ,pdata -04c6 6000c940 store 1 ,mem_24g_get_ack_fail -04c7 6800c948 fetch 1 ,mem_24g_pairing_sm +04c6 6000c943 store 1 ,mem_24g_get_ack_fail +04c7 6800c94b fetch 1 ,mem_24g_pairing_sm 04c8 c0ff84d8 bne state_24g_pairing_success ,p_g24_tx_paring_retry -04c9 6808c941 fetcht 1 ,mem_24g_retry +04c9 6808c944 fetcht 1 ,mem_24g_retry 04ca 18408401 increase 1 ,temp -04cb 6008c941 storet 1 ,mem_24g_retry -04cc 6800c97d fetch 1 ,mem_24g_max_retry +04cb 6008c944 storet 1 ,mem_24g_retry +04cc 6800c980 fetch 1 ,mem_24g_max_retry 04cd 98467e00 isub temp ,pdata 04ce 243a049a nbranch p_g24_transmit_loop ,blank -04cf 6800ca6f fetch 1 ,mem_24g_rf_work_stage +04cf 6800ca72 fetch 1 ,mem_24g_rf_work_stage 04d0 c0018435 beq 3 ,p_g24_transmit_pac_fail_hop_stage3 -04d1 6800ca6c fetch 1 ,mem_24g_hop_pac_retry +04d1 6800ca6f fetch 1 ,mem_24g_hop_pac_retry 04d2 1fe0fe01 increase 1 ,pdata -04d3 6000ca6c store 1 ,mem_24g_hop_pac_retry +04d3 6000ca6f store 1 ,mem_24g_hop_pac_retry 04d4 c001042a beq 2 ,p_g24_transmit_hop_pac_fail 04d5 20400421 call p_g24_hop_ch_enable -04d6 70497d01 jam 1 ,mem_24g_max_retry +04d6 70498001 jam 1 ,mem_24g_max_retry 04d7 20200499 branch p_g24_transmit_packet p_g24_tx_paring_retry: -04d8 6800c940 fetch 1 ,mem_24g_get_ack_fail +04d8 6800c943 fetch 1 ,mem_24g_get_ack_fail 04d9 c1ff8000 rtnne 0xff -04da 70494000 jam 0 ,mem_24g_get_ack_fail +04da 70494300 jam 0 ,mem_24g_get_ack_fail 04db 202004de branch p_g24_stop_g24_mode p_g24_tx_attempt_fail: 04dc 58000000 setarg 0 -04dd 6001493e store 2 ,mem_24g_txfail_cnt +04dd 60014941 store 2 ,mem_24g_txfail_cnt p_g24_stop_g24_mode: 04de 700a993a jam bt_evt_24g_attempt_fail ,mem_fifo_temp @@ -1723,44 +1723,44 @@ p_g24_ackpayload_parse: 04e0 204005a8 call p_g24_read_len_pid_crc -04e1 6800c936 fetch 1 ,mem_24g_rxdata_length +04e1 6800c939 fetch 1 ,mem_24g_rxdata_length 04e2 207a0000 rtn blank 04e3 98007200 iforce loopcnt -04e4 d8c048b4 arg mem_24g_rxbuf + 2 ,contr -04e5 d8a04916 arg mem_24g_rxpayload ,contw +04e4 d8c048b7 arg mem_24g_rxbuf + 2 ,contr +04e5 d8a04919 arg mem_24g_rxpayload ,contw 04e6 20207f01 branch memcpy power_ctrl_pac_succ_cnt_init: -04e7 704a7401 jam 1 ,mem_power_ctrl_level -04e8 704a7100 jam 0 ,mem_power_ctrl_pac_succ_cnt +04e7 704a7701 jam 1 ,mem_power_ctrl_level +04e8 704a7400 jam 0 ,mem_power_ctrl_pac_succ_cnt 04e9 20600000 rtn power_ctrl_pac_succ_incrs: -04ea 6800ca71 fetch 1 ,mem_power_ctrl_pac_succ_cnt +04ea 6800ca74 fetch 1 ,mem_power_ctrl_pac_succ_cnt 04eb 1fe0fe01 increase 1 ,pdata -04ec 6000ca71 store 1 ,mem_power_ctrl_pac_succ_cnt +04ec 6000ca74 store 1 ,mem_power_ctrl_pac_succ_cnt 04ed 20600000 rtn power_ctrl_pac_succ_decrs: -04ee 6800ca71 fetch 1 ,mem_power_ctrl_pac_succ_cnt +04ee 6800ca74 fetch 1 ,mem_power_ctrl_pac_succ_cnt 04ef 1fe67c02 sub pdata ,2 ,null 04f0 244104f6 ncall power_ctrl_pac_succ_cnt_reinit ,positive -04f1 6800ca71 fetch 1 ,mem_power_ctrl_pac_succ_cnt +04f1 6800ca74 fetch 1 ,mem_power_ctrl_pac_succ_cnt 04f2 c1000000 rtneq 0 04f3 1fe0ffff increase -1 ,pdata -04f4 6000ca71 store 1 ,mem_power_ctrl_pac_succ_cnt +04f4 6000ca74 store 1 ,mem_power_ctrl_pac_succ_cnt 04f5 20600000 rtn power_ctrl_pac_succ_cnt_reinit: -04f6 704a7103 jam 3 ,mem_power_ctrl_pac_succ_cnt +04f6 704a7403 jam 3 ,mem_power_ctrl_pac_succ_cnt 04f7 20600000 rtn power_ctrl_start: 04f8 68014682 fetch 2 ,mem_ui_state_map 04f9 c3858000 rtnbit1 ui_state_ble_adv -04fa da2049fa arg mem_rssi_signal_buf ,rega +04fa da2049fd arg mem_rssi_signal_buf ,rega 04fb 20400603 call p_rssi_average -04fc 6008ca72 storet 1 ,mem_rssi_avg_received +04fc 6008ca75 storet 1 ,mem_rssi_avg_received 04fd 58000082 setarg rssi_dis_max_24g 04fe c5130500 bmark1 mark_24g ,power_ctrl_start_next 04ff 58000080 setarg rssi_dis_max_ble @@ -1768,20 +1768,20 @@ power_ctrl_start_next: 0500 98467c00 isub temp ,null 0501 24210518 nbranch power_ctrl_txpower_incrs_force ,positive -0502 6800ca71 fetch 1 ,mem_power_ctrl_pac_succ_cnt +0502 6800ca74 fetch 1 ,mem_power_ctrl_pac_succ_cnt 0503 1fe67c02 sub pdata ,2 ,null 0504 24210508 nbranch power_ctrl_txpower_decrs_check ,positive -0505 6800ca71 fetch 1 ,mem_power_ctrl_pac_succ_cnt +0505 6800ca74 fetch 1 ,mem_power_ctrl_pac_succ_cnt 0506 c0000519 beq 0 ,power_ctrl_txpower_incrs 0507 20600000 rtn power_ctrl_txpower_decrs_check: -0508 6800ca71 fetch 1 ,mem_power_ctrl_pac_succ_cnt +0508 6800ca74 fetch 1 ,mem_power_ctrl_pac_succ_cnt 0509 c1900000 rtnne 32 -050a 704a7100 jam 0 ,mem_power_ctrl_pac_succ_cnt +050a 704a7400 jam 0 ,mem_power_ctrl_pac_succ_cnt power_ctrl_txpower_decrs: -050b 6808ca72 fetcht 1 ,mem_rssi_avg_received +050b 6808ca75 fetcht 1 ,mem_rssi_avg_received 050c 58000077 setarg rssi_dis_min_24g 050d c513050f bmark1 mark_24g ,power_ctrl_txpower_decrs_next 050e 58000075 setarg rssi_dis_min_ble @@ -1789,10 +1789,10 @@ power_ctrl_txpower_decrs_next: 050f 98467c00 isub temp ,null 0510 24610000 nrtn positive -0511 6800ca74 fetch 1 ,mem_power_ctrl_level +0511 6800ca77 fetch 1 ,mem_power_ctrl_level 0512 c0000520 beq 0 ,power_ctrl_decrs_level0 0513 1fe0ffff increase -1 ,pdata -0514 6000ca74 store 1 ,mem_power_ctrl_level +0514 6000ca77 store 1 ,mem_power_ctrl_level 0515 c0000520 beq 0 ,power_ctrl_decrs_level0 power_ctrl_decrs_level1: @@ -1802,13 +1802,13 @@ 0517 20600000 rtn power_ctrl_txpower_incrs_force: -0518 704a7100 jam 0 ,mem_power_ctrl_pac_succ_cnt +0518 704a7400 jam 0 ,mem_power_ctrl_pac_succ_cnt power_ctrl_txpower_incrs: -0519 6800ca74 fetch 1 ,mem_power_ctrl_level +0519 6800ca77 fetch 1 ,mem_power_ctrl_level 051a c001051e beq 2 ,power_ctrl_incrs_level2 051b 1fe0fe01 increase 1 ,pdata -051c 6000ca74 store 1 ,mem_power_ctrl_level +051c 6000ca77 store 1 ,mem_power_ctrl_level 051d c0008516 beq 1 ,power_ctrl_incrs_level1 power_ctrl_incrs_level2: @@ -1824,44 +1824,44 @@ 0523 20400526 call p_g24_pair_init p_g24_set_pairing_sm_1: -0524 70494801 jam state_24g_pairing_1 ,mem_24g_pairing_sm +0524 70494b01 jam state_24g_pairing_1 ,mem_24g_pairing_sm 0525 20600000 rtn p_g24_pair_init: 0526 7041de20 jam tx_power_pair ,mem_tx_power -0527 70493700 jam 0 ,mem_24g_pid -0528 7049424e jam g24_pair_ch ,mem_24g_ch -0529 68024944 fetch 4 ,mem_24g_paring_addr +0527 70493a00 jam 0 ,mem_24g_pid +0528 7049454e jam g24_pair_ch ,mem_24g_ch +0529 68024947 fetch 4 ,mem_24g_paring_addr 052a 20200613 branch p_g24_update_addr_and_synccrc8 p_g24_pairing_sm: -052b 6800c93d fetch 1 ,mem_24g_ensure +052b 6800c940 fetch 1 ,mem_24g_ensure 052c c000ffe7 beq ensure_on_24g ,enable_user -052d 6800c948 fetch 1 ,mem_24g_pairing_sm +052d 6800c94b fetch 1 ,mem_24g_pairing_sm 052e c0008532 beq state_24g_pairing_1 ,p_g24_pairing_sm_1 052f c0010535 beq state_24g_pairing_2 ,p_g24_pairing_sm_2 0530 c0018538 beq state_24g_pairing_3 ,p_g24_pairing_sm_3 0531 20202a8c branch assert p_g24_pairing_sm_1: -0532 70494811 jam state_24g_pairing_1_waiting_ack ,mem_24g_pairing_sm +0532 70494b11 jam state_24g_pairing_1_waiting_ack ,mem_24g_pairing_sm 0533 70119eaa jam 0xaa ,mem_24g_common_temp 0534 2020053a branch p_g24_pairing_sm_common p_g24_pairing_sm_2: -0535 70494812 jam state_24g_pairing_2_waiting_ack ,mem_24g_pairing_sm +0535 70494b12 jam state_24g_pairing_2_waiting_ack ,mem_24g_pairing_sm 0536 70119e55 jam 0x55 ,mem_24g_common_temp 0537 2020053a branch p_g24_pairing_sm_common p_g24_pairing_sm_3: -0538 70494813 jam state_24g_pairing_3_waiting_ack ,mem_24g_pairing_sm +0538 70494b13 jam state_24g_pairing_3_waiting_ack ,mem_24g_pairing_sm 0539 70119e22 jam 0x22 ,mem_24g_common_temp p_g24_pairing_sm_common: -053a 6800c939 fetch 1 ,mem_24g_data_type +053a 6800c93c fetch 1 ,mem_24g_data_type 053b 1fe17e07 and_into bits_data ,pdata 053c 6000919f store 1 ,mem_24g_common_temp + 1 -053d 6802496f fetch 4 ,mem_24g_device_addr +053d 68024972 fetch 4 ,mem_24g_device_addr 053e 600211a0 store 4 ,mem_24g_common_temp + 2 p_g24_put_pairing_data_in_buff: @@ -1874,7 +1874,7 @@ 0545 20207fe7 branch enable_user p_g24_paring_mode: -0546 6800c948 fetch 1 ,mem_24g_pairing_sm +0546 6800c94b fetch 1 ,mem_24g_pairing_sm 0547 c17f8000 rtneq state_24g_pairing_success 0548 c008854c beq state_24g_pairing_1_waiting_ack ,p_g24_pairing_sm_1_waiting_ack 0549 c009054e beq state_24g_pairing_2_waiting_ack ,p_g24_pairing_sm_2_waiting_ack @@ -1882,36 +1882,36 @@ 054b 20600000 rtn p_g24_pairing_sm_1_waiting_ack: -054c 70494802 jam state_24g_pairing_2 ,mem_24g_pairing_sm +054c 70494b02 jam state_24g_pairing_2 ,mem_24g_pairing_sm 054d 202004aa branch p_g24_transmit_abandon p_g24_pairing_sm_2_waiting_ack: -054e 70494803 jam state_24g_pairing_3 ,mem_24g_pairing_sm +054e 70494b03 jam state_24g_pairing_3 ,mem_24g_pairing_sm 054f 202004aa branch p_g24_transmit_abandon p_g24_pairing_sm_3_waiting_ack: -0550 704948ff jam state_24g_pairing_success ,mem_24g_pairing_sm +0550 70494bff jam state_24g_pairing_success ,mem_24g_pairing_sm 0551 700a9939 jam bt_evt_24g_pairing_complete ,mem_fifo_temp 0552 20407d86 call ui_ipc_send_event -0553 68024918 fetch 4 ,mem_24g_rxpayload + 2 +0553 6802491b fetch 4 ,mem_24g_rxpayload + 2 0554 20400613 call p_g24_update_addr_and_synccrc8 0555 202004aa branch p_g24_transmit_abandon p_g24_start_24g_mode: 0556 793f8026 set0 mark_24g ,mark 0557 20400599 call p_g24_ch_syncword_crc8_init -0558 6800c948 fetch 1 ,mem_24g_pairing_sm +0558 6800c94b fetch 1 ,mem_24g_pairing_sm 0559 c1ff8000 rtnne state_24g_pairing_success 055a 2040056c call p_g24_tx_attemp_data_prep p_g24_tx_attemp_dongle: 055b 58000000 setarg 0 -055c 60014965 store 2 ,mem_24g_check_dongle_times +055c 60014968 store 2 ,mem_24g_check_dongle_times p_g24_tx_attemp_dongle_loop: 055d 20402afa call lpo_calibration 055e 200007d0 nop 2000 -055f 6800c965 fetch 1 ,mem_24g_check_dongle_times +055f 6800c968 fetch 1 ,mem_24g_check_dongle_times 0560 c07f84de beq 0xff ,p_g24_stop_g24_mode 0561 204004b5 call p_g24_transmit_receive_ack 0562 242c0575 nbranch p_g24_attemp_txdata_retry ,sync @@ -1920,7 +1920,7 @@ p_g24_tx_attemp_dongle_succ: 0564 79200026 set1 mark_24g ,mark 0565 58000000 setarg 0 -0566 60014965 store 2 ,mem_24g_check_dongle_times +0566 60014968 store 2 ,mem_24g_check_dongle_times 0567 70480c00 jam 0 ,mem_mouse_long_mult_flag 0568 700a993c jam bt_evt_24g_attempt_success ,mem_fifo_temp 0569 20407d86 call ui_ipc_send_event @@ -1929,9 +1929,9 @@ p_g24_tx_attemp_data_prep: 056c 70119eff jam 0xff ,mem_24g_common_temp -056d 6800c939 fetch 1 ,mem_24g_data_type +056d 6800c93c fetch 1 ,mem_24g_data_type 056e 6000919f store 1 ,mem_24g_common_temp + 1 -056f 6802496f fetch 4 ,mem_24g_device_addr +056f 68024972 fetch 4 ,mem_24g_device_addr 0570 600211a0 store 4 ,mem_24g_common_temp + 2 0571 d8400006 arg 6 ,temp 0572 da20119e arg mem_24g_common_temp ,rega @@ -1939,9 +1939,9 @@ 0574 20200621 branch p_g24_transmit_prep p_g24_attemp_txdata_retry: -0575 68014965 fetch 2 ,mem_24g_check_dongle_times +0575 68014968 fetch 2 ,mem_24g_check_dongle_times 0576 1fe0fe01 increase 1 ,pdata -0577 60014965 store 2 ,mem_24g_check_dongle_times +0577 60014968 store 2 ,mem_24g_check_dongle_times 0578 20400633 call p_g24_ch 0579 2020055d branch p_g24_tx_attemp_dongle_loop @@ -1951,40 +1951,40 @@ 057c 2040056c call p_g24_tx_attemp_data_prep p_g24_auto_pair_restart: -057d 70496500 jam 0 ,mem_24g_check_dongle_times +057d 70496800 jam 0 ,mem_24g_check_dongle_times p_g24_auto_pair_start_loop: 057e 20402afa call lpo_calibration 057f 200007d0 nop 2000 -0580 6800c965 fetch 1 ,mem_24g_check_dongle_times +0580 6800c968 fetch 1 ,mem_24g_check_dongle_times 0581 c07f84de beq 0xff ,p_g24_stop_g24_mode 0582 204004b5 call p_g24_transmit_receive_ack 0583 242c058c nbranch p_g24_auto_pair_retry ,sync 0584 2437858c nbranch p_g24_auto_pair_retry ,user3 0585 204004e0 call p_g24_ackpayload_parse 0586 204000c4 call p_mouse_tx_power_init -0587 68024960 fetch 4 ,mem_24g_addr -0588 680a4944 fetcht 4 ,mem_24g_paring_addr +0587 68024963 fetch 4 ,mem_24g_addr +0588 680a4947 fetcht 4 ,mem_24g_paring_addr 0589 98467c00 isub temp ,null 058a 20228522 branch p_g24_start_pairing_sm1 ,zero 058b 20200564 branch p_g24_tx_attemp_dongle_succ p_g24_auto_pair_retry: -058c 6800c965 fetch 1 ,mem_24g_check_dongle_times +058c 6800c968 fetch 1 ,mem_24g_check_dongle_times 058d 1fe0fe01 increase 1 ,pdata -058e 6000c965 store 1 ,mem_24g_check_dongle_times -058f 6800ca76 fetch 1 ,mem_24g_auto_paring_switch +058e 6000c968 store 1 ,mem_24g_check_dongle_times +058f 6800ca79 fetch 1 ,mem_24g_auto_paring_switch 0590 1fe0fe01 increase 1 ,pdata 0591 1fe17e01 and_into 1 ,pdata -0592 6000ca76 store 1 ,mem_24g_auto_paring_switch +0592 6000ca79 store 1 ,mem_24g_auto_paring_switch 0593 c000059b beq 0 ,p_g24_auto_pair_device_attemp 0594 c000859d beq 1 ,p_g24_auto_pair_pair_attemp 0595 20600000 rtn p_g24_auto_pair_all_powerful: 0596 7041de20 jam tx_power_pair ,mem_tx_power -0597 68024a7d fetch 4 ,mem_24g_allpowerful_addr -0598 60024960 store 4 ,mem_24g_addr +0597 68024a80 fetch 4 ,mem_24g_allpowerful_addr +0598 60024963 store 4 ,mem_24g_addr p_g24_ch_syncword_crc8_init: 0599 20400614 call p_g24_syncword_crc8 @@ -2007,25 +2007,25 @@ 05a2 202043d2 branch mouse_disable_function_flag p_g24_put_data_in_buff: -05a3 6008c938 storet 1 ,mem_24g_datalen +05a3 6008c93b storet 1 ,mem_24g_datalen 05a4 18427200 copy temp ,loopcnt -05a5 d8a048d4 arg mem_24g_txbuf ,contw +05a5 d8a048d7 arg mem_24g_txbuf ,contw 05a6 1a220c00 copy rega ,contr 05a7 20207f01 branch memcpy p_g24_read_len_pid_crc: -05a8 6800c8b3 fetch 1 ,mem_24g_rxbuf + 1 +05a8 6800c8b6 fetch 1 ,mem_24g_rxbuf + 1 05a9 1fe97e00 rshift3 pdata ,pdata -05aa 6000c936 store 1 ,mem_24g_rxdata_length +05aa 6000c939 store 1 ,mem_24g_rxdata_length 05ab 1fe0fe01 increase 1 ,pdata -05ac d8c048b3 arg mem_24g_rxbuf + 1 ,contr +05ac d8c048b6 arg mem_24g_rxbuf + 1 ,contr 05ad 98c08c00 iadd contr ,contr 05ae e8c18000 ifetch 3 ,contr -05af 6001c975 store 3 ,mem_24g_sta_crc -05b0 6800c8b3 fetch 1 ,mem_24g_rxbuf + 1 +05af 6001c978 store 3 ,mem_24g_sta_crc +05b0 6800c8b6 fetch 1 ,mem_24g_rxbuf + 1 05b1 1fe37e00 rshift pdata ,pdata 05b2 1fe17e03 and pdata ,0x03 ,pdata -05b3 6000c97b store 1 ,mem_24g_sta_pid +05b3 6000c97e store 1 ,mem_24g_sta_pid 05b4 20600000 rtn p_set_freq_tx: @@ -2097,28 +2097,28 @@ p_g24_timer_check: 05e6 20407fe9 call disable_user -05e7 680a4959 fetcht 4 ,mem_24g_tx_btclk +05e7 680a495c fetcht 4 ,mem_24g_tx_btclk 05e8 1c427e00 copy clkn_bt ,pdata 05e9 98467c00 isub temp ,null 05ea 24412d18 ncall g24_timer_timeout ,positive 05eb 1fe22400 copy pdata ,regb -05ec 68024959 fetch 4 ,mem_24g_tx_btclk -05ed 6808c95d fetcht 1 ,mem_24g_interval +05ec 6802495c fetch 4 ,mem_24g_tx_btclk +05ed 6808c960 fetcht 1 ,mem_24g_interval 05ee 98408400 iadd temp ,temp 05ef 1a427e00 copy regb ,pdata 05f0 98467c00 isub temp ,null 05f1 24610000 nrtn positive 05f2 793ffe1c set0 28 ,pdata -05f3 60024959 store 4 ,mem_24g_tx_btclk +05f3 6002495c store 4 ,mem_24g_tx_btclk 05f4 20207fe7 branch enable_user p_rssi_noise: 05f5 204029bb call save_rssi 05f6 207a0000 rtn blank -05f7 6808c9f2 fetcht 1 ,mem_rssi_noise_index +05f7 6808c9f5 fetcht 1 ,mem_rssi_noise_index 05f8 da200d9e arg mem_rssi_noise_buffer ,rega 05f9 204005fc call p_rssi_store -05fa 6008c9f2 storet 1 ,mem_rssi_noise_index +05fa 6008c9f5 storet 1 ,mem_rssi_noise_index 05fb 20600000 rtn p_rssi_store: @@ -2151,49 +2151,49 @@ 0612 20600000 rtn p_g24_update_addr_and_synccrc8: -0613 60024960 store 4 ,mem_24g_addr +0613 60024963 store 4 ,mem_24g_addr p_g24_syncword_crc8: 0614 da200000 arg 0 ,rega 0615 df200004 arg 4 ,loopcnt -0616 d8c04960 arg mem_24g_addr ,contr +0616 d8c04963 arg mem_24g_addr ,contr p_g24_syncword_crc8_loop: 0617 e8c08000 ifetch 1 ,contr 0618 9a20a200 iadd rega ,rega 0619 c2000617 loop p_g24_syncword_crc8_loop 061a 1a227e00 copy rega ,pdata -061b 600149e9 store 2 ,mem_24g_syncword -061c 6800c9e9 fetch 1 ,mem_24g_syncword -061d 6808c9ea fetcht 1 ,mem_24g_syncword + 1 +061b 600149ec store 2 ,mem_24g_syncword +061c 6800c9ec fetch 1 ,mem_24g_syncword +061d 6808c9ed fetcht 1 ,mem_24g_syncword + 1 061e 9840fe00 iadd temp ,pdata -061f 6000c9eb store 1 ,mem_24g_syncword_crc8 +061f 6000c9ee store 1 ,mem_24g_syncword_crc8 0620 20600000 rtn p_g24_transmit_prep: -0621 6800c938 fetch 1 ,mem_24g_datalen +0621 6800c93b fetch 1 ,mem_24g_datalen 0622 1fe0fe02 increase 2 ,pdata -0623 6000c93a store 1 ,mem_24g_txlen -0624 6800c939 fetch 1 ,mem_24g_data_type -0625 6000c8f4 store 1 ,mem_24g_txpayload -0626 6800c938 fetch 1 ,mem_24g_datalen +0623 6000c93d store 1 ,mem_24g_txlen +0624 6800c93c fetch 1 ,mem_24g_data_type +0625 6000c8f7 store 1 ,mem_24g_txpayload +0626 6800c93b fetch 1 ,mem_24g_datalen 0627 1fe9fe00 lshift3 pdata ,pdata -0628 6808c937 fetcht 1 ,mem_24g_pid +0628 6808c93a fetcht 1 ,mem_24g_pid 0629 18410403 and temp ,0x03 ,temp 062a 18438400 lshift temp ,temp 062b 9841fe00 ior temp ,pdata -062c 6808c974 fetcht 1 ,mem_24g_no_ack +062c 6808c977 fetcht 1 ,mem_24g_no_ack 062d 9840fe00 iadd temp ,pdata 062e e0a08000 istore 1 ,contw -062f 6800c938 fetch 1 ,mem_24g_datalen +062f 6800c93b fetch 1 ,mem_24g_datalen 0630 98007200 iforce loopcnt -0631 d8c048d4 arg mem_24g_txbuf ,contr +0631 d8c048d7 arg mem_24g_txbuf ,contr 0632 20207f01 branch memcpy p_g24_ch: -0633 6808c943 fetcht 1 ,mem_24g_current_ch_number +0633 6808c946 fetcht 1 ,mem_24g_current_ch_number 0634 20400637 call p_g24_ch_map_size -0635 6008c943 storet 1 ,mem_24g_current_ch_number +0635 6008c946 storet 1 ,mem_24g_current_ch_number 0636 20600000 rtn p_g24_ch_map_size: @@ -2203,14 +2203,14 @@ 063a 20600000 rtn p_g24_ch_calc: -063b 6800c960 fetch 1 ,mem_24g_addr +063b 6800c963 fetch 1 ,mem_24g_addr 063c 1fe17e03 and_into 0x03 ,pdata 063d 1fefa204 mul32 pdata ,4 ,rega -063e 58004949 setarg mem_24g_ch_map1 +063e 5800494c setarg mem_24g_ch_map1 063f 9a20fe00 iadd rega ,pdata 0640 98408c00 iadd temp ,contr 0641 e8c08000 ifetch 1 ,contr -0642 6000c942 store 1 ,mem_24g_ch +0642 6000c945 store 1 ,mem_24g_ch 0643 20600000 rtn p_g24_prep: @@ -2218,7 +2218,7 @@ 0645 7843fc00 disable enable_white 0646 58555555 setarg 0x555555 0647 98001e00 iforce crc24_init -0648 6800c942 fetch 1 ,mem_24g_ch +0648 6800c945 fetch 1 ,mem_24g_ch 0649 1fed8400 reverse pdata ,temp 064a 79200401 set1 1 ,temp 064b 18431c00 rshift temp ,white_init @@ -2226,10 +2226,10 @@ p_g24_receive_packet: 064d 204053c4 call le_enable -064e 68024960 fetch 4 ,mem_24g_addr +064e 68024963 fetch 4 ,mem_24g_addr 064f 98001200 iforce access 0650 20402918 call set_sync_on -0651 6808c942 fetcht 1 ,mem_24g_ch +0651 6808c945 fetcht 1 ,mem_24g_ch 0652 2040291f call set_freq_rx 0653 58000500 setarg param_pll_setup 0654 20402a8f call sleep @@ -2242,7 +2242,7 @@ 0659 7830fc00 enable is_rx 065a 78507c00 disable is_tx 065b 78287c00 enable swfine -065c 6801493b fetch 2 ,mem_24g_rx_window +065c 6801493e fetch 2 ,mem_24g_rx_window 065d 98003600 iforce stop_watch 065e 37c18400 correlate null ,timeout 065f 242c0691 nbranch p_g24_end_of_packet ,sync @@ -2251,17 +2251,17 @@ 0662 7823fc00 enable enable_white 0663 7824fc00 enable enable_crc 0664 2040068e call p_g24_receive_byte -0665 6000c9ec store 1 ,mem_24g_get_syncword_crc8 -0666 6808c9eb fetcht 1 ,mem_24g_syncword_crc8 +0665 6000c9ef store 1 ,mem_24g_get_syncword_crc8 +0666 6808c9ee fetcht 1 ,mem_24g_syncword_crc8 0667 98467c00 isub temp ,null 0668 24228691 nbranch p_g24_end_of_packet ,zero 0669 2040068e call p_g24_receive_byte -066a 6000c8b2 store 1 ,mem_24g_rxbuf -066b 6800c97e fetch 1 ,mem_24g_mode +066a 6000c8b5 store 1 ,mem_24g_rxbuf +066b 6800c981 fetch 1 ,mem_24g_mode 066c 1fe67c02 sub pdata ,rx_24g ,null 066d 20228672 branch p_g24_receive_skip ,zero -066e 6800c8b2 fetch 1 ,mem_24g_rxbuf -066f 6808c939 fetcht 1 ,mem_24g_data_type +066e 6800c8b5 fetch 1 ,mem_24g_rxbuf +066f 6808c93c fetcht 1 ,mem_24g_data_type 0670 a8400e00 icompare bits_data ,temp 0671 24208691 nbranch p_g24_end_of_packet ,true @@ -2280,7 +2280,7 @@ p_g24rx_nopayload: 067a 18a22200 copy contw ,rega 067b 2040068e call p_g24_receive_byte -067c 6000ca73 store 1 ,mem_rssi_hex_received +067c 6000ca76 store 1 ,mem_rssi_hex_received 067d 1a220a00 copy rega ,contw 067e 09800018 parse demod ,bucket ,24 067f 78287c00 enable swfine @@ -2296,7 +2296,7 @@ 0689 20402981 call rf_write_freq 068a 7846fc00 disable decode_fec0 068b 20402918 call set_sync_on -068c 6800ca73 fetch 1 ,mem_rssi_hex_received +068c 6800ca76 fetch 1 ,mem_rssi_hex_received 068d 2020001e branch p_rssi_signal p_g24_receive_byte: @@ -2312,12 +2312,12 @@ p_g24_set_freq_tx: 0695 20402918 call set_sync_on -0696 6808c942 fetcht 1 ,mem_24g_ch +0696 6808c945 fetcht 1 ,mem_24g_ch 0697 20202933 branch set_freq_tx p_g24_transmit: 0698 204053c4 call le_enable -0699 68024960 fetch 4 ,mem_24g_addr +0699 68024963 fetch 4 ,mem_24g_addr 069a 98001200 iforce access 069b 20400644 call p_g24_prep 069c 20400695 call p_g24_set_freq_tx @@ -2333,11 +2333,11 @@ 06a6 782dfc00 enable encode_fec1 06a7 7823fc00 enable enable_white 06a8 7824fc00 enable enable_crc -06a9 6800c9eb fetch 1 ,mem_24g_syncword_crc8 +06a9 6800c9ee fetch 1 ,mem_24g_syncword_crc8 06aa 08008608 inject mod ,8 -06ab 6800c93a fetch 1 ,mem_24g_txlen +06ab 6800c93d fetch 1 ,mem_24g_txlen 06ac 98007200 iforce loopcnt -06ad d8c048f4 arg mem_24g_txpayload ,contr +06ad d8c048f7 arg mem_24g_txpayload ,contr p_g24tr_loop: 06ae e8c08000 ifetch 1 ,contr Index: program/patch.prog =================================================================== --- /branch/mouse_project/SA/24G&BLE_PB/program/patch.prog (revision 2043) +++ /branch/mouse_project/SA/24G&BLE_PB/program/patch.prog (working copy) @@ -793,7 +793,7 @@ fetch 2,mem_mouse_z rtn blank jam 1,mem_mouse_wheel_trigger - jam 5,mem_mouse_wheel_trigger_timer + jam 10,mem_mouse_wheel_trigger_timer rtn p_mouse_clear_sensor_data: Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/SA/24G&BLE_PB/sched/mouse.dat (revision 2043) +++ /branch/mouse_project/SA/24G&BLE_PB/sched/mouse.dat (working copy) @@ -235,6 +235,7 @@ mem_24g_allpowerful_addr:0f 0f 0f 0f 0f 0f mem_24g_common_temp:00 00 00 00 00 00 00 00 00 00 mem_24g_enter_hibernate:80 ee 36#10 min +mem_firmware_version:01 00 mem_mouse_24g_addr_init:ff ff ff ff ff ff