Index: output/flash.dat =================================================================== --- /branch/mouse_project/XZR/XZR_1059/XZR_3Mode_2Ch_BD_autodiscovery/output/flash.dat (revision 3602) +++ /branch/mouse_project/XZR/XZR_1059/XZR_3Mode_2Ch_BD_autodiscovery/output/flash.dat (working copy) @@ -12164,11 +12164,11 @@ c0 10 00 -1f +21 c0 10 80 -2c +2e c0 11 00 @@ -12208,12 +12208,20 @@ c0 1a 00 -11 +13 20 20 02 a5 68 +09 +46 +a8 +60 +09 +46 +ae +68 03 41 d0 @@ -12244,7 +12252,7 @@ c0 7f 80 -17 +19 68 09 46 @@ -12288,11 +12296,11 @@ c0 42 00 -23 +25 c0 41 80 -26 +28 20 20 60 @@ -12300,7 +12308,7 @@ 20 40 00 -29 +2b 68 00 80 @@ -12312,7 +12320,7 @@ 20 40 00 -29 +2b 68 00 80 @@ -12364,7 +12372,7 @@ c0 17 00 -35 +37 20 20 60 @@ -12405,14 +12413,6 @@ 60 00 00 -00 -00 -00 -00 -00 -00 -00 -00 20 20 00 @@ -12929,5 +12929,5 @@ 55 00 00 -c2 -87 +d5 +8a Index: output/program.lis =================================================================== --- /branch/mouse_project/XZR/XZR_1059/XZR_3Mode_2Ch_BD_autodiscovery/output/program.lis (revision 3602) +++ /branch/mouse_project/XZR/XZR_1059/XZR_3Mode_2Ch_BD_autodiscovery/output/program.lis (working copy) @@ -35573,8 +35573,8 @@ org 0x30001 z_entrance2: -30001 c010001f beq zcode_20 ,z_send_lmp_escape -30002 c010802c beq zcode_21 ,z_send_lmp_accepted +30001 c0100021 beq zcode_20 ,z_send_lmp_escape +30002 c010802e beq zcode_21 ,z_send_lmp_accepted 30003 c0110005 beq zcode_22 ,z_mouse_check_reconn_target 30004 20600000 rtn @@ -35586,74 +35586,76 @@ 30009 204004dd call p_mouse_mode_bt_device1_multi_led_on 3000a 6800c210 fetch 1 ,mem_xrecord_mode 3000b c019800e beq rec_3_mode ,z_mouse3_0_check_reconn_target -3000c c01a0011 beq rec_4_mode ,z_mouse4_0_check_reconn_target +3000c c01a0013 beq rec_4_mode ,z_mouse4_0_check_reconn_target 3000d 202002a5 branch p_mouse_null_enter_hibernate_enable z_mouse3_0_check_reconn_target: -3000e 680341d0 fetch 6 ,mem_hci_plap -3000f 203a33eb branch app_bt_start_discovery_short ,blank -30010 20204274 branch mouse3_0_check_reconn_target + 3 +3000e 680946a8 fetcht 2 ,mem_mouse_direct_timeout +3000f 600946ae storet 2 ,mem_mouse_direct_timer +30010 680341d0 fetch 6 ,mem_hci_plap +30011 203a33eb branch app_bt_start_discovery_short ,blank +30012 20204274 branch mouse3_0_check_reconn_target + 3 z_mouse4_0_check_reconn_target: -30011 704d4501 jam 1 ,mem_le_send_security_request_flag -30012 7047a101 jam 1 ,mem_mouse_le_reconnect_flag -30013 d840000a arg 10 ,temp -30014 6800cd3e fetch 1 ,mem_mouse_fast_conn_flag -30015 c07f8017 beq 0xff ,z_mouse4_0_check_reconn_target_next -30016 680946a8 fetcht 2 ,mem_mouse_direct_timeout +30013 704d4501 jam 1 ,mem_le_send_security_request_flag +30014 7047a101 jam 1 ,mem_mouse_le_reconnect_flag +30015 d840000a arg 10 ,temp +30016 6800cd3e fetch 1 ,mem_mouse_fast_conn_flag +30017 c07f8019 beq 0xff ,z_mouse4_0_check_reconn_target_next +30018 680946a8 fetcht 2 ,mem_mouse_direct_timeout z_mouse4_0_check_reconn_target_next: -30017 600946ae storet 2 ,mem_mouse_direct_timer -30018 20403418 call app_lpm_mult_disable -30019 204002af call p_le_check_adv_flag -3001a 58000004 setarg adv_flag_bredr_not_supported -3001b e0c08000 istore 1 ,contr -3001c d8c04390 arg mem_le_scan_data ,contr -3001d 204005bc call p_le_adv_data_update -3001e 20207df4 branch check_51cmd_adv +30019 600946ae storet 2 ,mem_mouse_direct_timer +3001a 20403418 call app_lpm_mult_disable +3001b 204002af call p_le_check_adv_flag +3001c 58000004 setarg adv_flag_bredr_not_supported +3001d e0c08000 istore 1 ,contr +3001e d8c04390 arg mem_le_scan_data ,contr +3001f 204005bc call p_le_adv_data_update +30020 20207df4 branch check_51cmd_adv z_send_lmp_escape: -3001f 68008048 fetch 1 ,mem_lmp_to_send -30020 c0420023 beq lmp_ext_features_res ,z_send_lmpext_features_res -30021 c0418026 beq lmp_ext_features_req ,z_send_lmpext_features_req -30022 2020603f branch send_lmp_escape +30021 68008048 fetch 1 ,mem_lmp_to_send +30022 c0420025 beq lmp_ext_features_res ,z_send_lmpext_features_res +30023 c0418028 beq lmp_ext_features_req ,z_send_lmpext_features_req +30024 2020603f branch send_lmp_escape z_send_lmpext_features_res: -30023 20400029 call z_check_ssp_enable -30024 68008048 fetch 1 ,mem_lmp_to_send -30025 20206099 branch send_lmpext_features_res +30025 2040002b call z_check_ssp_enable +30026 68008048 fetch 1 ,mem_lmp_to_send +30027 20206099 branch send_lmpext_features_res z_send_lmpext_features_req: -30026 20400029 call z_check_ssp_enable -30027 68008048 fetch 1 ,mem_lmp_to_send -30028 2020610d branch send_lmpext_features_req +30028 2040002b call z_check_ssp_enable +30029 68008048 fetch 1 ,mem_lmp_to_send +3002a 2020610d branch send_lmpext_features_req z_check_ssp_enable: -30029 6800c65a fetch 1 ,mem_ssp_enable -3002a 203a612b branch ssp_disable ,blank -3002b 20206124 branch ssp_enable +3002b 6800c65a fetch 1 ,mem_ssp_enable +3002c 203a612b branch ssp_disable ,blank +3002d 20206124 branch ssp_enable z_send_lmp_accepted: -3002c 18007e02 force 2 ,pdata -3002d 20406298 call msg_send_lmp -3002e 68008049 fetch 1 ,mem_lmi_opcode -3002f e0a08000 istore 1 ,contw -30030 6000ccd7 store 1 ,mem_lmi_opcode_temp -30031 204062a7 call send_lmp_follow -30032 6800ccd7 fetch 1 ,mem_lmi_opcode_temp -30033 c0170035 beq lmp_max_slot_req ,z_send_lmp_accepted_max_slot_req -30034 20206051 branch send_lmp_accepted + 7 +3002e 18007e02 force 2 ,pdata +3002f 20406298 call msg_send_lmp +30030 68008049 fetch 1 ,mem_lmi_opcode +30031 e0a08000 istore 1 ,contw +30032 6000ccd7 store 1 ,mem_lmi_opcode_temp +30033 204062a7 call send_lmp_follow +30034 6800ccd7 fetch 1 ,mem_lmi_opcode_temp +30035 c0170037 beq lmp_max_slot_req ,z_send_lmp_accepted_max_slot_req +30036 20206051 branch send_lmp_accepted + 7 z_send_lmp_accepted_max_slot_req: -30035 6800ccda fetch 1 ,mem_bt_rcvd_switch_req_accept -30036 207a0000 rtn blank -30037 704cda00 jam 0 ,mem_bt_rcvd_switch_req_accept -30038 6800ccdc fetch 1 ,mem_bt_send_lmp_setup_complete -30039 c1810000 rtnne 2 -3003a 704cdb01 jam 1 ,mem_bt_send_max_slot_req_accept_after_switch -3003b 1c427e00 copy clkn_bt ,pdata -3003c 600204e9 store 4 ,mem_aurand_send_delay_time -3003d 20600000 rtn +30037 6800ccda fetch 1 ,mem_bt_rcvd_switch_req_accept +30038 207a0000 rtn blank +30039 704cda00 jam 0 ,mem_bt_rcvd_switch_req_accept +3003a 6800ccdc fetch 1 ,mem_bt_send_lmp_setup_complete +3003b c1810000 rtnne 2 +3003c 704cdb01 jam 1 ,mem_bt_send_max_slot_req_accept_after_switch +3003d 1c427e00 copy clkn_bt ,pdata +3003e 600204e9 store 4 ,mem_aurand_send_delay_time +3003f 20600000 rtn org 0x40001 z_entrance3: Index: output/romcode.rom =================================================================== --- /branch/mouse_project/XZR/XZR_1059/XZR_3Mode_2Ch_BD_autodiscovery/output/romcode.rom (revision 3602) +++ /branch/mouse_project/XZR/XZR_1059/XZR_3Mode_2Ch_BD_autodiscovery/output/romcode.rom (working copy) @@ -24662,8 +24662,8 @@ 18427e00 c0028428 20204d41 -c010001f -c010802c +c0100021 +c010802e c0110005 20600000 204002a8 @@ -24673,8 +24673,10 @@ 204004dd 6800c210 c019800e -c01a0011 +c01a0013 202002a5 +680946a8 +600946ae 680341d0 203a33eb 20204274 @@ -24682,7 +24684,7 @@ 7047a101 d840000a 6800cd3e -c07f8017 +c07f8019 680946a8 600946ae 20403418 @@ -24693,13 +24695,13 @@ 204005bc 20207df4 68008048 -c0420023 -c0418026 +c0420025 +c0418028 2020603f -20400029 +2040002b 68008048 20206099 -20400029 +2040002b 68008048 2020610d 6800c65a @@ -24712,7 +24714,7 @@ 6000ccd7 204062a7 6800ccd7 -c0170035 +c0170037 20206051 6800ccda 207a0000 @@ -25199,4 +25201,4 @@ 204042fb 704721ff 2020030c -0000af4a +00008b69 Index: program/z.prog =================================================================== --- /branch/mouse_project/XZR/XZR_1059/XZR_3Mode_2Ch_BD_autodiscovery/program/z.prog (revision 3591) +++ /branch/mouse_project/XZR/XZR_1059/XZR_3Mode_2Ch_BD_autodiscovery/program/z.prog (working copy) @@ -152,6 +152,8 @@ branch p_mouse_null_enter_hibernate_enable z_mouse3_0_check_reconn_target: + fetcht 2,mem_mouse_direct_timeout + storet 2,mem_mouse_direct_timer fetch 6,mem_hci_plap branch app_bt_start_discovery_short,blank branch mouse3_0_check_reconn_target+3