Index: output/otp.dat =================================================================== --- /1121s/branch/mouse/mouse_public_Single_Mode/output/otp.dat (revision 2996) +++ /1121s/branch/mouse/mouse_public_Single_Mode/output/otp.dat (working copy) @@ -103,12 +103,12 @@ 1c fb f0 -24 -5b +74 +81 61 67 7a -a5 +a7 9a 2a 65 @@ -116,15 +116,15 @@ f7 dc c2 -54 +5a ca 93 eb -5f +59 f6 fd fe -bc +be 0d b9 88 @@ -164,7 +164,7 @@ 79 d1 10 -89 +8f 28 2c 6f @@ -172,15 +172,15 @@ bc c3 e2 -e4 +e2 41 15 1e -05 +07 ad 41 02 -ef +ed 43 10 48 @@ -248,7 +248,7 @@ 54 3c ab -bb +b5 7b f1 ab @@ -1052,7 +1052,7 @@ 8c 37 14 -f2 +fc 7e c1 91 @@ -2216,7 +2216,7 @@ d6 f7 27 -e0 +e2 2b 24 02 @@ -2300,7 +2300,7 @@ 65 2a ab -10 +12 ac 18 95 @@ -2932,7 +2932,7 @@ e8 da f6 -59 +a7 c9 ca b8 @@ -4544,7 +4544,7 @@ 92 10 ce -fa +f8 1e 53 26 @@ -4552,841 +4552,841 @@ 5b 6b 76 -b5 +bb 0b 93 2a 68 bb e5 -fe -04 -ef -cf -8b -50 -bc -b1 -5b -7b -93 +cb +37 ef -aa -cc -f1 -e2 -fb -41 -c6 -3f -ba -e5 -e6 -fb -89 -97 -56 -b0 -22 -38 -16 -07 -d2 -5b -07 -84 -f0 -ea -a6 -11 -17 db -a5 -d1 +db +95 +ec +b7 +69 +d7 +dc +3a +e9 +98 +e6 +45 +d8 +9f +d9 +9b +1f +c5 +a1 +3a +f9 +7d 49 +15 +06 +5f +f6 +27 +87 +08 +48 +24 +6c +24 +46 +31 +73 +e3 +ea +75 +54 +b1 +b4 +ca +c8 0a -57 -e2 -2c -7f -df -fc -17 -39 -bd -d2 -b6 -89 +90 +58 +31 +bf +5e +9a +02 +0f 74 -fd -c0 +89 +c1 +dd +a2 +d4 +ef +68 +f9 +41 +b7 +f5 2f -ed -70 -fc -d7 -1b -ed -d3 -fc +5a +43 +bc +13 60 -9e -64 -8c -be -18 -84 -e3 -8c -ee -8a -a6 -cf -fe -83 -e6 -35 -69 -50 -99 -6a -0e +41 +d2 +cb +2e +20 +82 +80 +7e +42 +a7 +72 c9 -2a +f8 +90 +6a +2e +b1 +80 32 60 -8a -45 +ec +c3 82 -67 -fb -c4 -25 -5b -a2 -e8 -e5 -79 -09 -42 +07 +dd +0f +6a +ff +e1 +71 +01 +4d +57 +23 5a -1a -c8 -7b -8e -35 -e4 -97 -f2 -db -c0 -3a -ed +1e +49 +21 +8b +5e +64 97 -c3 -db +47 +1b +06 73 -0d -12 -52 -df -c3 -ba -06 -3f +5c +a1 +34 +de +c1 +65 +d4 +1b +8f +ca +c9 +8c +77 +41 +de +54 +63 29 -4e -dc -2c -8d -2e -2c -1a 6d -1a -5d +ae +f8 +d8 +9a +42 1b -6e -94 -f1 -9d -48 -4c -e4 +6a +1a +96 +40 +3f +bc +3a be 30 -c9 -b7 -c3 -38 -17 -c3 -6d -e8 -8f +c6 +97 +1c +a5 +b5 55 -bd -c1 -aa -5a -48 -f5 +22 +28 1f -9c -7b -42 +cf +12 +5e +e8 +8b +48 +95 +10 +14 +7c +ea 83 c0 f2 -9b -71 -cb -4f -98 -5e -0e -45 -66 -71 -62 -d0 -06 -23 +fb +2c +17 +3d +b2 +e6 +47 +02 +a6 +bc +86 +d5 +87 +a3 4a -58 -bd -38 -98 -0a -0c -f0 -8e -43 +20 +bf +d5 +e0 +0d +ad +28 8e -51 -76 -7e -76 -18 +7c +2c +1b +81 +7c +56 +3a 0b a9 9c -a6 -ad +9d +eb 00 5d 88 13 89 a7 -8e -1e -2d -37 -c6 +b5 +49 +4a +75 +66 00 ce 7a -2a -db -b2 +1d +00 +ef 3c -75 -a9 +88 +80 9b 7e -d3 -1b -c9 -6f -a3 -f1 +bc +92 +cd +3b +fa +d8 7f 4a 3f -74 -ba -3a -ee -68 +7e +be +0e +ea +c4 16 -f5 +95 64 -2a -27 -65 -d6 -f7 -57 -51 -f2 -92 -1e -08 +8f +5f +25 +d2 +59 +10 +95 +c4 +9f +21 +ea eb -32 -4f -f9 +2c +08 +7d b8 -58 -99 -28 +4e +8e +8c f5 -e4 -9a -d9 -ad -2d -a3 -65 -a1 -42 -54 -62 -d3 -ed -1b -ac -84 -17 -e1 -48 -0f -ad -16 -58 -03 -6e -86 -2a -a3 -4f +fa 9a +f9 +9b +6a 8c -cb -a7 +dc +5e +bd +13 +c0 +a0 +05 +1c +53 +7b +e8 +e1 +49 +82 +44 +3e +1f +3c +6f +c1 +89 +32 +e4 +ca +eb +96 +8d a4 6d -b4 -00 +b7 +7f e6 -a4 -95 -7a +c4 +f3 +fd 5b 37 +e3 +34 +43 +7d ef -0f -0c -dd -2d -7f +9c f4 9b -fe -25 -b8 -f9 +f1 +cf +bf +51 f2 -92 +85 9c 93 -03 -89 -06 -93 -2d -8c +0f +61 +b6 +9b +eb +c3 c4 5e 23 -ac -14 -63 -a6 b2 +ec +63 +c7 +bd 27 19 -c3 -c4 +94 +46 8e -51 -b2 -03 -5f -45 -df -98 +31 +87 +fb +b9 +96 +dd +af 76 -1b -40 -51 -41 -4f +7b +42 +b2 +a3 +a8 82 89 -85 -a0 -0d -03 -38 -84 -9a +ca +00 +9c +7e +6c +b7 +e6 9e +f3 +c0 +67 +84 +5c +d6 +20 +72 b8 -7a -a4 -22 -43 -75 -1b -61 -5f -86 +d7 fc -49 +5a df -68 -71 -70 -1c -bc -6b -15 -44 -8a -38 -d8 -dd -61 -e8 -a0 -05 -3e +6c +ff +0f +fb +8d +0f +72 +0b +2a f5 -44 -b8 -d7 -eb -36 +65 +d9 +7b +e8 +b4 +4a +9e +37 +ce +59 +08 +0b +94 5e d5 -4e -3a -53 -69 -70 +4f +1e +b2 +ec +f0 3a -a6 +d6 3e -40 -d4 -09 -25 -a5 -e6 -36 -03 -23 -90 +78 +56 +4e +bf +62 +9b +71 +e3 +dc +6f 61 -81 -c0 -ae -cc -1c -84 -e5 -24 -35 -fd -07 +83 +4f +94 +b4 +3c +de +96 +63 +97 +b1 +ec 6d 72 -fa -b6 +a2 +93 a8 d8 -f5 -e2 -68 -bb -44 -62 -62 -9b -79 -d6 -d1 -85 -25 -3e -22 -97 +a8 +14 +88 +83 +1f +6b 82 -72 -4a -47 -00 -36 -52 -00 +c3 f9 -10 -bc -b2 -35 -ee -62 -5a -95 -10 -60 -50 -4b -00 -ae -ce -c8 -d0 -23 -c9 -ed -37 -10 -e1 -cf -cf +48 +d1 +b1 +78 +80 +c2 +af +02 +e6 +aa +2b +5d 32 -13 +1d +c0 +68 +18 +5c +de +e8 +ec +2d +9a +04 +15 +d0 +35 +98 +ec +54 +8e +db +84 +73 +a0 +e3 +a9 a5 -2c +61 +41 +e4 +d3 +b3 +fc +b9 f5 fa -90 -e8 -fa -52 -8a -13 -65 -e5 -37 -be -e8 +9d +9f +fb +d7 +0e fe -f0 -bd -e1 -9c -21 -12 -b4 -bf -7c -6e -71 -df -0f -de -50 -30 -4d -fc -f3 -6f -49 -e3 -78 -79 -fd -b8 -3c -d1 -26 -46 -95 -bc +2a +25 +a7 +11 +08 bb -33 -6a -87 -3e -59 -89 -66 -12 -e3 -c5 -5e -37 +2e 3f +ae +5c +be +b3 +54 +80 +a2 +f0 +76 77 +0f +de +b0 +0f +a7 +ef +bf +47 +0f +ba +00 39 -cd -b5 -99 -98 -cb -12 -6b -1a +93 +5e +38 +f1 +cf +a3 +0d +10 +e2 +66 6a -1f +e7 +0d +93 +31 +9e +37 +b6 +bd +7e +6d +10 +68 +8e +f9 +f2 +e1 +d8 +cf +fa +54 +f9 +22 +d1 1b 6c -c9 -50 -a5 -5b -6a -56 +a4 +5e +dd +1b +3d +98 9c a2 -a3 -bc +9c +4a f1 3a -48 -2e +49 +7e f1 63 -a4 -d2 +f7 +c5 43 -de -fc -1c -55 -62 -8a -a8 -54 -ae -5b -6d -30 -7e -d6 -b6 -bb -bc -7b be -b0 -ef -34 -6b +fc +07 +1a +c2 +46 +f8 +b5 +8b +8d 61 -f3 +7f +be +40 +c6 +5a +f9 +a3 +f2 +ff +2f +a2 +cb +65 +89 fa -d9 +f5 b5 d7 b3 -03 +06 be e3 82 -55 -f4 -b9 -c8 -41 -88 -65 -15 -70 +6a +bb +19 +59 +4b +8c +1f +48 +22 d0 -d3 -99 -f3 -8d -2a -8a -21 -cd -8a -d8 -ff +b3 +96 +d6 +dd +23 +f6 +2e +9d +e3 +f5 +52 3c 63 -d0 +d2 cf +d1 +e7 be -4c -e0 c4 -de -fd -57 +c6 +fc +ea +d6 +b4 +9b +fc +bc +cb +18 +f8 +d5 +1c 92 -c4 -99 -1e -fb -3b -16 -42 -91 -53 +ea +55 +39 +89 +e8 +de +79 +34 +28 +83 +3e +75 +b3 +b4 +4d +41 +b4 +64 +59 +56 +da 50 -a9 -0d -ce -2f -52 +32 +c7 +08 +56 +77 +9e +01 +a6 +fb +85 96 -c1 -50 -d1 -a2 -71 -b7 -f0 -d9 -bd -4f -0e -21 -16 -94 -99 -30 -c2 -c9 -b2 -13 -38 -5c -42 -cf -43 -83 -bd -21 +da bd -d1 -0c -08 +b3 +8c +0b e0 -5d +3d b9 -d8 -4a -b8 -88 -cb -a6 -ea -b5 -a3 -10 +c6 +02 +b0 +4b +bb +e9 +2a +24 +0e +e0 +98 +c4 +62 +c5 +24 +4e +72 +fb +c8 +1d +17 +a5 96 -7e +9c +78 +d7 27 -8a -e6 -5f -ec -43 -ce -36 -f8 -a5 -94 -4e -81 -9f -2f +40 +05 +e7 +b9 +20 +f5 +ac +ef +d6 d1 -af -a8 -79 -e3 -83 -5c -e1 -6c -94 -0a -82 -de -80 -3c -56 -36 -37 +45 +40 +9d +ec +84 +50 +4f +02 da -99 -b5 -d5 +9b +35 +e5 76 59 a7 -7c +7e 13 -1c +7c 3c -e8 +c6 97 -b1 -5d -d0 +d1 +0f +02 d4 24 12 -76 +74 1a -1e -31 -a5 +7e +63 +77 24 -ca -4a -56 -c0 -8e -ea -ed +aa +18 +80 +fa +8f +91 +c6 65 2d c4 -f5 +e3 2f 3c a4 -9d +85 2c 7f fb -a9 +ac 04 7b 17 -3a +21 78 b0 27 -8e +81 e7 2d f2 -50 +53 a4 53 c4 -3b -1a -3e -57 -ae -b0 -e3 -46 -ed -04 -46 +3d +5d +aa +29 +bc +90 +c3 +11 +12 +ec +b9 2a 2e aa Index: output/program.lis =================================================================== --- /1121s/branch/mouse/mouse_public_Single_Mode/output/program.lis (revision 2996) +++ /1121s/branch/mouse/mouse_public_Single_Mode/output/program.lis (working copy) @@ -18,12 +18,12 @@ 000f c03502d1 beq patch0d_2 ,p_mouse_default_init 0010 c0360287 beq patch0d_4 ,p_mouse_param_init 0011 c0370467 beq patch0d_6 ,p_mouse_start_work -0012 c037d4b6 beq patch0d_7 ,mouse4_0_check_reconn_target -0013 c03984b9 beq patch0e_3 ,p_mouse_setgpio_hibernate +0012 c037846c beq patch0d_7 ,p_mouse4_0_check_reconn_target +0013 c03984bb beq patch0e_3 ,p_mouse_setgpio_hibernate 0014 c03a0237 beq patch0e_4 ,p_mouse_lpm_before_common -0015 c03d04f7 beq patch0f_2 ,p_mouse_motion -0016 c03f849a beq patch0f_7 ,p_mouse_3io6key_check -0017 c04084dc beq patch10_1 ,p_mouse_init_sensor +0015 c03d04f9 beq patch0f_2 ,p_mouse_motion +0016 c03f849c beq patch0f_7 ,p_mouse_3io6key_check +0017 c04084de beq patch10_1 ,p_mouse_init_sensor 0018 c04203a0 beq patch10_4 ,p_mouse_buletooth_fast_conn_end 0019 c04283fd beq patch10_5 ,p_mouse_priority_bb_event 001a c043020c beq patch10_6 ,p_mouse_le @@ -33,11 +33,11 @@ 001e c0458309 beq patch11_3 ,p_mouse_app_initflag_check 001f c0460325 beq patch11_4 ,p_mouse_store_device_info 0020 c0468372 beq patch11_5 ,p_mouse_store_dpi_info_check -0021 c0470482 beq patch11_6 ,p_mouse_idle +0021 c0470484 beq patch11_6 ,p_mouse_idle 0022 c04802f6 beq patch12_0 ,p_mouse_check_select_device_by_switch -0023 c0498502 beq patch12_3 ,p_mouse_drawing_optima -0024 c04a84b0 beq patch12_5 ,p_mouse_24g_hibernate_set -0025 c04b04c5 beq patch12_6 ,p_mouse_24g_package_data +0023 c0498504 beq patch12_3 ,p_mouse_drawing_optima +0024 c04a84b2 beq patch12_5 ,p_mouse_24g_hibernate_set +0025 c04b04c7 beq patch12_6 ,p_mouse_24g_package_data 0026 c0628265 beq patch18_5 ,p_otp_read_data 0027 c06a822b beq patch1a_5 ,p_gpio_set_wake_by_current_state 0028 c06b0224 beq patch1a_6 ,p_gpio_set_wake @@ -56,7 +56,7 @@ 0033 c02681ae beq patch29_5 ,p_le_init_adv 0034 c0480268 beq patch32_0 ,p_g24_reconn_dispatch 0035 c049027c beq patch32_2 ,p_g24_reconn_device_fail -0036 c04b04a7 beq patch32_6 ,p_g24_short_sleep +0036 c04b04a9 beq patch32_6 ,p_g24_short_sleep 0037 c04d00f4 beq patch33_2 ,p_mouse_g24_retransmit 0038 c04e8101 beq patch33_5 ,p_g24_transmit_hop_process 0039 c04f8294 beq patch33_7 ,p_power_ctrl_start @@ -301,7 +301,7 @@ 00fc d8e0000c arg 12 ,queue 00fd 20407cef call timer_check 00fe 247a0000 nrtn blank -00ff 20400486 call p_mouse_dpi_check_retransmit +00ff 20400488 call p_mouse_dpi_check_retransmit 0100 20206102 branch mouse_g24_retransmit_event_set p_g24_transmit_hop_process: @@ -672,7 +672,7 @@ 021f 20405ab2 call mouse_check_125hz 0220 24740000 nrtn user 0221 20405abc call mouse_current_mult_update -0222 204004d1 call p_mouse_data_xy_release +0222 204004d3 call p_mouse_data_xy_release 0223 20205b37 branch mouse_le_next + 12 p_gpio_set_wake: @@ -709,7 +709,7 @@ 0236 202023e2 branch lpm_write_wait p_mouse_lpm_before_common: -0237 204004ac call p_clear_wake +0237 204004ae call p_clear_wake 0238 704b1d00 jam 0 ,mem_mouse_qdec_set_flag 0239 6848c654 fetcht 1 ,mem_matrix_public_gpio 023a 20406ef7 call gpio_out_active @@ -933,7 +933,7 @@ 02d4 2020542c branch mouse_default_parm_init p_mouse_load_device_info_check: -02d5 2040047f call p_mouse_store_normal_tx_power +02d5 20400481 call p_mouse_store_normal_tx_power 02d6 6fe44713 fetch mouse_flag_len ,mem_mouse_flag 02d7 c289dd60 bbit1 mouse_enable_eeprom ,mouse_load_eeprom_info_check 02d8 c28a02da bbit1 mouse_enable_otp ,p_mouse_load_otp_info_check @@ -1496,299 +1496,303 @@ p_mouse_start_work: 0467 6fe44713 fetch mouse_flag_len ,mem_mouse_flag -0468 c29f046c bbit1 mouse_enable_24g_first_auto_pairing ,p_mouse_24g_first_start_auto_pair_mode +0468 c29f046e bbit1 mouse_enable_24g_first_auto_pairing ,p_mouse_24g_first_start_auto_pair_mode 0469 6fe0c666 fetch 1 ,mem_device_flag -046a c0000477 beq mode_24g_device ,p_mouse_24g_start_mode +046a c0000479 beq mode_24g_device ,p_mouse_24g_start_mode 046b 20205491 branch mouse_le_fast_conn_judge +p_mouse4_0_check_reconn_target: +046c 2040619f call mouse_device_le_reconn_led_config +046d 202054b6 branch mouse4_0_check_reconn_target + p_mouse_24g_first_start_auto_pair_mode: -046c 204054ac call mouse_wakeup_from_power_check -046d 20340473 branch p_mouse_24g_first_start_reconn ,user +046e 204054ac call mouse_wakeup_from_power_check +046f 20340475 branch p_mouse_24g_first_start_reconn ,user p_mouse_24g_reconn_general_dongle: -046e 70466600 jam mode_24g_device ,mem_device_flag -046f 6fe14721 fetch 2 ,mem_mouse_24g_power_on_fast_conn_timer -0470 67e145de store 2 ,mem_24g_reconn_timeout -0471 7045e201 jam fast_conn_and_receiver ,mem_24g_reconn_type -0472 20203534 branch g24_reconn_start +0470 70466600 jam mode_24g_device ,mem_device_flag +0471 6fe14721 fetch 2 ,mem_mouse_24g_power_on_fast_conn_timer +0472 67e145de store 2 ,mem_24g_reconn_timeout +0473 7045e201 jam fast_conn_and_receiver ,mem_24g_reconn_type +0474 20203534 branch g24_reconn_start p_mouse_24g_first_start_reconn: -0473 6fe0c666 fetch 1 ,mem_device_flag -0474 c0006067 beq mode_24g_device ,mouse_24g_reconn_dongle_start -0475 20405aa8 call mouse_bluetooth_fast_conn_disable -0476 2020045f branch p_mouse_24g_first_bluetooth_reconnect +0475 6fe0c666 fetch 1 ,mem_device_flag +0476 c0006067 beq mode_24g_device ,mouse_24g_reconn_dongle_start +0477 20405aa8 call mouse_bluetooth_fast_conn_disable +0478 2020045f branch p_mouse_24g_first_bluetooth_reconnect p_mouse_24g_start_mode: -0477 6fe44713 fetch mouse_flag_len ,mem_mouse_flag -0478 c308e02a bbit0 mouse_enable_24g ,mouse_24g_mode_setup_error -0479 20406195 call mouse_device_24g_pair_led_config -047a 204054ac call mouse_wakeup_from_power_check -047b 20346067 branch mouse_24g_reconn_dongle_start ,user -047c 6fe44713 fetch mouse_flag_len ,mem_mouse_flag -047d c298046e bbit1 mouse_enable_auto_24g_paring ,p_mouse_24g_reconn_general_dongle -047e 20206023 branch mouse_24g_start_mode + 7 +0479 6fe44713 fetch mouse_flag_len ,mem_mouse_flag +047a c308e02a bbit0 mouse_enable_24g ,mouse_24g_mode_setup_error +047b 20406195 call mouse_device_24g_pair_led_config +047c 204054ac call mouse_wakeup_from_power_check +047d 20346067 branch mouse_24g_reconn_dongle_start ,user +047e 6fe44713 fetch mouse_flag_len ,mem_mouse_flag +047f c2980470 bbit1 mouse_enable_auto_24g_paring ,p_mouse_24g_reconn_general_dongle +0480 20206023 branch mouse_24g_start_mode + 7 p_mouse_store_normal_tx_power: -047f 6fe0c141 fetch 1 ,mem_tx_power -0480 67e0ca07 store 1 ,mem_normal_tx_power -0481 20600000 rtn +0481 6fe0c141 fetch 1 ,mem_tx_power +0482 67e0ca07 store 1 ,mem_normal_tx_power +0483 20600000 rtn p_mouse_idle: -0482 2040620e call mouse_low_voltage_led_no_enter_lpm -0483 204078aa call ui_check_paring_button -0484 20400488 call p_mouse_dpi_check -0485 20205e61 branch mouse_idle + 4 +0484 2040620e call mouse_low_voltage_led_no_enter_lpm +0485 204078aa call ui_check_paring_button +0486 2040048a call p_mouse_dpi_check +0487 20205e61 branch mouse_idle + 4 p_mouse_dpi_check_retransmit: -0486 6fe44713 fetch mouse_flag_len ,mem_mouse_flag -0487 c4140000 rtnbit0 mouse_enable_select_device_by_dpi_button +0488 6fe44713 fetch mouse_flag_len ,mem_mouse_flag +0489 c4140000 rtnbit0 mouse_enable_select_device_by_dpi_button p_mouse_dpi_check: -0488 6fe0c649 fetch 1 ,mem_dpi_button_gpio -0489 c17f8000 rtneq gpio_disable -048a da200000 arg 0 ,rega -048b 70497705 jam mouse_dpi_key ,mem_mouse_key_temp -048c 6848c649 fetcht 1 ,mem_dpi_button_gpio -048d 2040048f call p_mouse_dpi_key_check -048e 202056c1 branch mouse_dpi_check_next +048a 6fe0c649 fetch 1 ,mem_dpi_button_gpio +048b c17f8000 rtneq gpio_disable +048c da200000 arg 0 ,rega +048d 70497705 jam mouse_dpi_key ,mem_mouse_key_temp +048e 6848c649 fetcht 1 ,mem_dpi_button_gpio +048f 20400491 call p_mouse_dpi_key_check +0490 202056c1 branch mouse_dpi_check_next p_mouse_dpi_key_check: -048f 6fe44713 fetch mouse_flag_len ,mem_mouse_flag -0490 c295d6de bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd -0491 6fe0c974 fetch 1 ,mem_mouse_dpikey_press_status -0492 1fe22600 copy pdata ,regc -0493 6fe0c654 fetch 1 ,mem_matrix_public_gpio -0494 c07f8496 beq gpio_disable ,p_mouse_3io6key_dpi_check -0495 202056ce branch mouse_dpi_key_check_next +0491 6fe44713 fetch mouse_flag_len ,mem_mouse_flag +0492 c295d6de bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd +0493 6fe0c974 fetch 1 ,mem_mouse_dpikey_press_status +0494 1fe22600 copy pdata ,regc +0495 6fe0c654 fetch 1 ,mem_matrix_public_gpio +0496 c07f8498 beq gpio_disable ,p_mouse_3io6key_dpi_check +0497 202056ce branch mouse_dpi_key_check_next p_mouse_3io6key_dpi_check: -0496 6fe0c649 fetch 1 ,mem_dpi_button_gpio -0497 20405946 call mouse_gpio_config_output_low -0498 6848c649 fetcht 1 ,mem_dpi_button_gpio -0499 2020049a branch p_mouse_3io6key_check +0498 6fe0c649 fetch 1 ,mem_dpi_button_gpio +0499 20405946 call mouse_gpio_config_output_low +049a 6848c649 fetcht 1 ,mem_dpi_button_gpio +049b 2020049c branch p_mouse_3io6key_check p_mouse_3io6key_check: -049a 1a627e00 copy regc ,pdata -049b 67e0c978 store 1 ,mem_mouse_key_status -049c 1fe3fe00 lshift pdata ,pdata -049d 1fe22400 copy pdata ,regb -049e 18422600 copy temp ,regc -049f 20406ef7 call gpio_out_active -04a0 1a620400 copy regc ,temp -04a1 204055b1 call mouse_gpio_config_input_pd +049c 1a627e00 copy regc ,pdata +049d 67e0c978 store 1 ,mem_mouse_key_status +049e 1fe3fe00 lshift pdata ,pdata +049f 1fe22400 copy pdata ,regb +04a0 18422600 copy temp ,regc +04a1 20406ef7 call gpio_out_active 04a2 1a620400 copy regc ,temp -04a3 20406ee6 call gpio_get_bit -04a4 7d20a400 nsetflag true ,0 ,regb -04a5 2040593d call mouse_check_press -04a6 20205929 branch mouse_check_key_connect_gnd_1 +04a3 204055b1 call mouse_gpio_config_input_pd +04a4 1a620400 copy regc ,temp +04a5 20406ee6 call gpio_get_bit +04a6 7d20a400 nsetflag true ,0 ,regb +04a7 2040593d call mouse_check_press +04a8 20205929 branch mouse_check_key_connect_gnd_1 p_g24_short_sleep: -04a7 204036b4 call g24_lpm_wait -04a8 24740000 nrtn user -04a9 204036be call g24_setgpio_lpm_before -04aa 204004ac call p_clear_wake -04ab 2020361b branch g24_short_sleep_next +04a9 204036b4 call g24_lpm_wait +04aa 24740000 nrtn user +04ab 204036be call g24_setgpio_lpm_before +04ac 204004ae call p_clear_wake +04ad 2020361b branch g24_short_sleep_next p_clear_wake: -04ac 58000000 setarg 0 -04ad 67e40016 store 8 ,mem_gpio_wakeup_cfg -04ae 67e2001e store 4 ,mem_gpio_wakeup_cfg + 8 -04af 20600000 rtn +04ae 58000000 setarg 0 +04af 67e40016 store 8 ,mem_gpio_wakeup_cfg +04b0 67e2001e store 4 ,mem_gpio_wakeup_cfg + 8 +04b1 20600000 rtn p_mouse_24g_hibernate_set: -04b0 70460000 jam 0 ,mem_24g_attempt_fail_flag -04b1 20403647 call g24_transmit_next_packet -04b2 5fffffff setarg -1 -04b3 67e245af store 4 ,mem_24g_enter_hibernate -04b4 58000000 setarg 0 -04b5 67e3c846 store 7 ,mem_mouse_key -04b6 70473f01 jam 1 ,mem_sensor_shutdown_flag -04b7 204059ed call mouse_sensor_powerdown -04b8 2020622b branch mouse_24g_long_sleep +04b2 70460000 jam 0 ,mem_24g_attempt_fail_flag +04b3 20403647 call g24_transmit_next_packet +04b4 5fffffff setarg -1 +04b5 67e245af store 4 ,mem_24g_enter_hibernate +04b6 58000000 setarg 0 +04b7 67e3c846 store 7 ,mem_mouse_key +04b8 70473f01 jam 1 ,mem_sensor_shutdown_flag +04b9 204059ed call mouse_sensor_powerdown +04ba 2020622b branch mouse_24g_long_sleep p_mouse_setgpio_hibernate: -04b9 20405a92 call mouse_set_sdio_high -04ba 204004ac call p_clear_wake -04bb 204056a9 call mouse_before_hibernate_wheel_gpio_set -04bc 6fe0c64d fetch 1 ,mem_mouse_sensor_sdio_gpio -04bd 20405943 call mouse_gpio_config_output_high -04be 6848c65a fetcht 1 ,mem_device_switch_gpio -04bf 204055ab call mouse_gpio_set_pupd_by_input -04c0 d8400015 arg 21 ,temp -04c1 204055b5 call mouse_gpio_config_input_pu -04c2 2040611a call mouse_logo_led_off -04c3 20400237 call p_mouse_lpm_before_common -04c4 202054e2 branch mouse_setgpio_hibernate_next +04bb 20405a92 call mouse_set_sdio_high +04bc 204004ae call p_clear_wake +04bd 204056a9 call mouse_before_hibernate_wheel_gpio_set +04be 6fe0c64d fetch 1 ,mem_mouse_sensor_sdio_gpio +04bf 20405943 call mouse_gpio_config_output_high +04c0 6848c65a fetcht 1 ,mem_device_switch_gpio +04c1 204055ab call mouse_gpio_set_pupd_by_input +04c2 d8400015 arg 21 ,temp +04c3 204055b5 call mouse_gpio_config_input_pu +04c4 2040611a call mouse_logo_led_off +04c5 20400237 call p_mouse_lpm_before_common +04c6 202054e2 branch mouse_setgpio_hibernate_next p_mouse_24g_package_data: -04c5 c6930000 rtnmark0 mark_24g -04c6 20405601 call mouse_motion -04c7 24740000 nrtn user -04c8 6fe0c77c fetch 1 ,mem_mouse_24g_long_sleep_flag -04c9 70477c00 jam 0 ,mem_mouse_24g_long_sleep_flag -04ca 245a04da ncall p_mouse_24g_short_sleep_clear_wake ,blank -04cb 6fe44713 fetch mouse_flag_len ,mem_mouse_flag -04cc c30b04cf bbit0 mouse_enable_keyboard ,p_mouse_24g_mouse_package_data -04cd 6fe0c96c fetch 1 ,mem_customer_key -04ce 243a60b6 nbranch mouse_24g_keyboard_package_data ,blank +04c7 c6930000 rtnmark0 mark_24g +04c8 20405601 call mouse_motion +04c9 24740000 nrtn user +04ca 6fe0c77c fetch 1 ,mem_mouse_24g_long_sleep_flag +04cb 70477c00 jam 0 ,mem_mouse_24g_long_sleep_flag +04cc 245a04dc ncall p_mouse_24g_short_sleep_clear_wake ,blank +04cd 6fe44713 fetch mouse_flag_len ,mem_mouse_flag +04ce c30b04d1 bbit0 mouse_enable_keyboard ,p_mouse_24g_mouse_package_data +04cf 6fe0c96c fetch 1 ,mem_customer_key +04d0 243a60b6 nbranch mouse_24g_keyboard_package_data ,blank p_mouse_24g_mouse_package_data: -04cf 204004d1 call p_mouse_data_xy_release -04d0 202060a2 branch mouse_24g_mouse_package_data + 1 +04d1 204004d3 call p_mouse_data_xy_release +04d2 202060a2 branch mouse_24g_mouse_package_data + 1 p_mouse_data_xy_release: -04d1 6fe0c659 fetch 1 ,mem_sensor_motion_gpio -04d2 c1ff8000 rtnne gpio_disable -04d3 6fe0c77d fetch 1 ,mem_mouse_long_mult_flag -04d4 207a0000 rtn blank -04d5 1fe0ffff increase -1 ,pdata -04d6 67e0c77d store 1 ,mem_mouse_long_mult_flag -04d7 58000000 setarg 0 -04d8 67e24847 store 4 ,mem_mouse_x -04d9 20205a73 branch mouse_init_sensor_reset +04d3 6fe0c659 fetch 1 ,mem_sensor_motion_gpio +04d4 c1ff8000 rtnne gpio_disable +04d5 6fe0c77d fetch 1 ,mem_mouse_long_mult_flag +04d6 207a0000 rtn blank +04d7 1fe0ffff increase -1 ,pdata +04d8 67e0c77d store 1 ,mem_mouse_long_mult_flag +04d9 58000000 setarg 0 +04da 67e24847 store 4 ,mem_mouse_x +04db 20205a73 branch mouse_init_sensor_reset p_mouse_24g_short_sleep_clear_wake: -04da 204004ac call p_clear_wake -04db 20200256 branch p_lpm_write_gpio_wakeup +04dc 204004ae call p_clear_wake +04dd 20200256 branch p_lpm_write_gpio_wakeup p_mouse_init_sensor: -04dc 20405958 call mouse_read_sensor_id -04dd c018595f beq p32xx_id1 ,mouse_init_p32xx_id2_judge -04de c018d9c6 beq p3065_id1 ,mouse_init_p3065 -04df c02c04e1 beq pka8g2_id1 ,p_mouse_ka8g2_id2_judge -04e0 20205952 branch mouse_init_sensor + 5 +04de 20405958 call mouse_read_sensor_id +04df c018595f beq p32xx_id1 ,mouse_init_p32xx_id2_judge +04e0 c018d9c6 beq p3065_id1 ,mouse_init_p3065 +04e1 c02c04e3 beq pka8g2_id1 ,p_mouse_ka8g2_id2_judge +04e2 20205952 branch mouse_init_sensor + 5 p_mouse_ka8g2_id2_judge: -04e1 204059e7 call mouse_sensor_poweron -04e2 6fe0c85a fetch 1 ,mem_sensor_id2 -04e3 c02c84e5 beq pka8g2_id2 ,p_mouse_ka8g2_init_param -04e4 2020595f branch mouse_init_p32xx_id2_judge +04e3 204059e7 call mouse_sensor_poweron +04e4 6fe0c85a fetch 1 ,mem_sensor_id2 +04e5 c02c84e7 beq pka8g2_id2 ,p_mouse_ka8g2_init_param +04e6 2020595f branch mouse_init_p32xx_id2_judge p_mouse_ka8g2_init_param: -04e5 7049570b jam ka8g2 ,mem_config_sensor_type -04e6 da604a0b arg mem_sensor_ka8g2_init_new ,regc -04e7 20205995 branch mouse_sensor_wr_seq +04e7 7049570b jam ka8g2 ,mem_config_sensor_type +04e8 da604a0b arg mem_sensor_ka8g2_init_new ,regc +04e9 20205995 branch mouse_sensor_wr_seq p_mouse_check_sensor_data: -04e8 6fe0c420 fetch 1 ,mem_spi_write_flash_sm -04e9 c1800000 rtnne flash_sm_no_buys -04ea 6fe0c957 fetch 1 ,mem_config_sensor_type -04eb c00584ed beq ka8g2 ,p_mouse_pka8g2_sensor_motion -04ec 202059f8 branch mouse_check_sensor_data + 2 +04ea 6fe0c420 fetch 1 ,mem_spi_write_flash_sm +04eb c1800000 rtnne flash_sm_no_buys +04ec 6fe0c957 fetch 1 ,mem_config_sensor_type +04ed c00584ef beq ka8g2 ,p_mouse_pka8g2_sensor_motion +04ee 202059f8 branch mouse_check_sensor_data + 2 p_mouse_pka8g2_sensor_motion: -04ed 20405a6d call mouse_clear_sensor_data -04ee 6fe0c659 fetch 1 ,mem_sensor_motion_gpio -04ef c07f84f3 beq gpio_disable ,p_mouse_pka8g2_sensor_motion_1 -04f0 6848c659 fetcht 1 ,mem_sensor_motion_gpio -04f1 20406ee6 call gpio_get_bit -04f2 24608000 nrtn true +04ef 20405a6d call mouse_clear_sensor_data +04f0 6fe0c659 fetch 1 ,mem_sensor_motion_gpio +04f1 c07f84f5 beq gpio_disable ,p_mouse_pka8g2_sensor_motion_1 +04f2 6848c659 fetcht 1 ,mem_sensor_motion_gpio +04f3 20406ee6 call gpio_get_bit +04f4 24608000 nrtn true p_mouse_pka8g2_sensor_motion_1: -04f3 58000000 setarg pan_reg_pid_l -04f4 204069e5 call twspi_read -04f5 c0ac5955 bne pka8g2_id1 ,mouse_twspi_reset -04f6 20205a2f branch mouse_p3212_sensor_motion_2 +04f5 58000000 setarg pan_reg_pid_l +04f6 204069e5 call twspi_read +04f7 c0ac5955 bne pka8g2_id1 ,mouse_twspi_reset +04f8 20205a2f branch mouse_p3212_sensor_motion_2 p_mouse_motion: -04f7 78547c00 disable user -04f8 58000000 setarg 0 -04f9 67e34847 store 6 ,mem_mouse_x -04fa 204004e8 call p_mouse_check_sensor_data -04fb 58000089 setarg 0x0089 -04fc 204069e4 call twspi_write -04fd 20405747 call mouse_setting_sensor_type -04fe 20405612 call mouse_zwheel -04ff 20405617 call mouse_t_zwheel -0500 20400505 call p_mouse_key -0501 2020560c branch mouse_motion + 11 +04f9 78547c00 disable user +04fa 58000000 setarg 0 +04fb 67e34847 store 6 ,mem_mouse_x +04fc 204004ea call p_mouse_check_sensor_data +04fd 58000089 setarg 0x0089 +04fe 204069e4 call twspi_write +04ff 20405747 call mouse_setting_sensor_type +0500 20405612 call mouse_zwheel +0501 20405617 call mouse_t_zwheel +0502 20400507 call p_mouse_key +0503 2020560c branch mouse_motion + 11 p_mouse_drawing_optima: -0502 6fe0c957 fetch 1 ,mem_config_sensor_type -0503 c1058000 rtneq ka8g2 -0504 20205f27 branch mouse_drawing_optima + 1 +0504 6fe0c957 fetch 1 ,mem_config_sensor_type +0505 c1058000 rtneq ka8g2 +0506 20205f27 branch mouse_drawing_optima + 1 p_mouse_key: -0505 2040584c call mouse_check_firekey_gpio -0506 6fe0c987 fetch 1 ,mem_fire_key_flag -0507 243a5860 nbranch fire_key_press ,blank -0508 6fe0c982 fetch 1 ,mem_fire_key_status -0509 243a585f nbranch fire_key_process ,blank -050a 20405888 call mouse_check_key_gpio -050b 2040050d call p_mouse_ghost_key_check -050c 202057ad branch mouse_key + 7 +0507 2040584c call mouse_check_firekey_gpio +0508 6fe0c987 fetch 1 ,mem_fire_key_flag +0509 243a5860 nbranch fire_key_press ,blank +050a 6fe0c982 fetch 1 ,mem_fire_key_status +050b 243a585f nbranch fire_key_process ,blank +050c 20405888 call mouse_check_key_gpio +050d 2040050f call p_mouse_ghost_key_check +050e 202057ad branch mouse_key + 7 p_mouse_ghost_key_check: -050d 70497900 jam 0 ,mem_mouse_matrix_key_cow_count -050e 70497a00 jam 0 ,mem_mouse_matrix_key_row_count -050f 70497b00 jam 0 ,mem_mouse_ghost_flag -0510 1fe22400 copy pdata ,regb -0511 6848c644 fetcht 1 ,mem_lbutton_gpio -0512 6fe0c647 fetch 1 ,mem_bk_button_gpio -0513 98467c00 isub temp ,null -0514 2022851f branch p_mouse_matrix_ghost_key_l_bk ,zero -0515 6fe0c648 fetch 1 ,mem_fw_button_gpio -0516 98467c00 isub temp ,null -0517 20228525 branch p_mouse_matrix_ghost_key_l_fw ,zero -0518 6848c645 fetcht 1 ,mem_mbutton_gpio -0519 6fe0c647 fetch 1 ,mem_bk_button_gpio -051a 98467c00 isub temp ,null -051b 2022852e branch p_mouse_ghost_key_mbk_rfw ,zero +050f 70497900 jam 0 ,mem_mouse_matrix_key_cow_count +0510 70497a00 jam 0 ,mem_mouse_matrix_key_row_count +0511 70497b00 jam 0 ,mem_mouse_ghost_flag +0512 1fe22400 copy pdata ,regb +0513 6848c644 fetcht 1 ,mem_lbutton_gpio +0514 6fe0c647 fetch 1 ,mem_bk_button_gpio +0515 98467c00 isub temp ,null +0516 20228521 branch p_mouse_matrix_ghost_key_l_bk ,zero +0517 6fe0c648 fetch 1 ,mem_fw_button_gpio +0518 98467c00 isub temp ,null +0519 20228527 branch p_mouse_matrix_ghost_key_l_fw ,zero +051a 6848c645 fetcht 1 ,mem_mbutton_gpio +051b 6fe0c647 fetch 1 ,mem_bk_button_gpio +051c 98467c00 isub temp ,null +051d 20228530 branch p_mouse_ghost_key_mbk_rfw ,zero p_mouse_ghost_key_mfw_rbk: -051c 204057fb call mouse_ghost_key_check_m_fw +051e 204057fb call mouse_ghost_key_check_m_fw p_mouse_ghost_key_rbk: -051d 20400533 call p_mouse_ghost_key_check_r_bk -051e 202057e5 branch mouse_ghost_key_check_next +051f 20400535 call p_mouse_ghost_key_check_r_bk +0520 202057e5 branch mouse_ghost_key_check_next p_mouse_matrix_ghost_key_l_bk: -051f 6848c645 fetcht 1 ,mem_mbutton_gpio -0520 6fe0c648 fetch 1 ,mem_fw_button_gpio -0521 98467c00 isub temp ,null -0522 2022d7d6 branch mouse_ghost_key_lbk_mfw ,zero +0521 6848c645 fetcht 1 ,mem_mbutton_gpio +0522 6fe0c648 fetch 1 ,mem_fw_button_gpio +0523 98467c00 isub temp ,null +0524 2022d7d6 branch mouse_ghost_key_lbk_mfw ,zero p_mouse_ghost_key_lbk_rfw: -0523 204057ef call mouse_ghost_key_check_l_bk -0524 2020052f branch p_mouse_ghost_key_rfw +0525 204057ef call mouse_ghost_key_check_l_bk +0526 20200531 branch p_mouse_ghost_key_rfw p_mouse_matrix_ghost_key_l_fw: -0525 6848c645 fetcht 1 ,mem_mbutton_gpio -0526 6fe0c647 fetch 1 ,mem_bk_button_gpio -0527 98467c00 isub temp ,null -0528 2022852b branch p_mouse_ghost_key_lfw_mbk ,zero +0527 6848c645 fetcht 1 ,mem_mbutton_gpio +0528 6fe0c647 fetch 1 ,mem_bk_button_gpio +0529 98467c00 isub temp ,null +052a 2022852d branch p_mouse_ghost_key_lfw_mbk ,zero p_mouse_ghost_key_lfw_rbk: -0529 20400535 call p_mouse_ghost_key_check_l_fw -052a 2020051d branch p_mouse_ghost_key_rbk +052b 20400537 call p_mouse_ghost_key_check_l_fw +052c 2020051f branch p_mouse_ghost_key_rbk p_mouse_ghost_key_lfw_mbk: -052b 20400535 call p_mouse_ghost_key_check_l_fw -052c 20400531 call p_mouse_ghost_key_check_m_bk -052d 202057e5 branch mouse_ghost_key_check_next +052d 20400537 call p_mouse_ghost_key_check_l_fw +052e 20400533 call p_mouse_ghost_key_check_m_bk +052f 202057e5 branch mouse_ghost_key_check_next p_mouse_ghost_key_mbk_rfw: -052e 20400531 call p_mouse_ghost_key_check_m_bk +0530 20400533 call p_mouse_ghost_key_check_m_bk p_mouse_ghost_key_rfw: -052f 20400537 call p_mouse_ghost_key_check_r_fw -0530 202057e5 branch mouse_ghost_key_check_next +0531 20400539 call p_mouse_ghost_key_check_r_fw +0532 202057e5 branch mouse_ghost_key_check_next p_mouse_ghost_key_check_m_bk: -0531 1a417e12 and regb ,mouse_m_bk_button ,pdata -0532 202057f3 branch mouse_ghost_key_check_m_bk + 1 +0533 1a417e12 and regb ,mouse_m_bk_button ,pdata +0534 202057f3 branch mouse_ghost_key_check_m_bk + 1 p_mouse_ghost_key_check_r_bk: -0533 1a417e0a and regb ,mouse_r_bk_button ,pdata -0534 202057f6 branch mouse_ghost_key_check_r_bk + 1 +0535 1a417e0a and regb ,mouse_r_bk_button ,pdata +0536 202057f6 branch mouse_ghost_key_check_r_bk + 1 p_mouse_ghost_key_check_l_fw: -0535 1a417e11 and regb ,mouse_l_fw_button ,pdata -0536 202057f9 branch mouse_ghost_key_check_l_fw + 1 +0537 1a417e11 and regb ,mouse_l_fw_button ,pdata +0538 202057f9 branch mouse_ghost_key_check_l_fw + 1 p_mouse_ghost_key_check_r_fw: -0537 1a417e12 and regb ,mouse_r_fw_button ,pdata -0538 202057ff branch mouse_ghost_key_check_r_fw + 1 +0539 1a417e12 and regb ,mouse_r_fw_button ,pdata +053a 202057ff branch mouse_ghost_key_check_r_fw + 1 org 0x2000 start: Index: program/patch.prog =================================================================== --- /1121s/branch/mouse/mouse_public_Single_Mode/program/patch.prog (revision 2996) +++ /1121s/branch/mouse/mouse_public_Single_Mode/program/patch.prog (working copy) @@ -35,7 +35,7 @@ beq patch0d_5,p_mouse_sensor_set_angle endif beq patch0d_6,p_mouse_start_work - beq patch0d_7,mouse4_0_check_reconn_target + beq patch0d_7,p_mouse4_0_check_reconn_target beq patch0e_3,p_mouse_setgpio_hibernate beq patch0e_4,p_mouse_lpm_before_common ifdef ADC_1121SB @@ -1707,6 +1707,10 @@ beq MODE_24G_DEVICE,p_mouse_24g_start_mode branch mouse_le_fast_conn_judge +p_mouse4_0_check_reconn_target: + call mouse_device_le_reconn_led_config + branch mouse4_0_check_reconn_target + p_mouse_24g_first_start_auto_pair_mode: call mouse_wakeup_from_power_check branch p_mouse_24g_first_start_reconn,user