Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Gan/output/flash.dat (revision 3822) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Gan/output/flash.dat (working copy) @@ -47,7 +47,7 @@ 20 40 02 -b4 +b5 20 40 07 @@ -63,7 +63,7 @@ 20 20 02 -da +db 58 00 03 @@ -155,7 +155,7 @@ 20 40 02 -b6 +b7 20 40 04 @@ -2579,7 +2579,7 @@ 20 35 82 -b4 +b5 68 01 c4 @@ -2606,8 +2606,16 @@ 0a 20 40 +06 +ec +20 +40 +06 +a7 +20 +40 02 -99 +9b 20 40 04 @@ -2631,7 +2639,7 @@ 20 22 83 -3b +3c 1f e0 ff @@ -2655,11 +2663,11 @@ c0 19 82 -9c +9e c0 1a 02 -a1 +a2 20 60 00 @@ -2676,10 +2684,6 @@ 60 00 00 -20 -40 -06 -ec 70 4b 51 @@ -2731,7 +2735,7 @@ 20 20 02 -a4 +a5 70 4b b1 @@ -2783,7 +2787,7 @@ 20 40 02 -b4 +b5 20 40 40 @@ -2795,11 +2799,11 @@ c0 18 02 -c4 +c5 c0 18 82 -d6 +d7 20 40 40 @@ -2811,7 +2815,7 @@ 20 20 02 -b8 +b9 70 47 9e @@ -2831,7 +2835,7 @@ 20 40 02 -b6 +b7 20 20 64 @@ -2847,7 +2851,7 @@ c0 2d 02 -c8 +c9 20 20 40 @@ -2875,7 +2879,7 @@ 20 40 02 -cf +d0 20 20 04 @@ -2907,7 +2911,7 @@ 20 20 02 -cf +d0 20 40 04 @@ -2979,7 +2983,7 @@ 20 40 03 -32 +33 20 40 44 @@ -2999,7 +3003,7 @@ 20 22 83 -24 +25 60 09 47 @@ -3031,27 +3035,27 @@ 20 40 03 -32 +33 20 40 03 -03 +04 20 40 03 -1b +1c 20 40 03 -07 +08 20 40 03 -12 +13 20 40 02 -dc +dd d8 40 00 @@ -3075,19 +3079,19 @@ 20 40 03 -07 +08 20 40 03 -12 +13 20 40 03 -2a +2b 20 20 02 -b4 +b5 68 01 c7 @@ -3103,7 +3107,7 @@ 20 20 03 -12 +13 1f e2 26 @@ -3179,7 +3183,7 @@ c2 80 03 -12 +13 20 60 00 @@ -3211,11 +3215,11 @@ 20 40 03 -32 +33 20 40 03 -1b +1c 20 20 65 @@ -3223,11 +3227,11 @@ 20 40 03 -21 +22 20 40 03 -34 +35 20 40 43 @@ -3251,7 +3255,7 @@ 20 40 02 -dc +dd 20 40 69 @@ -3283,11 +3287,11 @@ 20 20 03 -2b +2c 20 40 03 -32 +33 d8 40 00 @@ -3312,10 +3316,6 @@ 20 65 62 -20 -40 -06 -ec 68 00 c2 @@ -3563,7 +3563,7 @@ 20 5a 02 -be +bf 68 02 46 @@ -3735,7 +3735,7 @@ 20 5a 02 -be +bf 68 02 46 @@ -4007,7 +4007,7 @@ 20 40 02 -c0 +c1 20 40 34 @@ -4103,7 +4103,7 @@ 20 40 02 -c0 +c1 20 20 42 @@ -4135,7 +4135,7 @@ 20 40 02 -c0 +c1 70 11 c5 @@ -4175,7 +4175,7 @@ 20 40 02 -c0 +c1 20 20 3f @@ -4211,7 +4211,7 @@ 20 40 02 -b6 +b7 58 00 08 @@ -4459,7 +4459,7 @@ 20 22 82 -b1 +b2 68 01 46 @@ -4607,7 +4607,7 @@ 20 40 02 -f4 +f5 68 02 46 @@ -4887,7 +4887,7 @@ 20 40 02 -b4 +b5 58 00 80 @@ -5323,7 +5323,7 @@ 20 40 02 -c0 +c1 20 20 42 @@ -6815,7 +6815,7 @@ 20 20 02 -f4 +f5 68 00 cb @@ -7643,7 +7643,7 @@ 20 40 03 -32 +33 68 01 cb @@ -7679,7 +7679,7 @@ 20 40 02 -b4 +b5 58 00 1f @@ -8164,8 +8164,8 @@ 20 07 f3 -14 -70 +ed +24 aa 55 08 @@ -8442,7 +8442,7 @@ 47 6f 20 -6d +4d 6f 75 73 @@ -8555,7 +8555,7 @@ 47 6f 20 -6d +4d 6f 75 73 @@ -8575,7 +8575,7 @@ 47 6f 20 -6d +4d 6f 75 73 @@ -8593,7 +8593,7 @@ 47 6f 20 -6d +4d 6f 75 73 @@ -9117,7 +9117,7 @@ 00 b2 4b -04 +05 00 aa 55 @@ -9362,7 +9362,7 @@ 20 40 02 -99 +9b 68 02 4c @@ -9450,7 +9450,7 @@ 20 40 02 -99 +9b 68 02 4c @@ -9634,7 +9634,7 @@ 20 40 02 -f4 +f5 20 20 41 @@ -9814,7 +9814,7 @@ 20 40 02 -99 +9b 20 40 01 @@ -9942,7 +9942,7 @@ 20 40 02 -f4 +f5 20 20 41 @@ -9978,7 +9978,7 @@ 20 40 02 -f4 +f5 20 40 3e @@ -9990,7 +9990,7 @@ 20 40 03 -2a +2b 68 10 80 @@ -10266,7 +10266,7 @@ 20 40 02 -99 +9b 68 02 4c @@ -10278,7 +10278,7 @@ 20 20 02 -f4 +f5 00 00 00 @@ -10394,7 +10394,7 @@ 20 40 02 -e7 +e8 df 20 00 @@ -10410,7 +10410,7 @@ 24 34 02 -aa +ab df 20 00 @@ -10426,11 +10426,11 @@ 24 34 02 -aa +ab 20 40 02 -ac +ad 20 60 00 @@ -10678,7 +10678,7 @@ 20 20 02 -f4 +f5 00 00 00 @@ -11078,7 +11078,7 @@ 20 40 02 -99 +9b 70 47 9e @@ -11094,7 +11094,7 @@ 20 40 03 -34 +35 68 09 47 @@ -11114,7 +11114,7 @@ 20 40 02 -f9 +fa 18 0a 7e @@ -11134,7 +11134,7 @@ 20 40 02 -aa +ab 20 40 34 @@ -11218,7 +11218,7 @@ 20 40 02 -a3 +a4 58 00 00 @@ -11834,15 +11834,15 @@ c0 10 00 -16 +15 c0 10 80 -2a +29 c0 11 00 -23 +22 c0 11 80 @@ -11855,10 +11855,6 @@ 4b 6c 01 -20 -40 -06 -ec 70 47 a1 @@ -11878,7 +11874,7 @@ 24 22 80 -0e +0d 58 00 02 @@ -11894,7 +11890,7 @@ 20 40 02 -a3 +a4 58 00 00 @@ -11922,11 +11918,11 @@ c0 42 00 -1a +19 c0 41 80 -1d +1c 20 20 60 @@ -11934,7 +11930,7 @@ 20 40 00 -20 +1f 68 00 80 @@ -11946,7 +11942,7 @@ 20 40 00 -20 +1f 68 00 80 @@ -12026,7 +12022,7 @@ c0 17 00 -33 +32 20 20 60 @@ -12083,6 +12079,10 @@ 00 00 00 +00 +00 +00 +00 20 20 00 @@ -12599,5 +12599,5 @@ 55 00 00 -ba -49 +ef +14 Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Gan/output/program.lis (revision 3822) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Gan/output/program.lis (working copy) @@ -16,11 +16,11 @@ 0007 6800cb33 fetch 1 ,mem_bt_ui_button_timeout 0008 6000cb34 store 1 ,mem_bt_ui_button_count 0009 204043ca call mouse_bt_discovery_button_down_disable -000a 204002b4 call p_mouse_spi_init +000a 204002b5 call p_mouse_spi_init 000b 20400790 call p_drawing_optima_init 000c 2040000f call p_mouse_cb_fuction 000d 20400022 call p_mouse_wakeup_from_power -000e 202002da branch p_mouse_setting_config +000e 202002db branch p_mouse_setting_config p_mouse_cb_fuction: 000f 58000357 setarg p_mouse_g24_package_data @@ -47,7 +47,7 @@ 0022 58000019 setarg 25 0023 60014d84 store 2 ,mem_24g_transmit_by_interrupt_exit_count_init 0024 2455802c ncall p_mouse_24g_transmit_by_interrupt_exit_count_max ,wake -0025 204002b6 call p_mouse_init_sunt +0025 204002b7 call p_mouse_init_sunt 0026 2040041a call p_mouse_sensor_powerdown p_mouse_wakeup_no_from_power: @@ -845,7 +845,7 @@ 0280 2040296c call initialize_radio 0281 20403416 call app_lpm_mult_enable 0282 204074b9 call enable_authrom -0283 203582b4 branch p_mouse_spi_init ,wake +0283 203582b5 branch p_mouse_spi_init ,wake p_device_wake_from_power: 0284 6801c4a3 fetch 3 ,mem_le_lap + 3 @@ -856,250 +856,250 @@ 0289 c280b40a bbit1 1 ,app_enter_hibernate p_mouse_check_reconn_target: -028a 20400299 call p_mouse_tx_power_init -028b 20400463 call p_mouse_select_device_by_button -028c da204721 arg mem_device1_type ,rega -028d 6800c720 fetch 1 ,mem_device_flag -028e 6808c703 fetcht 1 ,mem_24g_device_number -028f 98467c00 isub temp ,null -0290 2022833b branch p_mouse_start_24g_mode ,zero -0291 1fe0ffff increase -1 ,pdata -0292 1feffe1d mul32 pdata ,29 ,pdata -0293 9a20a200 iadd rega ,rega -0294 ea208000 ifetch 1 ,rega -0295 6000c210 store 1 ,mem_xrecord_mode -0296 c019829c beq rec_3_mode ,p_mouse3_0_check_reconn_target -0297 c01a02a1 beq rec_4_mode ,p_mouse4_0_check_reconn_target -0298 20600000 rtn +028a 204006ec call p_mouse_mode_bt_device_multi_led_on +028b 204006a7 call p_mouse_multi_led_blink_timer +028c 2040029b call p_mouse_tx_power_init +028d 20400463 call p_mouse_select_device_by_button +028e da204721 arg mem_device1_type ,rega +028f 6800c720 fetch 1 ,mem_device_flag +0290 6808c703 fetcht 1 ,mem_24g_device_number +0291 98467c00 isub temp ,null +0292 2022833c branch p_mouse_start_24g_mode ,zero +0293 1fe0ffff increase -1 ,pdata +0294 1feffe1d mul32 pdata ,29 ,pdata +0295 9a20a200 iadd rega ,rega +0296 ea208000 ifetch 1 ,rega +0297 6000c210 store 1 ,mem_xrecord_mode +0298 c019829e beq rec_3_mode ,p_mouse3_0_check_reconn_target +0299 c01a02a2 beq rec_4_mode ,p_mouse4_0_check_reconn_target +029a 20600000 rtn p_mouse_tx_power_init: -0299 6800ccf8 fetch 1 ,mem_tx_power_temp -029a 6000c1de store 1 ,mem_tx_power -029b 20600000 rtn +029b 6800ccf8 fetch 1 ,mem_tx_power_temp +029c 6000c1de store 1 ,mem_tx_power +029d 20600000 rtn p_mouse3_0_check_reconn_target: -029c 204006ec call p_mouse_mode_bt_device_multi_led_on -029d 704b5101 jam 1 ,mem_mouse_bt_reconnect_flag -029e 680341d0 fetch 6 ,mem_hci_plap -029f 203a33eb branch app_bt_start_discovery_short ,blank -02a0 20204274 branch mouse3_0_check_reconn_target + 3 +029e 704b5101 jam 1 ,mem_mouse_bt_reconnect_flag +029f 680341d0 fetch 6 ,mem_hci_plap +02a0 203a33eb branch app_bt_start_discovery_short ,blank +02a1 20204274 branch mouse3_0_check_reconn_target + 3 p_mouse4_0_check_reconn_target: -02a1 7011c523 jam zcode_23 ,mem_zcode_temp_param0 -02a2 20200766 branch p_zcode_entrance +02a2 7011c523 jam zcode_23 ,mem_zcode_temp_param0 +02a3 20200766 branch p_zcode_entrance p_le_check_adv_flag: -02a3 da204370 arg mem_le_adv_data ,rega +02a4 da204370 arg mem_le_adv_data ,rega p_le_check_adv_flag_loop: -02a4 ea208000 ifetch 1 ,rega -02a5 207a0000 rtn blank -02a6 98c0a200 iadd contr ,rega -02a7 e8c08000 ifetch 1 ,contr -02a8 c1008000 rtneq 0x01 -02a9 202002a4 branch p_le_check_adv_flag_loop +02a5 ea208000 ifetch 1 ,rega +02a6 207a0000 rtn blank +02a7 98c0a200 iadd contr ,rega +02a8 e8c08000 ifetch 1 ,contr +02a9 c1008000 rtneq 0x01 +02aa 202002a5 branch p_le_check_adv_flag_loop p_mouse_le_fast_conn_disable: -02aa 704bb15a jam 0x5a ,mem_mouse_fast_conn_flag -02ab 20600000 rtn +02ab 704bb15a jam 0x5a ,mem_mouse_fast_conn_flag +02ac 20600000 rtn p_mouse_fast_conn_init: -02ac 704bb1ff jam 0xff ,mem_mouse_fast_conn_flag -02ad 70421034 jam 0x34 ,mem_xrecord_mode -02ae 68034d86 fetch 6 ,mem_24g_allpowerful_addr -02af 600344a0 store 6 ,mem_le_lap -02b0 20600000 rtn +02ad 704bb1ff jam 0xff ,mem_mouse_fast_conn_flag +02ae 70421034 jam 0x34 ,mem_xrecord_mode +02af 68034d86 fetch 6 ,mem_24g_allpowerful_addr +02b0 600344a0 store 6 ,mem_le_lap +02b1 20600000 rtn p_mouse_24g_pairing_button: -02b1 204006f1 call p_mouse_discovery_multi_led_blink -02b2 7011c562 jam zcode_62 ,mem_zcode_temp_param0 -02b3 20200766 branch p_zcode_entrance +02b2 204006f1 call p_mouse_discovery_multi_led_blink +02b3 7011c562 jam zcode_62 ,mem_zcode_temp_param0 +02b4 20200766 branch p_zcode_entrance p_mouse_spi_init: -02b4 70421276 jam 0x76 ,mem_spi_init_clk -02b5 20203d36 branch mouse_spi_init +02b5 70421276 jam 0x76 ,mem_spi_init_clk +02b6 20203d36 branch mouse_spi_init p_mouse_init_sunt: -02b6 204002b4 call p_mouse_spi_init -02b7 204040c0 call mouse_spi_sdio_gpio_pollup +02b7 204002b5 call p_mouse_spi_init +02b8 204040c0 call mouse_spi_sdio_gpio_pollup p_mouse_init_sensor: -02b8 204040d9 call mouse_read_sensor_id -02b9 c01802c4 beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge -02ba c01882d6 beq p3065_id1 ,p_mouse_p3065_init_param -02bb 204040d1 call mouse_twspi_reset -02bc 200003e8 nop 1000 -02bd 202002b8 branch p_mouse_init_sensor +02b9 204040d9 call mouse_read_sensor_id +02ba c01802c5 beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge +02bb c01882d7 beq p3065_id1 ,p_mouse_p3065_init_param +02bc 204040d1 call mouse_twspi_reset +02bd 200003e8 nop 1000 +02be 202002b9 branch p_mouse_init_sensor p_mouse_clear_sensor_data: -02be 70479e01 jam 1 ,mem_mouse_clear_sensor_data_flag -02bf 20405814 call le_set_config_more_data +02bf 70479e01 jam 1 ,mem_mouse_clear_sensor_data_flag +02c0 20405814 call le_set_config_more_data p_mouse_init_sensor_reset: -02c0 704b0001 jam 1 ,mem_mouse_init_sensor_reset_flag -02c1 2040640f call spi_ncs_enable -02c2 204002b6 call p_mouse_init_sunt -02c3 20206411 branch spi_ncs_disable +02c1 704b0001 jam 1 ,mem_mouse_init_sensor_reset_flag +02c2 2040640f call spi_ncs_enable +02c3 204002b7 call p_mouse_init_sunt +02c4 20206411 branch spi_ncs_disable p_mouse_init_p32xx_id2_judge: -02c4 204004c4 call p_mouse_sensor_poweron -02c5 6800c6de fetch 1 ,mem_sensor_id2 -02c6 c02d02c8 beq p_mx8650 ,p_mouse_mx8650_init_param -02c7 202040e1 branch mouse_init_p32xx_id2_judge + 1 +02c5 204004c4 call p_mouse_sensor_poweron +02c6 6800c6de fetch 1 ,mem_sensor_id2 +02c7 c02d02c9 beq p_mx8650 ,p_mouse_mx8650_init_param +02c8 202040e1 branch mouse_init_p32xx_id2_judge + 1 p_mouse_mx8650_init_param: -02c8 7046e007 jam mx8650 ,mem_config_sensor_type -02c9 58008006 setarg 0x8006 -02ca 20406413 call twspi_write -02cb 20407ec1 call delay_10ms -02cc da604b6e arg mem_sensor_8650_init ,regc -02cd 204002cf call p_sensor_wr_seq -02ce 202004c8 branch p_mouse_dpi_config +02c9 7046e007 jam mx8650 ,mem_config_sensor_type +02ca 58008006 setarg 0x8006 +02cb 20406413 call twspi_write +02cc 20407ec1 call delay_10ms +02cd da604b6e arg mem_sensor_8650_init ,regc +02ce 204002d0 call p_sensor_wr_seq +02cf 202004c8 branch p_mouse_dpi_config p_sensor_wr_seq: -02cf ea610000 ifetch 2 ,regc -02d0 d840ffff arg 0xffff ,temp -02d1 98467c00 isub temp ,null -02d2 20628000 rtn zero -02d3 20406413 call twspi_write -02d4 1a60a602 increase 2 ,regc -02d5 202002cf branch p_sensor_wr_seq +02d0 ea610000 ifetch 2 ,regc +02d1 d840ffff arg 0xffff ,temp +02d2 98467c00 isub temp ,null +02d3 20628000 rtn zero +02d4 20406413 call twspi_write +02d5 1a60a602 increase 2 ,regc +02d6 202002d0 branch p_sensor_wr_seq p_mouse_p3065_init_param: -02d6 204004c4 call p_mouse_sensor_poweron -02d7 6800c6de fetch 1 ,mem_sensor_id2 -02d8 c0004139 beq p3205_tjnt_id2 ,mouse_3205_3t_init_param -02d9 202040ea branch mouse_p3065_init_param +02d7 204004c4 call p_mouse_sensor_poweron +02d8 6800c6de fetch 1 ,mem_sensor_id2 +02d9 c0004139 beq p3205_tjnt_id2 ,mouse_3205_3t_init_param +02da 202040ea branch mouse_p3065_init_param p_mouse_setting_config: -02da 7011c580 jam zcode_80 ,mem_zcode_temp_param0 -02db 20200766 branch p_zcode_entrance +02db 7011c580 jam zcode_80 ,mem_zcode_temp_param0 +02dc 20200766 branch p_zcode_entrance p_spid_init_flash: -02dc 70808640 jam 0x40 ,core_spid_ctrl -02dd 70808700 jam 0x0 ,core_spid_delay -02de 68108081 hfetch 1 ,core_gpio_sel1 -02df 793ffe00 set0 0 ,pdata -02e0 793ffe01 set0 1 ,pdata -02e1 79207e03 set1 3 ,pdata -02e2 793ffe04 set0 4 ,pdata -02e3 60108081 hstore 1 ,core_gpio_sel1 -02e4 58000000 setarg 0 -02e5 600201f5 store 4 ,mem_spid_tbuf -02e6 20600000 rtn +02dd 70808640 jam 0x40 ,core_spid_ctrl +02de 70808700 jam 0x0 ,core_spid_delay +02df 68108081 hfetch 1 ,core_gpio_sel1 +02e0 793ffe00 set0 0 ,pdata +02e1 793ffe01 set0 1 ,pdata +02e2 79207e03 set1 3 ,pdata +02e3 793ffe04 set0 4 ,pdata +02e4 60108081 hstore 1 ,core_gpio_sel1 +02e5 58000000 setarg 0 +02e6 600201f5 store 4 ,mem_spid_tbuf +02e7 20600000 rtn p_mouse_load_flash_info_check: -02e7 20400332 call p_flash_release_deep_power_down -02e8 20404423 call mouse_load_flash_flag -02e9 68014778 fetch 2 ,mem_store_flag -02ea d840aa55 arg eeprom_init_flag ,temp -02eb 98467c00 isub temp ,null -02ec 20228324 branch p_mouse_load_flash_device_info ,zero -02ed 60094778 storet 2 ,mem_store_flag -02ee 2040441c call mouse_ble_init_address -02ef 6800c6e1 fetch 1 ,mem_config_sensor_motion -02f0 6000c77a store 1 ,mem_mouse_dpi -02f1 68024b4d fetch 4 ,mem_mouse_24g_addr_init -02f2 6002477b store 4 ,mem_mouse_24g_addr -02f3 60024c69 store 4 ,mem_24g_addr +02e8 20400333 call p_flash_release_deep_power_down +02e9 20404423 call mouse_load_flash_flag +02ea 68014778 fetch 2 ,mem_store_flag +02eb d840aa55 arg eeprom_init_flag ,temp +02ec 98467c00 isub temp ,null +02ed 20228325 branch p_mouse_load_flash_device_info ,zero +02ee 60094778 storet 2 ,mem_store_flag +02ef 2040441c call mouse_ble_init_address +02f0 6800c6e1 fetch 1 ,mem_config_sensor_motion +02f1 6000c77a store 1 ,mem_mouse_dpi +02f2 68024b4d fetch 4 ,mem_mouse_24g_addr_init +02f3 6002477b store 4 ,mem_mouse_24g_addr +02f4 60024c69 store 4 ,mem_24g_addr p_mouse_store_flash_device_info: -02f4 20400332 call p_flash_release_deep_power_down -02f5 20400303 call p_flash_erase_sector -02f6 2040031b call p_mouse_information_flash_parameters -02f7 20400307 call p_spid_write_flash -02f8 20400312 call p_wait_flash_done +02f5 20400333 call p_flash_release_deep_power_down +02f6 20400304 call p_flash_erase_sector +02f7 2040031c call p_mouse_information_flash_parameters +02f8 20400308 call p_spid_write_flash +02f9 20400313 call p_wait_flash_done p_mouse_store_random_addr_increase_count: -02f9 204002dc call p_spid_init_flash -02fa d8400002 arg 2 ,temp -02fb da2047c4 arg mem_random_addr_increase_count ,rega -02fc da40005f arg mouse_random_addr_count_eeprom_offset ,regb -02fd 6801c700 fetch 3 ,mem_flash_base -02fe 9a40fe00 iadd regb ,pdata -02ff 20400307 call p_spid_write_flash -0300 20400312 call p_wait_flash_done -0301 2040032a call p_flash_deep_power_down -0302 202002b4 branch p_mouse_spi_init +02fa 204002dd call p_spid_init_flash +02fb d8400002 arg 2 ,temp +02fc da2047c4 arg mem_random_addr_increase_count ,rega +02fd da40005f arg mouse_random_addr_count_eeprom_offset ,regb +02fe 6801c700 fetch 3 ,mem_flash_base +02ff 9a40fe00 iadd regb ,pdata +0300 20400308 call p_spid_write_flash +0301 20400313 call p_wait_flash_done +0302 2040032b call p_flash_deep_power_down +0303 202002b5 branch p_mouse_spi_init p_flash_erase_sector: -0303 6801c700 fetch 3 ,mem_flash_base -0304 6001c232 store 3 ,mem_spi_write_addr -0305 2040652a call flash_erase_sector + 2 -0306 20200312 branch p_wait_flash_done +0304 6801c700 fetch 3 ,mem_flash_base +0305 6001c232 store 3 ,mem_spi_write_addr +0306 2040652a call flash_erase_sector + 2 +0307 20200313 branch p_wait_flash_done p_spid_write_flash: -0307 1fe22600 copy pdata ,regc -0308 1a227e00 copy rega ,pdata -0309 1fe0fffc increase -4 ,pdata -030a 1fe22400 copy pdata ,regb -030b ea420000 ifetch 4 ,regb -030c 60024b48 store 4 ,mem_write_flash_head_temp -030d 1a627e00 copy regc ,pdata -030e 20406552 call spid_write_flash -030f 68024b48 fetch 4 ,mem_write_flash_head_temp -0310 e2420000 istore 4 ,regb -0311 20600000 rtn +0308 1fe22600 copy pdata ,regc +0309 1a227e00 copy rega ,pdata +030a 1fe0fffc increase -4 ,pdata +030b 1fe22400 copy pdata ,regb +030c ea420000 ifetch 4 ,regb +030d 60024b48 store 4 ,mem_write_flash_head_temp +030e 1a627e00 copy regc ,pdata +030f 20406552 call spid_write_flash +0310 68024b48 fetch 4 ,mem_write_flash_head_temp +0311 e2420000 istore 4 ,regb +0312 20600000 rtn p_wait_flash_done: -0312 580186a0 setarg 100000 -0313 20402a8f call sleep -0314 2040650b call spid_unlock_flash -0315 580001fa setarg mem_spid_rbuf -0316 6011008c hstore 2 ,core_spid_rxaddr -0317 58000005 setarg flash_read_satus -0318 204064f3 call spid_read_reg -0319 c2800312 bbit1 flash_status_wip ,p_wait_flash_done -031a 20600000 rtn +0313 580186a0 setarg 100000 +0314 20402a8f call sleep +0315 2040650b call spid_unlock_flash +0316 580001fa setarg mem_spid_rbuf +0317 6011008c hstore 2 ,core_spid_rxaddr +0318 58000005 setarg flash_read_satus +0319 204064f3 call spid_read_reg +031a c2800313 bbit1 flash_status_wip ,p_wait_flash_done +031b 20600000 rtn p_mouse_information_flash_parameters: -031b 5800477f setarg mem_mouse_information_end -031c d8404720 arg mem_mouse_information_start ,temp -031d 98460400 isub temp ,temp -031e 6801c700 fetch 3 ,mem_flash_base -031f da204720 arg mem_mouse_information_start ,rega -0320 20600000 rtn +031c 5800477f setarg mem_mouse_information_end +031d d8404720 arg mem_mouse_information_start ,temp +031e 98460400 isub temp ,temp +031f 6801c700 fetch 3 ,mem_flash_base +0320 da204720 arg mem_mouse_information_start ,rega +0321 20600000 rtn p_mouse_read_flash: -0321 20400332 call p_flash_release_deep_power_down -0322 2040031b call p_mouse_information_flash_parameters -0323 20206562 branch spid_read_flash +0322 20400333 call p_flash_release_deep_power_down +0323 2040031c call p_mouse_information_flash_parameters +0324 20206562 branch spid_read_flash p_mouse_load_flash_device_info: -0324 20400321 call p_mouse_read_flash -0325 20400334 call p_mouse_load_random_addr_increase_count -0326 2040431a call mouse_select_reconn_device -0327 6802477b fetch 4 ,mem_mouse_24g_addr -0328 60024c69 store 4 ,mem_24g_addr -0329 20600000 rtn +0325 20400322 call p_mouse_read_flash +0326 20400335 call p_mouse_load_random_addr_increase_count +0327 2040431a call mouse_select_reconn_device +0328 6802477b fetch 4 ,mem_mouse_24g_addr +0329 60024c69 store 4 ,mem_24g_addr +032a 20600000 rtn p_flash_deep_power_down: -032a 700aa2b9 jam flash_command_deep_power_down ,mem_temp +032b 700aa2b9 jam flash_command_deep_power_down ,mem_temp p_spid_write_flash_cmd: -032b 204002dc call p_spid_init_flash -032c 204069ac call delay_nop100 -032d 2040650b call spid_unlock_flash -032e da204b48 arg mem_write_flash_head_temp ,rega -032f 68088aa2 fetcht 1 ,mem_temp -0330 20406556 call spid_write_flash_common -0331 202069ac branch delay_nop100 +032c 204002dd call p_spid_init_flash +032d 204069ac call delay_nop100 +032e 2040650b call spid_unlock_flash +032f da204b48 arg mem_write_flash_head_temp ,rega +0330 68088aa2 fetcht 1 ,mem_temp +0331 20406556 call spid_write_flash_common +0332 202069ac branch delay_nop100 p_flash_release_deep_power_down: -0332 700aa2ab jam flash_command_release_deep_power_down ,mem_temp -0333 2020032b branch p_spid_write_flash_cmd +0333 700aa2ab jam flash_command_release_deep_power_down ,mem_temp +0334 2020032c branch p_spid_write_flash_cmd p_mouse_load_random_addr_increase_count: -0334 20400332 call p_flash_release_deep_power_down -0335 d8400002 arg 2 ,temp -0336 da2047c4 arg mem_random_addr_increase_count ,rega -0337 da40005f arg mouse_random_addr_count_eeprom_offset ,regb -0338 6801c700 fetch 3 ,mem_flash_base -0339 9a40fe00 iadd regb ,pdata -033a 20206562 branch spid_read_flash +0335 20400333 call p_flash_release_deep_power_down +0336 d8400002 arg 2 ,temp +0337 da2047c4 arg mem_random_addr_increase_count ,rega +0338 da40005f arg mouse_random_addr_count_eeprom_offset ,regb +0339 6801c700 fetch 3 ,mem_flash_base +033a 9a40fe00 iadd regb ,pdata +033b 20206562 branch spid_read_flash p_mouse_start_24g_mode: -033b 204006ec call p_mouse_mode_24g_device_multi_led_on 033c 6800c241 fetch 1 ,mem_power_on_flag 033d c28101c5 bbit1 2 ,p_g24_start_24g_mode @@ -1189,7 +1189,7 @@ p_mouse_le_next: 0378 6800c79e fetch 1 ,mem_mouse_clear_sensor_data_flag -0379 205a02be call p_mouse_clear_sensor_data ,blank +0379 205a02bf call p_mouse_clear_sensor_data ,blank 037a 680246d3 fetch mouse_flag_len ,mem_mouse_flag 037b c282c179 bbit1 mouse_bt_discovery_button_down_flag ,mouse_le_send_empty_packet 037c 20403f97 call mouse_motion @@ -1246,7 +1246,7 @@ 03a1 20405271 call l2cap_malloc_is_fifo_nearly_full 03a2 247a0000 nrtn blank 03a3 6800c79e fetch 1 ,mem_mouse_clear_sensor_data_flag -03a4 205a02be call p_mouse_clear_sensor_data ,blank +03a4 205a02bf call p_mouse_clear_sensor_data ,blank 03a5 680246d3 fetch mouse_flag_len ,mem_mouse_flag 03a6 c282bf8a bbit1 mouse_bt_discovery_button_down_flag ,mouse_send_empty_data 03a7 c284bf8a bbit1 mouse_bt_discovery_button_long_down_flag ,mouse_send_empty_data @@ -1328,7 +1328,7 @@ 03e7 2020417d branch mouse_priority_bb_event + 1 p_mouse_le_bb_event_connected: -03e8 204002c0 call p_mouse_init_sensor_reset +03e8 204002c1 call p_mouse_init_sensor_reset 03e9 20403410 call app_ble_store_reconn_info 03ea 704b6a01 jam 1 ,mem_mouse_le_bb_connected_flag 03eb 6800c7a1 fetch 1 ,mem_mouse_le_reconnect_flag @@ -1374,7 +1374,7 @@ p_mouse_bb_event_connected: 03ff 70480b00 jam 0 ,mem_mouse_send_switch_req_timer -0400 204002c0 call p_mouse_init_sensor_reset +0400 204002c1 call p_mouse_init_sensor_reset 0401 202042ca branch mouse_stop_discovery p_mouse_bb_event_disconnected: @@ -1388,7 +1388,7 @@ p_mouse_24g_pairing_complete: 0407 204006f8 call p_mouse_discovey_led_blink_off -0408 204002c0 call p_mouse_init_sensor_reset +0408 204002c1 call p_mouse_init_sensor_reset 0409 7011c592 jam zcode_92 ,mem_zcode_temp_param0 040a 20200766 branch p_zcode_entrance @@ -1402,7 +1402,7 @@ p_mouse_24g_attempt_success: 0410 204006f8 call p_mouse_discovey_led_blink_off 0411 2040034a call p_g24_pair_timeout_clear -0412 204002c0 call p_mouse_init_sensor_reset +0412 204002c1 call p_mouse_init_sensor_reset p_mouse_24g_no_data_timer_init: 0413 20203f8d branch mouse_no_data_timer_init @@ -1419,7 +1419,7 @@ p_mouse_sensor_powerdown: 041a 20600000 rtn -041b 204002b6 call p_mouse_init_sunt +041b 204002b7 call p_mouse_init_sunt 041c 58000806 setarg 0x0806 041d 20206413 branch twspi_write @@ -1513,7 +1513,7 @@ 0456 6808c720 fetcht 1 ,mem_device_flag 0457 6800c703 fetch 1 ,mem_24g_device_number 0458 98467c00 isub temp ,null -0459 202282b1 branch p_mouse_24g_pairing_button ,zero +0459 202282b2 branch p_mouse_24g_pairing_button ,zero 045a 68014682 fetch 2 ,mem_ui_state_map 045b 2feffe0b isolate1 ui_state_ble_adv ,pdata 045c 2040c2d4 call mouse_stop_le_adv ,true @@ -1560,7 +1560,7 @@ 047b 244143cc ncall mouse_select_device_count_clean ,positive 047c 6008c720 storet 1 ,mem_device_flag 047d 7041bd00 jam 0 ,mem_link_key_exists -047e 204002f4 call p_mouse_store_flash_device_info +047e 204002f5 call p_mouse_store_flash_device_info 047f 680246d3 fetch mouse_flag_len ,mem_mouse_flag 0480 c1048000 rtneq mouse_bt_discovery_button_long_down_flag 0481 2020437e branch mouse_set_reconnection @@ -1650,7 +1650,7 @@ 04c3 20600000 rtn p_mouse_sensor_poweron: -04c4 204002b4 call p_mouse_spi_init +04c4 204002b5 call p_mouse_spi_init 04c5 58008006 setarg 0x8006 04c6 20406413 call twspi_write 04c7 20002ee0 nop 12000 @@ -1819,7 +1819,7 @@ 052e 58000000 setarg 0 052f 600146ac store 2 ,mem_mouse_discovery_timer 0530 6000c714 store 1 ,mem_mouse_blink_count -0531 204002c0 call p_mouse_init_sensor_reset +0531 204002c1 call p_mouse_init_sensor_reset 0532 202042cb branch mouse_stop_discovery + 1 p_le_slave_match: @@ -2342,7 +2342,7 @@ p_mouse_unplug_clean_bdaddr: 06a5 204042fb call mouse_before_store_reconn_info -06a6 202002f4 branch p_mouse_store_flash_device_info +06a6 202002f5 branch p_mouse_store_flash_device_info p_mouse_multi_led_blink_timer: 06a7 6800cb27 fetch 1 ,mem_mouse_multi_led_blink_enable @@ -2637,7 +2637,7 @@ 0772 9840fe00 iadd temp ,pdata 0773 1fe0fffb increase -5 ,pdata 0774 6001cb5d store 3 ,mem_flash_address -0775 20400332 call p_flash_release_deep_power_down +0775 20400333 call p_flash_release_deep_power_down p_zcode_read_loop: 0776 6801cb5d fetch 3 ,mem_flash_address @@ -2648,7 +2648,7 @@ 077b 680a4b60 fetcht 4 ,mem_zcode_head 077c 98467c00 isub temp ,null 077d 24228776 nbranch p_zcode_read_loop ,zero -077e 204002b4 call p_mouse_spi_init +077e 204002b5 call p_mouse_spi_init 077f 58001f00 setarg mem_zcode_buff 0780 60014199 store 2 ,mem_patch_ptr 0781 70419b40 jam zcode_code_size ,mem_patch_len @@ -35524,83 +35524,82 @@ org 0x30001 z_entrance2: -30001 c0100016 beq zcode_20 ,z_send_lmp_escape -30002 c010802a beq zcode_21 ,z_send_lmp_accepted -30003 c0110023 beq zcode_22 ,z_send_lmp_detach +30001 c0100015 beq zcode_20 ,z_send_lmp_escape +30002 c0108029 beq zcode_21 ,z_send_lmp_accepted +30003 c0110022 beq zcode_22 ,z_send_lmp_detach 30004 c0118006 beq zcode_23 ,z_mouse4_0_check_reconn_target 30005 20600000 rtn z_mouse4_0_check_reconn_target: 30006 704b6c01 jam 1 ,mem_le_send_security_request_flag -30007 204006ec call p_mouse_mode_bt_device_multi_led_on -30008 7047a101 jam 1 ,mem_mouse_le_reconnect_flag -30009 680146a8 fetch 2 ,mem_mouse_direct_timeout -3000a 6808cbb1 fetcht 1 ,mem_mouse_fast_conn_flag -3000b 18467cff sub temp ,0xff ,null -3000c 2422800e nbranch z_mouse4_0_check_reconn_target_next ,zero -3000d 58000258 setarg 0x0258 +30007 7047a101 jam 1 ,mem_mouse_le_reconnect_flag +30008 680146a8 fetch 2 ,mem_mouse_direct_timeout +30009 6808cbb1 fetcht 1 ,mem_mouse_fast_conn_flag +3000a 18467cff sub temp ,0xff ,null +3000b 2422800d nbranch z_mouse4_0_check_reconn_target_next ,zero +3000c 58000258 setarg 0x0258 z_mouse4_0_check_reconn_target_next: -3000e 600146ae store 2 ,mem_mouse_direct_timer -3000f 20403418 call app_lpm_mult_disable -30010 204002a3 call p_le_check_adv_flag -30011 58000004 setarg adv_flag_bredr_not_supported -30012 e0c08000 istore 1 ,contr -30013 d8c04390 arg mem_le_scan_data ,contr -30014 20400529 call p_le_adv_data_update -30015 20207df4 branch check_51cmd_adv +3000d 600146ae store 2 ,mem_mouse_direct_timer +3000e 20403418 call app_lpm_mult_disable +3000f 204002a4 call p_le_check_adv_flag +30010 58000004 setarg adv_flag_bredr_not_supported +30011 e0c08000 istore 1 ,contr +30012 d8c04390 arg mem_le_scan_data ,contr +30013 20400529 call p_le_adv_data_update +30014 20207df4 branch check_51cmd_adv z_send_lmp_escape: -30016 68008048 fetch 1 ,mem_lmp_to_send -30017 c042001a beq lmp_ext_features_res ,z_send_lmpext_features_res -30018 c041801d beq lmp_ext_features_req ,z_send_lmpext_features_req -30019 2020603f branch send_lmp_escape +30015 68008048 fetch 1 ,mem_lmp_to_send +30016 c0420019 beq lmp_ext_features_res ,z_send_lmpext_features_res +30017 c041801c beq lmp_ext_features_req ,z_send_lmpext_features_req +30018 2020603f branch send_lmp_escape z_send_lmpext_features_res: -3001a 20400020 call z_check_ssp_enable -3001b 68008048 fetch 1 ,mem_lmp_to_send -3001c 20206099 branch send_lmpext_features_res +30019 2040001f call z_check_ssp_enable +3001a 68008048 fetch 1 ,mem_lmp_to_send +3001b 20206099 branch send_lmpext_features_res z_send_lmpext_features_req: -3001d 20400020 call z_check_ssp_enable -3001e 68008048 fetch 1 ,mem_lmp_to_send -3001f 2020610d branch send_lmpext_features_req +3001c 2040001f call z_check_ssp_enable +3001d 68008048 fetch 1 ,mem_lmp_to_send +3001e 2020610d branch send_lmpext_features_req z_check_ssp_enable: -30020 6800c65a fetch 1 ,mem_ssp_enable -30021 203a612b branch ssp_disable ,blank -30022 20206124 branch ssp_enable +3001f 6800c65a fetch 1 ,mem_ssp_enable +30020 203a612b branch ssp_disable ,blank +30021 20206124 branch ssp_enable z_send_lmp_detach: -30023 20406152 call send_lmp_detach -30024 6800cb51 fetch 1 ,mem_mouse_bt_reconnect_flag -30025 207a0000 rtn blank -30026 6800804b fetch 1 ,mem_op -30027 793ffe03 set0 op_disconn ,pdata -30028 6000804b store 1 ,mem_op -30029 2020041a branch p_mouse_sensor_powerdown +30022 20406152 call send_lmp_detach +30023 6800cb51 fetch 1 ,mem_mouse_bt_reconnect_flag +30024 207a0000 rtn blank +30025 6800804b fetch 1 ,mem_op +30026 793ffe03 set0 op_disconn ,pdata +30027 6000804b store 1 ,mem_op +30028 2020041a branch p_mouse_sensor_powerdown z_send_lmp_accepted: -3002a 18007e02 force 2 ,pdata -3002b 20406298 call msg_send_lmp -3002c 68008049 fetch 1 ,mem_lmi_opcode -3002d e0a08000 istore 1 ,contw -3002e 6000cafe store 1 ,mem_lmi_opcode_temp -3002f 204062a7 call send_lmp_follow -30030 6800cafe fetch 1 ,mem_lmi_opcode_temp -30031 c0170033 beq lmp_max_slot_req ,z_send_lmp_accepted_max_slot_req -30032 20206051 branch send_lmp_accepted + 7 +30029 18007e02 force 2 ,pdata +3002a 20406298 call msg_send_lmp +3002b 68008049 fetch 1 ,mem_lmi_opcode +3002c e0a08000 istore 1 ,contw +3002d 6000cafe store 1 ,mem_lmi_opcode_temp +3002e 204062a7 call send_lmp_follow +3002f 6800cafe fetch 1 ,mem_lmi_opcode_temp +30030 c0170032 beq lmp_max_slot_req ,z_send_lmp_accepted_max_slot_req +30031 20206051 branch send_lmp_accepted + 7 z_send_lmp_accepted_max_slot_req: -30033 6800cb01 fetch 1 ,mem_bt_rcvd_switch_req_accept -30034 207a0000 rtn blank -30035 704b0100 jam 0 ,mem_bt_rcvd_switch_req_accept -30036 6800cb03 fetch 1 ,mem_bt_send_lmp_setup_complete -30037 c1810000 rtnne 2 -30038 704b0201 jam 1 ,mem_bt_send_max_slot_req_accept_after_switch -30039 1c427e00 copy clkn_bt ,pdata -3003a 600204e9 store 4 ,mem_aurand_send_delay_time -3003b 20600000 rtn +30032 6800cb01 fetch 1 ,mem_bt_rcvd_switch_req_accept +30033 207a0000 rtn blank +30034 704b0100 jam 0 ,mem_bt_rcvd_switch_req_accept +30035 6800cb03 fetch 1 ,mem_bt_send_lmp_setup_complete +30036 c1810000 rtnne 2 +30037 704b0201 jam 1 ,mem_bt_send_max_slot_req_accept_after_switch +30038 1c427e00 copy clkn_bt ,pdata +30039 600204e9 store 4 ,mem_aurand_send_delay_time +3003a 20600000 rtn org 0x40001 z_entrance3: @@ -35717,23 +35716,23 @@ z_mouse_start_discovery: 60003 704b6c00 jam 0 ,mem_le_send_security_request_flag -60004 20400299 call p_mouse_tx_power_init +60004 2040029b call p_mouse_tx_power_init 60005 70479e00 jam 0 ,mem_mouse_clear_sensor_data_flag 60006 68014682 fetch 2 ,mem_ui_state_map 60007 c2858010 bbit1 ui_state_ble_adv ,z_mouse_start_discovery_norandom -60008 20400334 call p_mouse_load_random_addr_increase_count +60008 20400335 call p_mouse_load_random_addr_increase_count 60009 680947c4 fetcht 2 ,mem_random_addr_increase_count 6000a 18408401 increase 1 ,temp 6000b 600947c4 storet 2 ,mem_random_addr_increase_count 6000c 600944a1 storet 2 ,mem_le_lap + 1 -6000d 204002f9 call p_mouse_store_random_addr_increase_count +6000d 204002fa call p_mouse_store_random_addr_increase_count 6000e 180a7e00 random pdata 6000f 6000c4a0 store 1 ,mem_le_lap z_mouse_start_discovery_norandom: 60010 6801cbae fetch 3 ,mem_le_lap_high_3b 60011 6001c4a3 store 3 ,mem_le_lap + 3 -60012 204002aa call p_mouse_le_fast_conn_disable +60012 204002ab call p_mouse_le_fast_conn_disable 60013 20403418 call app_lpm_mult_disable 60014 68014687 fetch 2 ,mem_discovery_timeout 60015 600146ac store 2 ,mem_mouse_discovery_timer @@ -35756,7 +35755,7 @@ z_check_51cmd_adv: 60026 7047a100 jam 0 ,mem_mouse_le_reconnect_flag -60027 204002a3 call p_le_check_adv_flag +60027 204002a4 call p_le_check_adv_flag 60028 58000005 setarg adv_flag_bredr_not_supported | adv_flag_limited_discoverable 60029 e0c08000 istore 1 ,contr 6002a d8c04b12 arg mem_le_adv_swift_pair ,contr @@ -35859,7 +35858,7 @@ 8001d 704bb1ff jam 0xff ,mem_mouse_fast_conn_flag 8001e 204042fb call mouse_before_store_reconn_info 8001f 704721ff jam 0xff ,mem_device1_type -80020 202002f4 branch p_mouse_store_flash_device_info +80020 202002f5 branch p_mouse_store_flash_device_info org 0x90001 z_entrance8: @@ -35893,16 +35892,16 @@ 90016 2040582c call le_set_fixed_ltk 90017 20405818 call le_set_config_read_authentication 90018 20400525 call p_le_addr_random_config -90019 204002e7 call p_mouse_load_flash_info_check +90019 204002e8 call p_mouse_load_flash_info_check 9001a df200003 arg 3 ,loopcnt 9001b d8c0473f arg mem_device2_addr ,contr 9001c 20400350 call p_pdata_0xff_check -9001d 243402aa nbranch p_mouse_le_fast_conn_disable ,user +9001d 243402ab nbranch p_mouse_le_fast_conn_disable ,user 9001e df200003 arg 3 ,loopcnt 9001f d8c0475c arg mem_device3_addr ,contr 90020 20400350 call p_pdata_0xff_check -90021 243402aa nbranch p_mouse_le_fast_conn_disable ,user -90022 204002ac call p_mouse_fast_conn_init +90021 243402ab nbranch p_mouse_le_fast_conn_disable ,user +90022 204002ad call p_mouse_fast_conn_init 90023 20600000 rtn z_mouse_bt_sdp_update: @@ -36014,10 +36013,10 @@ a0036 7046a700 jam 0 ,mem_mouse_move_flag a0037 2040034a call p_g24_pair_timeout_clear a0038 2040405d call mouse_read_sensor_common -a0039 20400299 call p_mouse_tx_power_init +a0039 2040029b call p_mouse_tx_power_init a003a 68024c69 fetch 4 ,mem_24g_addr a003b 6002477b store 4 ,mem_mouse_24g_addr -a003c 202002f4 branch p_mouse_store_flash_device_info +a003c 202002f5 branch p_mouse_store_flash_device_info org 0xb0001 z_entrancea: @@ -36030,7 +36029,7 @@ z_mouse_24g_attempt_fail: b0007 704d8100 jam g24_tx_timer_int_disable ,mem_24g_transmit_by_interrupt -b0008 20400299 call p_mouse_tx_power_init +b0008 2040029b call p_mouse_tx_power_init b0009 204001c9 call p_g24_check_51cmd_stop_24g b000a 7041bd00 jam 0 ,mem_link_key_exists b000b 20400269 call p_mouse_setgpio_hibernate @@ -36070,7 +36069,7 @@ b0025 70479e00 jam 0 ,mem_mouse_clear_sensor_data_flag b0026 20400383 call p_mouse_data_init b0027 20405816 call le_clr_config_more_data -b0028 204002f4 call p_mouse_store_flash_device_info +b0028 204002f5 call p_mouse_store_flash_device_info b0029 202041d9 branch mouse_bb_disconnected z_mouse_before_hibernate: @@ -36081,10 +36080,10 @@ b002e 20402c21 call lpm_write_ctrl b002f 204074bd call disable_authrom b0030 204006e0 call p_mouse_multi_led_off -b0031 204002f4 call p_mouse_store_flash_device_info +b0031 204002f5 call p_mouse_store_flash_device_info b0032 20403e9f call mouse_before_hibernate_wheel_gpio_set b0033 20400269 call p_mouse_setgpio_hibernate -b0034 2040032a call p_flash_deep_power_down +b0034 2040032b call p_flash_deep_power_down b0035 68108081 hfetch 1 ,core_gpio_sel1 b0036 1fe17ef7 and pdata ,0xf7 ,pdata b0037 60108081 hstore 1 ,core_gpio_sel1 @@ -36133,7 +36132,7 @@ 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 204002f4 call p_mouse_store_flash_device_info +c001b 204002f5 call p_mouse_store_flash_device_info c001c 202041d9 branch mouse_bb_disconnected org 0xd0001 @@ -36164,7 +36163,7 @@ z_g24_auto_pair_skip_rx_length: d0016 704d9100 jam 0 ,mem_24g_conn_sm -d0017 20400299 call p_mouse_tx_power_init +d0017 2040029b call p_mouse_tx_power_init d0018 68024c69 fetch 4 ,mem_24g_addr d0019 680a4c4d fetcht 4 ,mem_24g_paring_addr d001a 98467c00 isub temp ,null @@ -36194,7 +36193,7 @@ d002c 202001ac branch p_g24_pair_init z_g24_auto_pair_first_attemp: -d002d 20400299 call p_mouse_tx_power_init +d002d 2040029b call p_mouse_tx_power_init d002e 68024c78 fetch 4 ,mem_24g_device_addr d002f 60024c69 store 4 ,mem_24g_addr d0030 6800cd8f fetch 1 ,mem_24g_pair_current_ch_num Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Gan/output/romcode.rom (revision 3822) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Gan/output/romcode.rom (working copy) @@ -24628,35 +24628,34 @@ 18427e00 c00283fb 20204d41 -c0100016 -c010802a -c0110023 +c0100015 +c0108029 +c0110022 c0118006 20600000 704b6c01 -204006ec 7047a101 680146a8 6808cbb1 18467cff -2422800e +2422800d 58000258 600146ae 20403418 -204002a3 +204002a4 58000004 e0c08000 d8c04390 20400529 20207df4 68008048 -c042001a -c041801d +c0420019 +c041801c 2020603f -20400020 +2040001f 68008048 20206099 -20400020 +2040001f 68008048 2020610d 6800c65a @@ -24676,7 +24675,7 @@ 6000cafe 204062a7 6800cafe -c0170033 +c0170032 20206051 6800cb01 207a0000 @@ -24762,21 +24761,21 @@ c0280003 20600000 704b6c00 -20400299 +2040029b 70479e00 68014682 c2858010 -20400334 +20400335 680947c4 18408401 600947c4 600944a1 -204002f9 +204002fa 180a7e00 6000c4a0 6801cbae 6001c4a3 -204002aa +204002ab 20403418 68014687 600146ac @@ -24797,7 +24796,7 @@ 204042c4 202006f1 7047a100 -204002a3 +204002a4 58000005 e0c08000 d8c04b12 @@ -24874,7 +24873,7 @@ 704bb1ff 204042fb 704721ff -202002f4 +202002f5 c040000a c0408004 20600000 @@ -24899,16 +24898,16 @@ 2040582c 20405818 20400525 -204002e7 +204002e8 df200003 d8c0473f 20400350 -243402aa +243402ab df200003 d8c0475c 20400350 -243402aa -204002ac +243402ab +204002ad 20600000 204074b9 d8c08c00 @@ -24993,10 +24992,10 @@ 7046a700 2040034a 2040405d -20400299 +2040029b 68024c69 6002477b -202002f4 +202002f5 c0500007 c050800d c0510020 @@ -25004,7 +25003,7 @@ c052002a 20600000 704d8100 -20400299 +2040029b 204001c9 7041bd00 20400269 @@ -25036,7 +25035,7 @@ 70479e00 20400383 20405816 -204002f4 +204002f5 202041d9 78347c00 68120138 @@ -25045,10 +25044,10 @@ 20402c21 204074bd 204006e0 -204002f4 +204002f5 20403e9f 20400269 -2040032a +2040032b 68108081 1fe17ef7 60108081 @@ -25082,7 +25081,7 @@ 704b0100 704b0300 704b0c00 -204002f4 +204002f5 202041d9 6800cd8c c000add4 @@ -25106,7 +25105,7 @@ 6800cc3f c1840000 704d9100 -20400299 +2040029b 68024c69 680a4c4d 98467c00 @@ -25128,7 +25127,7 @@ c000002d c0010037 202001ac -20400299 +2040029b 68024c78 60024c69 6800cd8f @@ -25146,4 +25145,4 @@ 20400035 6008cd90 20600000 -00006605 +0000ee87 Index: program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Gan/program/patch.prog (revision 3822) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Gan/program/patch.prog (working copy) @@ -1132,6 +1132,8 @@ // beq MOUSE_LR_BUTTON,p_mouse_24g_pairing_button //endif p_mouse_check_reconn_target: + call p_mouse_mode_bt_device_multi_led_on + call p_mouse_multi_led_blink_timer call p_mouse_tx_power_init call p_mouse_select_device_by_button // for fast check button down arg mem_device1_type,rega @@ -1160,7 +1162,7 @@ ifdef CLASSIC_BT p_mouse3_0_check_reconn_target: - call p_mouse_mode_bt_device_multi_led_on +// call p_mouse_mode_bt_device_multi_led_on jam 1,mem_mouse_bt_reconnect_flag fetch 6,mem_hci_plap branch app_bt_start_discovery_short,blank @@ -1391,7 +1393,7 @@ //**************************end*************************************// p_mouse_start_24g_mode: - call p_mouse_mode_24g_device_multi_led_on +// call p_mouse_mode_24g_device_multi_led_on fetch 1,mem_power_on_flag bbit1 2,p_g24_start_24g_mode //hibernate goto reconn p_mouse_start_24g_reconn_check: Index: program/z.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Gan/program/z.prog (revision 3822) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Gan/program/z.prog (working copy) @@ -94,7 +94,7 @@ z_mouse4_0_check_reconn_target: jam 1,mem_le_send_security_request_flag - call p_mouse_mode_bt_device_multi_led_on +// call p_mouse_mode_bt_device_multi_led_on jam 1,mem_mouse_le_reconnect_flag fetch 2,mem_mouse_direct_timeout ifdef BLE_FAST_CONN_ENABLE Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Gan/sched/mouse.dat (revision 3822) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Gan/sched/mouse.dat (working copy) @@ -62,7 +62,7 @@ mem_app_connection_options:06 mem_lap:29 20 19 20 18 10 mem_local_name_length: -'Go mouse3.0 +'Go Mouse3.0 mem_sniff_param_interval: 0e 00 ##mem_sniff_param_interval:0e 00 report 115hz,0c 00 report 125hz 01 00 ##mem_sniff_param_attempt:01 00 @@ -99,17 +99,17 @@ #microsoft swift pair 06 ff 06 00 03 00 80 #name -'\09Go mouse5.0 +'\09Go Mouse5.0 mem_le_scan_data_len:1f mem_le_scan_data: #name -'\09Go mouse5.0 +'\09Go Mouse5.0 #max 20bytes, att list data rom limits mem_le_name_len: -'Go mouse5.0 +'Go Mouse5.0 mem_le_interval_min: @@ -287,7 +287,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 # 240ms dpi B4 B5 check easy -mem_firmware_version:04 00 +mem_firmware_version:05 00 mem_device_flag:01 mem_device1_type:34