Index: output/bt_program23.icode =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/bt_program23.icode (revision 2384) +++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/bt_program23.icode (working copy) @@ -1491,7 +1491,7 @@ 00001490 0x00000975 fetch 0x00000001 , 0x000046c5 00001491 0x00000976 and 0x0000003f , 0x00000003 , 0x0000003f 00001492 0x00000977 rtneq 0x00000003 - 00001493 0x00000978 jam 0x00000002 , 0x000046c6 + 00001493 0x00000978 jam 0x0000000a , 0x000046c6 00001494 0x00000979 rtn 00001495 0x0000097c rtnmark1 0x0000000f 00001496 0x0000097d call 0x00005890 @@ -26727,7 +26727,7 @@ 00196609 0x000091e6 beq 0x00000020 , 0x00030006 00196610 0x000091e7 beq 0x00000021 , 0x00030018 00196611 0x000091e8 beq 0x00000022 , 0x00030025 - 00196612 0x000091e9 beq 0x00000023 , 0x0003002c + 00196612 0x000091e9 beq 0x00000023 , 0x0003002b 00196613 0x000091ea rtn 00196614 0x000091ed call 0x0003000e 00196615 0x000091ee branch 0x0000557d @@ -26765,15 +26765,14 @@ 00196647 0x00009217 fetch 0x00000001 , 0x00000478 00196648 0x00009218 sub 0x0000003f , 0x0000001a , 0x0000003f 00196649 0x00009219 nrtn 0x00000005 - 00196650 0x0000921a jam 0x00000000 , 0x000046c6 - 00196651 0x0000921b branch 0x00003d60 - 00196652 0x0000921e call 0x000033af - 00196653 0x0000921f call 0x000026e9 - 00196654 0x00009220 jam 0x00000002 , 0x00000a99 - 00196655 0x00009221 call 0x00007d86 - 00196656 0x00009222 call 0x00005cf7 - 00196657 0x00009223 call 0x00004d6b - 00196658 0x00009224 branch 0x0000246e + 00196650 0x0000921b branch 0x00003d60 + 00196651 0x0000921e call 0x000033af + 00196652 0x0000921f call 0x000026e9 + 00196653 0x00009220 jam 0x00000002 , 0x00000a99 + 00196654 0x00009221 call 0x00007d86 + 00196655 0x00009222 call 0x00005cf7 + 00196656 0x00009223 call 0x00004d6b + 00196657 0x00009224 branch 0x0000246e 00262145 0x00009229 beq 0x00000030 , 0x00040003 00262146 0x0000922a rtn 00262147 0x0000922d call 0x000002b9 @@ -27162,7 +27161,7 @@ 00786433 0x0000943e beq 0x000000b1 , 0x000c0006 00786434 0x0000943f beq 0x000000b2 , 0x000c000c 00786435 0x00009440 beq 0x000000b3 , 0x000c0011 - 00786436 0x00009441 beq 0x000000b4 , 0x000c0019 + 00786436 0x00009441 beq 0x000000b4 , 0x000c0018 00786437 0x00009442 rtn 00786438 0x00009445 fetch 0x00000001 , 0x00004808 00786439 0x00009446 rtneq 0x00000002 @@ -27176,15 +27175,14 @@ 00786447 0x00009450 jam 0x0000000e , 0x000041e3 00786448 0x00009451 branch 0x0000340e 00786449 0x00009454 fetch 0x00000001 , 0x000047a1 - 00786450 0x00009455 beq 0x00000001 , 0x000c0015 - 00786451 0x00009456 jam 0x00000014 , 0x000046c6 - 00786452 0x00009457 branch 0x000c0017 - 00786453 0x00009459 call 0x00000405 - 00786454 0x0000945a jam 0x0000000a , 0x000046c6 - 00786455 0x0000945c arg 0x00000001 , 0x00000007 - 00786456 0x0000945d branch 0x000041b9 - 00786457 0x00009460 jam 0x00000000 , 0x00004b01 - 00786458 0x00009461 jam 0x00000000 , 0x00004b03 - 00786459 0x00009462 jam 0x00000000 , 0x00004b0c - 00786460 0x00009463 call 0x000002fc - 00786461 0x00009464 branch 0x000041d9 + 00786450 0x00009455 beq 0x00000001 , 0x000c0014 + 00786451 0x00009457 branch 0x000c0016 + 00786452 0x00009459 call 0x00000405 + 00786453 0x0000945a jam 0x00000014 , 0x000046c6 + 00786454 0x0000945c arg 0x00000001 , 0x00000007 + 00786455 0x0000945d branch 0x000041b9 + 00786456 0x00009460 jam 0x00000000 , 0x00004b01 + 00786457 0x00009461 jam 0x00000000 , 0x00004b03 + 00786458 0x00009462 jam 0x00000000 , 0x00004b0c + 00786459 0x00009463 call 0x000002fc + 00786460 0x00009464 branch 0x000041d9 Index: output/bt_program23.list =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/bt_program23.list (revision 2384) +++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/bt_program23.list (working copy) @@ -1788,7 +1788,7 @@ 0x5d2 002421 fetch 1 ,mem_le_connect_status_flag 0x5d3 002422 and pdata ,0x03 ,pdata 0x5d4 002423 rtneq 0x03 -0x5d5 002424 jam 2 ,mem_le_start_encrypt_timer +0x5d5 002424 jam 10 ,mem_le_start_encrypt_timer 0x5d6 002425 rtn : 002427 p_le_parse: 0x5d7 002428 rtnmark1 mark_old_packet @@ -31223,16 +31223,15 @@ 0x30027 037399 fetch 1 ,mem_le_att_handle 0x30028 037400 sub pdata ,26 ,pdata 0x30029 037401 nrtn zero -0x3002a 037402 jam 0 ,mem_le_start_encrypt_timer -0x3002b 037403 branch mouse_le_write_enable +0x3002a 037403 branch mouse_le_write_enable : 037405 z_quit_connection_cont: -0x3002c 037406 call app_disconn_reason_collect_bt -0x3002d 037407 call sniff_exit -0x3002e 037408 jam bt_evt_bb_disconnected ,mem_fifo_temp -0x3002f 037409 call ui_ipc_send_event -0x30030 037410 call init_lmp_work -0x30031 037411 call l2cap_init_work -0x30032 037412 branch quit_connection_cont + 8 +0x3002b 037406 call app_disconn_reason_collect_bt +0x3002c 037407 call sniff_exit +0x3002d 037408 jam bt_evt_bb_disconnected ,mem_fifo_temp +0x3002e 037409 call ui_ipc_send_event +0x3002f 037410 call init_lmp_work +0x30030 037411 call l2cap_init_work +0x30031 037412 branch quit_connection_cont + 8 org 0x40001 : 037416 z_entrance3: 0x40001 037417 beq zcode_30 ,z_mouse_start_discovery @@ -31707,17 +31706,16 @@ : 037971 z_mouse_le_ll_start_encryt: 0xc0011 037972 fetch 1 ,mem_mouse_le_reconnect_flag 0xc0012 037973 beq 1 ,z_mouse_le_ll_reconn_start_encryt -0xc0013 037974 jam 20 ,mem_le_start_encrypt_timer -0xc0014 037975 branch z_mouse_le_ll_enable_start_enc_flag +0xc0013 037975 branch z_mouse_le_ll_enable_start_enc_flag : 037976 z_mouse_le_ll_reconn_start_encryt: -0xc0015 037977 call p_app_updata_le_param -0xc0016 037978 jam 10 ,mem_le_start_encrypt_timer +0xc0014 037977 call p_app_updata_le_param +0xc0015 037978 jam 20 ,mem_le_start_encrypt_timer : 037979 z_mouse_le_ll_enable_start_enc_flag: -0xc0017 037980 arg ll_start_enc_flag ,queue -0xc0018 037981 branch mouse_le_enable_connect_flag +0xc0016 037980 arg ll_start_enc_flag ,queue +0xc0017 037981 branch mouse_le_enable_connect_flag : 037983 z_mouse_bb_event_disconnected: -0xc0019 037984 jam 0 ,mem_bt_rcvd_switch_req_accept -0xc001a 037985 jam 0 ,mem_bt_send_lmp_setup_complete -0xc001b 037986 jam 0 ,mem_mouse_bt_send_first_package_flag -0xc001c 037987 call p_mouse_store_flash_device_info -0xc001d 037988 branch mouse_bb_disconnected +0xc0018 037984 jam 0 ,mem_bt_rcvd_switch_req_accept +0xc0019 037985 jam 0 ,mem_bt_send_lmp_setup_complete +0xc001a 037986 jam 0 ,mem_mouse_bt_send_first_package_flag +0xc001b 037987 call p_mouse_store_flash_device_info +0xc001c 037988 branch mouse_bb_disconnected Index: output/bt_program23.meta =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/bt_program23.meta (revision 2384) +++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/bt_program23.meta (working copy) @@ -2421,7 +2421,7 @@ fetch 1,mem_le_connect_status_flag and pdata,0x03,pdata rtneq 0x03 - jam 2,mem_le_start_encrypt_timer + jam 10,mem_le_start_encrypt_timer rtn p_le_parse: @@ -37399,7 +37399,7 @@ fetch 1,mem_le_att_handle sub pdata,26,pdata nrtn zero - jam 0,mem_le_start_encrypt_timer +// jam 0,mem_le_start_encrypt_timer branch mouse_le_write_enable z_quit_connection_cont: @@ -37971,11 +37971,11 @@ z_mouse_le_ll_start_encryt: fetch 1,mem_mouse_le_reconnect_flag beq 1,z_mouse_le_ll_reconn_start_encryt - jam 20,mem_le_start_encrypt_timer +// jam 20,mem_le_start_encrypt_timer branch z_mouse_le_ll_enable_start_enc_flag z_mouse_le_ll_reconn_start_encryt: call p_app_updata_le_param - jam 10,mem_le_start_encrypt_timer + jam 20,mem_le_start_encrypt_timer z_mouse_le_ll_enable_start_enc_flag: arg LL_START_ENC_FLAG,queue branch mouse_le_enable_connect_flag Index: output/bt_program23.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/bt_program23.rom (revision 2384) +++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/bt_program23.rom (working copy) @@ -1491,7 +1491,7 @@ 01101000000000001100011011000101 00011111111000010111111000000011 11000001000000011000000000000000 -01110000010001101100011000000010 +01110000010001101100011000001010 00100000011000000000000000000000 11000110000001111000000000000000 00100000010000000101100010010000 @@ -196610,7 +196610,7 @@ 11000000000100000000000000000110 11000000000100001000000000011000 11000000000100010000000000100101 -11000000000100011000000000101100 +11000000000100011000000000101011 00100000011000000000000000000000 00100000010000000000000000001110 00100000001000000101010101111101 @@ -196648,7 +196648,6 @@ 01101000000000001000010001111000 00011111111001100111111000011010 00100100011000101000000000000000 -01110000010001101100011000000000 00100000001000000011110101100000 00100000010000000011001110101111 00100000010000000010011011101001 @@ -262143,6 +262142,7 @@ + 11000000000110000000000000000011 00100000011000000000000000000000 00100000010000000000001010111001 @@ -786434,7 +786434,7 @@ 11000000010110001000000000000110 11000000010110010000000000001100 11000000010110011000000000010001 -11000000010110100000000000011001 +11000000010110100000000000011000 00100000011000000000000000000000 01101000000000001100100000001000 11000001000000010000000000000000 @@ -786448,11 +786448,10 @@ 01110000010000011110001100001110 00100000001000000011010000001110 01101000000000001100011110100001 -11000000000000001000000000010101 -01110000010001101100011000010100 -00100000001000000000000000010111 +11000000000000001000000000010100 +00100000001000000000000000010110 00100000010000000000010000000101 -01110000010001101100011000001010 +01110000010001101100011000010100 11011000111000000000000000000001 00100000001000000100000110111001 01110000010010110000000100000000 Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/flash.dat (revision 2385) +++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/flash.dat (working copy) @@ -5979,7 +5979,7 @@ 70 46 c6 -02 +0a 20 60 00 @@ -8196,8 +8196,8 @@ 20 07 fb -9e -97 +91 +18 aa 55 08 @@ -9128,7 +9128,7 @@ 00 ac 4b -02 +03 00 aa 55 @@ -9278,7 +9278,7 @@ c0 5a 00 -19 +18 20 60 00 @@ -9334,15 +9334,11 @@ c0 00 80 -15 -70 -46 -c6 14 20 20 00 -17 +16 20 40 04 @@ -9350,7 +9346,7 @@ 70 46 c6 -0a +14 d8 e0 00 @@ -9515,6 +9511,10 @@ 00 00 00 +00 +00 +00 +00 20 20 00 @@ -11582,7 +11582,7 @@ c0 11 80 -2c +2b 20 60 00 @@ -11731,10 +11731,6 @@ 62 80 00 -70 -46 -c6 -00 20 20 3d @@ -11819,6 +11815,10 @@ 00 00 00 +00 +00 +00 +00 20 20 00 @@ -12335,5 +12335,5 @@ 55 00 00 -e9 -fe +71 +cd Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/program.lis (revision 2384) +++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/program.lis (working copy) @@ -2083,7 +2083,7 @@ 05d2 6800c6c5 fetch 1 ,mem_le_connect_status_flag 05d3 1fe17e03 and pdata ,0x03 ,pdata 05d4 c1018000 rtneq 0x03 -05d5 7046c602 jam 2 ,mem_le_start_encrypt_timer +05d5 7046c60a jam 10 ,mem_le_start_encrypt_timer 05d6 20600000 rtn p_le_parse: @@ -35621,7 +35621,7 @@ 30001 c0100006 beq zcode_20 ,z_le_update_param 30002 c0108018 beq zcode_21 ,z_le_update_channel_map 30003 c0110025 beq zcode_22 ,z_le_mouse_bb_event_connect_complete -30004 c011802c beq zcode_23 ,z_quit_connection_cont +30004 c011802b beq zcode_23 ,z_quit_connection_cont 30005 20600000 rtn z_le_update_param: @@ -35675,17 +35675,16 @@ 30027 68008478 fetch 1 ,mem_le_att_handle 30028 1fe67e1a sub pdata ,26 ,pdata 30029 24628000 nrtn zero -3002a 7046c600 jam 0 ,mem_le_start_encrypt_timer -3002b 20203d60 branch mouse_le_write_enable +3002a 20203d60 branch mouse_le_write_enable z_quit_connection_cont: -3002c 204033af call app_disconn_reason_collect_bt -3002d 204026e9 call sniff_exit -3002e 700a9902 jam bt_evt_bb_disconnected ,mem_fifo_temp -3002f 20407d86 call ui_ipc_send_event -30030 20405cf7 call init_lmp_work -30031 20404d6b call l2cap_init_work -30032 2020246e branch quit_connection_cont + 8 +3002b 204033af call app_disconn_reason_collect_bt +3002c 204026e9 call sniff_exit +3002d 700a9902 jam bt_evt_bb_disconnected ,mem_fifo_temp +3002e 20407d86 call ui_ipc_send_event +3002f 20405cf7 call init_lmp_work +30030 20404d6b call l2cap_init_work +30031 2020246e branch quit_connection_cont + 8 org 0x40001 z_entrance3: @@ -36201,7 +36200,7 @@ c0001 c0588006 beq zcode_b1 ,z_mouse_sniff_not_accept c0002 c059000c beq zcode_b2 ,z_mouse_enter_sniff_check c0003 c0598011 beq zcode_b3 ,z_mouse_le_ll_start_encryt -c0004 c05a0019 beq zcode_b4 ,z_mouse_bb_event_disconnected +c0004 c05a0018 beq zcode_b4 ,z_mouse_bb_event_disconnected c0005 20600000 rtn z_mouse_sniff_not_accept: @@ -36221,22 +36220,21 @@ z_mouse_le_ll_start_encryt: c0011 6800c7a1 fetch 1 ,mem_mouse_le_reconnect_flag -c0012 c0008015 beq 1 ,z_mouse_le_ll_reconn_start_encryt -c0013 7046c614 jam 20 ,mem_le_start_encrypt_timer -c0014 20200017 branch z_mouse_le_ll_enable_start_enc_flag +c0012 c0008014 beq 1 ,z_mouse_le_ll_reconn_start_encryt +c0013 20200016 branch z_mouse_le_ll_enable_start_enc_flag z_mouse_le_ll_reconn_start_encryt: -c0015 20400405 call p_app_updata_le_param -c0016 7046c60a jam 10 ,mem_le_start_encrypt_timer +c0014 20400405 call p_app_updata_le_param +c0015 7046c614 jam 20 ,mem_le_start_encrypt_timer z_mouse_le_ll_enable_start_enc_flag: -c0017 d8e00001 arg ll_start_enc_flag ,queue -c0018 202041b9 branch mouse_le_enable_connect_flag +c0016 d8e00001 arg ll_start_enc_flag ,queue +c0017 202041b9 branch mouse_le_enable_connect_flag z_mouse_bb_event_disconnected: -c0019 704b0100 jam 0 ,mem_bt_rcvd_switch_req_accept -c001a 704b0300 jam 0 ,mem_bt_send_lmp_setup_complete -c001b 704b0c00 jam 0 ,mem_mouse_bt_send_first_package_flag -c001c 204002fc call p_mouse_store_flash_device_info -c001d 202041d9 branch mouse_bb_disconnected +c0018 704b0100 jam 0 ,mem_bt_rcvd_switch_req_accept +c0019 704b0300 jam 0 ,mem_bt_send_lmp_setup_complete +c001a 704b0c00 jam 0 ,mem_mouse_bt_send_first_package_flag +c001b 204002fc call p_mouse_store_flash_device_info +c001c 202041d9 branch mouse_bb_disconnected Index: output/ramcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/ramcode.rom (revision 2384) +++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/ramcode.rom (working copy) @@ -1491,7 +1491,7 @@ 6800c6c5 1fe17e03 c1018000 -7046c602 +7046c60a 20600000 c6078000 20405890 Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/romcode.rom (revision 2384) +++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/romcode.rom (working copy) @@ -24679,7 +24679,7 @@ c0100006 c0108018 c0110025 -c011802c +c011802b 20600000 2040000e 2020557d @@ -24717,7 +24717,6 @@ 68008478 1fe67e1a 24628000 -7046c600 20203d60 204033af 204026e9 @@ -25114,7 +25113,7 @@ c0588006 c059000c c0598011 -c05a0019 +c05a0018 20600000 6800c808 c1010000 @@ -25128,11 +25127,10 @@ 7041e30e 2020340e 6800c7a1 -c0008015 -7046c614 -20200017 +c0008014 +20200016 20400405 -7046c60a +7046c614 d8e00001 202041b9 704b0100 @@ -25140,4 +25138,4 @@ 704b0c00 204002fc 202041d9 -00004ab8 +00002ae7 Index: output/sched.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/sched.rom (revision 2384) +++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/output/sched.rom (working copy) @@ -329,7 +329,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 4f 12 -mem_firmware_version:02 00 +mem_firmware_version:03 00 mem_device_flag: 02 Index: program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/program/patch.prog (revision 2384) +++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/program/patch.prog (working copy) @@ -2760,7 +2760,7 @@ fetch 1,mem_le_connect_status_flag and pdata,0x03,pdata rtneq 0x03 - jam 2,mem_le_start_encrypt_timer + jam 10,mem_le_start_encrypt_timer rtn p_le_parse: Index: program/z.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/program/z.prog (revision 2384) +++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/program/z.prog (working copy) @@ -206,7 +206,7 @@ fetch 1,mem_le_att_handle sub pdata,26,pdata nrtn zero - jam 0,mem_le_start_encrypt_timer +// jam 0,mem_le_start_encrypt_timer branch mouse_le_write_enable z_quit_connection_cont: @@ -791,11 +791,11 @@ z_mouse_le_ll_start_encryt: fetch 1,mem_mouse_le_reconnect_flag beq 1,z_mouse_le_ll_reconn_start_encryt - jam 20,mem_le_start_encrypt_timer +// jam 20,mem_le_start_encrypt_timer branch z_mouse_le_ll_enable_start_enc_flag z_mouse_le_ll_reconn_start_encryt: call p_app_updata_le_param - jam 10,mem_le_start_encrypt_timer + jam 20,mem_le_start_encrypt_timer z_mouse_le_ll_enable_start_enc_flag: arg LL_START_ENC_FLAG,queue branch mouse_le_enable_connect_flag Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/sched/mouse.dat (revision 2384) +++ /branch/mouse_project/YJX_Project/YJX_1059/DpiSwitch_XZD/sched/mouse.dat (working copy) @@ -292,7 +292,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 4f 12 -mem_firmware_version:02 00 +mem_firmware_version:03 00 mem_device_flag: 02