Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Li/output/flash.dat (revision 3823) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Li/output/flash.dat (working copy) @@ -47,7 +47,7 @@ 20 40 02 -b1 +b2 20 40 07 @@ -63,7 +63,7 @@ 20 20 02 -d7 +d8 58 00 03 @@ -155,7 +155,7 @@ 20 40 02 -b3 +b4 20 40 04 @@ -2567,7 +2567,7 @@ 20 35 82 -b1 +b2 68 01 c4 @@ -2594,8 +2594,16 @@ 0a 20 40 +06 +ce +20 +40 +06 +9a +20 +40 02 -96 +98 20 40 04 @@ -2619,7 +2627,7 @@ 20 22 83 -38 +39 1f e0 ff @@ -2643,11 +2651,11 @@ c0 19 82 -99 +9b c0 1a 02 -9e +9f 20 60 00 @@ -2664,10 +2672,6 @@ 60 00 00 -20 -40 -06 -ce 70 4b 51 @@ -2719,7 +2723,7 @@ 20 20 02 -a1 +a2 70 4b b1 @@ -2771,7 +2775,7 @@ 20 40 02 -b1 +b2 20 40 40 @@ -2783,11 +2787,11 @@ c0 18 02 -c1 +c2 c0 18 82 -d3 +d4 20 40 40 @@ -2799,7 +2803,7 @@ 20 20 02 -b5 +b6 70 47 9e @@ -2819,7 +2823,7 @@ 20 40 02 -b3 +b4 20 20 64 @@ -2835,7 +2839,7 @@ c0 2d 02 -c5 +c6 20 20 40 @@ -2863,7 +2867,7 @@ 20 40 02 -cc +cd 20 20 04 @@ -2895,7 +2899,7 @@ 20 20 02 -cc +cd 20 40 04 @@ -2967,7 +2971,7 @@ 20 40 03 -2f +30 20 40 44 @@ -2987,7 +2991,7 @@ 20 22 83 -21 +22 60 09 47 @@ -3019,27 +3023,27 @@ 20 40 03 -2f +30 20 40 03 -00 +01 20 40 03 -18 +19 20 40 03 -04 +05 20 40 03 -0f +10 20 40 02 -d9 +da d8 40 00 @@ -3063,19 +3067,19 @@ 20 40 03 -04 +05 20 40 03 -0f +10 20 40 03 -27 +28 20 20 02 -b1 +b2 68 01 c7 @@ -3091,7 +3095,7 @@ 20 20 03 -0f +10 1f e2 26 @@ -3167,7 +3171,7 @@ c2 80 03 -0f +10 20 60 00 @@ -3199,11 +3203,11 @@ 20 40 03 -2f +30 20 40 03 -18 +19 20 20 65 @@ -3211,11 +3215,11 @@ 20 40 03 -1e +1f 20 40 03 -31 +32 20 40 43 @@ -3239,7 +3243,7 @@ 20 40 02 -d9 +da 20 40 69 @@ -3271,11 +3275,11 @@ 20 20 03 -28 +29 20 40 03 -2f +30 d8 40 00 @@ -3300,10 +3304,6 @@ 20 65 62 -20 -40 -06 -ce 68 00 c2 @@ -3551,7 +3551,7 @@ 20 5a 02 -bb +bc 68 02 46 @@ -3723,7 +3723,7 @@ 20 5a 02 -bb +bc 68 02 46 @@ -3995,7 +3995,7 @@ 20 40 02 -bd +be 20 40 34 @@ -4091,7 +4091,7 @@ 20 40 02 -bd +be 20 20 42 @@ -4123,7 +4123,7 @@ 20 40 02 -bd +be 70 11 c5 @@ -4163,7 +4163,7 @@ 20 40 02 -bd +be 20 20 3f @@ -4199,7 +4199,7 @@ 20 40 02 -b3 +b4 58 00 08 @@ -4447,7 +4447,7 @@ 20 22 82 -ae +af 68 01 46 @@ -4595,7 +4595,7 @@ 20 40 02 -f1 +f2 68 02 46 @@ -4835,7 +4835,7 @@ 20 40 02 -b1 +b2 58 00 80 @@ -5271,7 +5271,7 @@ 20 40 02 -bd +be 20 20 42 @@ -6763,7 +6763,7 @@ 20 20 02 -f1 +f2 68 00 cb @@ -7523,7 +7523,7 @@ 20 40 03 -2f +30 68 01 cb @@ -7559,7 +7559,7 @@ 20 40 02 -b1 +b2 58 00 1f @@ -8044,8 +8044,8 @@ 20 07 d5 -e6 -51 +f2 +2a aa 55 08 @@ -8322,14 +8322,14 @@ 47 6f 20 -63 +43 68 61 72 67 65 20 -6d +4d 6f 75 73 @@ -8439,7 +8439,7 @@ 47 6f 20 -63 +43 68 61 72 @@ -8457,7 +8457,7 @@ 47 6f 20 -63 +43 68 61 72 @@ -8473,7 +8473,7 @@ 47 6f 20 -63 +43 68 61 72 @@ -8995,7 +8995,7 @@ 00 b2 4b -04 +05 00 aa 55 @@ -9240,7 +9240,7 @@ 20 40 02 -96 +98 68 02 4c @@ -9328,7 +9328,7 @@ 20 40 02 -96 +98 68 02 4c @@ -9512,7 +9512,7 @@ 20 40 02 -f1 +f2 20 20 41 @@ -9692,7 +9692,7 @@ 20 40 02 -96 +98 20 40 01 @@ -9820,7 +9820,7 @@ 20 40 02 -f1 +f2 20 20 41 @@ -9856,7 +9856,7 @@ 20 40 02 -f1 +f2 20 40 3e @@ -9868,7 +9868,7 @@ 20 40 03 -27 +28 68 10 80 @@ -10144,7 +10144,7 @@ 20 40 02 -96 +98 68 02 4c @@ -10156,7 +10156,7 @@ 20 20 02 -f1 +f2 00 00 00 @@ -10272,7 +10272,7 @@ 20 40 02 -e4 +e5 df 20 00 @@ -10288,7 +10288,7 @@ 24 34 02 -a7 +a8 df 20 00 @@ -10304,11 +10304,11 @@ 24 34 02 -a7 +a8 20 40 02 -a9 +aa 20 60 00 @@ -10556,7 +10556,7 @@ 20 20 02 -f1 +f2 00 00 00 @@ -10956,7 +10956,7 @@ 20 40 02 -96 +98 70 47 9e @@ -10972,7 +10972,7 @@ 20 40 03 -31 +32 68 09 47 @@ -10992,7 +10992,7 @@ 20 40 02 -f6 +f7 18 0a 7e @@ -11012,7 +11012,7 @@ 20 40 02 -a7 +a8 20 40 34 @@ -11096,7 +11096,7 @@ 20 40 02 -a0 +a1 58 00 00 @@ -11712,15 +11712,15 @@ c0 10 00 -16 +15 c0 10 80 -2a +29 c0 11 00 -23 +22 c0 11 80 @@ -11733,10 +11733,6 @@ 4b 6c 01 -20 -40 -06 -ce 70 47 a1 @@ -11756,7 +11752,7 @@ 24 22 80 -0e +0d 58 00 02 @@ -11772,7 +11768,7 @@ 20 40 02 -a0 +a1 58 00 00 @@ -11800,11 +11796,11 @@ c0 42 00 -1a +19 c0 41 80 -1d +1c 20 20 60 @@ -11812,7 +11808,7 @@ 20 40 00 -20 +1f 68 00 80 @@ -11824,7 +11820,7 @@ 20 40 00 -20 +1f 68 00 80 @@ -11904,7 +11900,7 @@ c0 17 00 -33 +32 20 20 60 @@ -11961,6 +11957,10 @@ 00 00 00 +00 +00 +00 +00 20 20 00 @@ -12477,5 +12477,5 @@ 55 00 00 -36 -0c +d2 +a2 Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Li/output/program.lis (revision 3823) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Li/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 204002b1 call p_mouse_spi_init +000a 204002b2 call p_mouse_spi_init 000b 20400772 call p_drawing_optima_init 000c 2040000f call p_mouse_cb_fuction 000d 20400022 call p_mouse_wakeup_from_power -000e 202002d7 branch p_mouse_setting_config +000e 202002d8 branch p_mouse_setting_config p_mouse_cb_fuction: 000f 58000354 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 204002b3 call p_mouse_init_sunt +0025 204002b4 call p_mouse_init_sunt 0026 20400417 call p_mouse_sensor_powerdown p_mouse_wakeup_no_from_power: @@ -842,7 +842,7 @@ 027d 2040296c call initialize_radio 027e 20403416 call app_lpm_mult_enable 027f 204074b9 call enable_authrom -0280 203582b1 branch p_mouse_spi_init ,wake +0280 203582b2 branch p_mouse_spi_init ,wake p_device_wake_from_power: 0281 6801c4a3 fetch 3 ,mem_le_lap + 3 @@ -853,250 +853,250 @@ 0286 c280b40a bbit1 1 ,app_enter_hibernate p_mouse_check_reconn_target: -0287 20400296 call p_mouse_tx_power_init -0288 20400460 call p_mouse_select_device_by_button -0289 da204721 arg mem_device1_type ,rega -028a 6800c720 fetch 1 ,mem_device_flag -028b 6808c703 fetcht 1 ,mem_24g_device_number -028c 98467c00 isub temp ,null -028d 20228338 branch p_mouse_start_24g_mode ,zero -028e 1fe0ffff increase -1 ,pdata -028f 1feffe1d mul32 pdata ,29 ,pdata -0290 9a20a200 iadd rega ,rega -0291 ea208000 ifetch 1 ,rega -0292 6000c210 store 1 ,mem_xrecord_mode -0293 c0198299 beq rec_3_mode ,p_mouse3_0_check_reconn_target -0294 c01a029e beq rec_4_mode ,p_mouse4_0_check_reconn_target -0295 20600000 rtn +0287 204006ce call p_mouse_mode_bt_device_multi_led_on +0288 2040069a call p_mouse_multi_led_blink_timer +0289 20400298 call p_mouse_tx_power_init +028a 20400460 call p_mouse_select_device_by_button +028b da204721 arg mem_device1_type ,rega +028c 6800c720 fetch 1 ,mem_device_flag +028d 6808c703 fetcht 1 ,mem_24g_device_number +028e 98467c00 isub temp ,null +028f 20228339 branch p_mouse_start_24g_mode ,zero +0290 1fe0ffff increase -1 ,pdata +0291 1feffe1d mul32 pdata ,29 ,pdata +0292 9a20a200 iadd rega ,rega +0293 ea208000 ifetch 1 ,rega +0294 6000c210 store 1 ,mem_xrecord_mode +0295 c019829b beq rec_3_mode ,p_mouse3_0_check_reconn_target +0296 c01a029f beq rec_4_mode ,p_mouse4_0_check_reconn_target +0297 20600000 rtn p_mouse_tx_power_init: -0296 6800ccf8 fetch 1 ,mem_tx_power_temp -0297 6000c1de store 1 ,mem_tx_power -0298 20600000 rtn +0298 6800ccf8 fetch 1 ,mem_tx_power_temp +0299 6000c1de store 1 ,mem_tx_power +029a 20600000 rtn p_mouse3_0_check_reconn_target: -0299 204006ce call p_mouse_mode_bt_device_multi_led_on -029a 704b5101 jam 1 ,mem_mouse_bt_reconnect_flag -029b 680341d0 fetch 6 ,mem_hci_plap -029c 203a33eb branch app_bt_start_discovery_short ,blank -029d 20204274 branch mouse3_0_check_reconn_target + 3 +029b 704b5101 jam 1 ,mem_mouse_bt_reconnect_flag +029c 680341d0 fetch 6 ,mem_hci_plap +029d 203a33eb branch app_bt_start_discovery_short ,blank +029e 20204274 branch mouse3_0_check_reconn_target + 3 p_mouse4_0_check_reconn_target: -029e 7011c523 jam zcode_23 ,mem_zcode_temp_param0 -029f 20200748 branch p_zcode_entrance +029f 7011c523 jam zcode_23 ,mem_zcode_temp_param0 +02a0 20200748 branch p_zcode_entrance p_le_check_adv_flag: -02a0 da204370 arg mem_le_adv_data ,rega +02a1 da204370 arg mem_le_adv_data ,rega p_le_check_adv_flag_loop: -02a1 ea208000 ifetch 1 ,rega -02a2 207a0000 rtn blank -02a3 98c0a200 iadd contr ,rega -02a4 e8c08000 ifetch 1 ,contr -02a5 c1008000 rtneq 0x01 -02a6 202002a1 branch p_le_check_adv_flag_loop +02a2 ea208000 ifetch 1 ,rega +02a3 207a0000 rtn blank +02a4 98c0a200 iadd contr ,rega +02a5 e8c08000 ifetch 1 ,contr +02a6 c1008000 rtneq 0x01 +02a7 202002a2 branch p_le_check_adv_flag_loop p_mouse_le_fast_conn_disable: -02a7 704bb15a jam 0x5a ,mem_mouse_fast_conn_flag -02a8 20600000 rtn +02a8 704bb15a jam 0x5a ,mem_mouse_fast_conn_flag +02a9 20600000 rtn p_mouse_fast_conn_init: -02a9 704bb1ff jam 0xff ,mem_mouse_fast_conn_flag -02aa 70421034 jam 0x34 ,mem_xrecord_mode -02ab 68034d86 fetch 6 ,mem_24g_allpowerful_addr -02ac 600344a0 store 6 ,mem_le_lap -02ad 20600000 rtn +02aa 704bb1ff jam 0xff ,mem_mouse_fast_conn_flag +02ab 70421034 jam 0x34 ,mem_xrecord_mode +02ac 68034d86 fetch 6 ,mem_24g_allpowerful_addr +02ad 600344a0 store 6 ,mem_le_lap +02ae 20600000 rtn p_mouse_24g_pairing_button: -02ae 204006d3 call p_mouse_discovery_multi_led_blink -02af 7011c562 jam zcode_62 ,mem_zcode_temp_param0 -02b0 20200748 branch p_zcode_entrance +02af 204006d3 call p_mouse_discovery_multi_led_blink +02b0 7011c562 jam zcode_62 ,mem_zcode_temp_param0 +02b1 20200748 branch p_zcode_entrance p_mouse_spi_init: -02b1 70421276 jam 0x76 ,mem_spi_init_clk -02b2 20203d36 branch mouse_spi_init +02b2 70421276 jam 0x76 ,mem_spi_init_clk +02b3 20203d36 branch mouse_spi_init p_mouse_init_sunt: -02b3 204002b1 call p_mouse_spi_init -02b4 204040c0 call mouse_spi_sdio_gpio_pollup +02b4 204002b2 call p_mouse_spi_init +02b5 204040c0 call mouse_spi_sdio_gpio_pollup p_mouse_init_sensor: -02b5 204040d9 call mouse_read_sensor_id -02b6 c01802c1 beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge -02b7 c01882d3 beq p3065_id1 ,p_mouse_p3065_init_param -02b8 204040d1 call mouse_twspi_reset -02b9 200003e8 nop 1000 -02ba 202002b5 branch p_mouse_init_sensor +02b6 204040d9 call mouse_read_sensor_id +02b7 c01802c2 beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge +02b8 c01882d4 beq p3065_id1 ,p_mouse_p3065_init_param +02b9 204040d1 call mouse_twspi_reset +02ba 200003e8 nop 1000 +02bb 202002b6 branch p_mouse_init_sensor p_mouse_clear_sensor_data: -02bb 70479e01 jam 1 ,mem_mouse_clear_sensor_data_flag -02bc 20405814 call le_set_config_more_data +02bc 70479e01 jam 1 ,mem_mouse_clear_sensor_data_flag +02bd 20405814 call le_set_config_more_data p_mouse_init_sensor_reset: -02bd 704b0001 jam 1 ,mem_mouse_init_sensor_reset_flag -02be 2040640f call spi_ncs_enable -02bf 204002b3 call p_mouse_init_sunt -02c0 20206411 branch spi_ncs_disable +02be 704b0001 jam 1 ,mem_mouse_init_sensor_reset_flag +02bf 2040640f call spi_ncs_enable +02c0 204002b4 call p_mouse_init_sunt +02c1 20206411 branch spi_ncs_disable p_mouse_init_p32xx_id2_judge: -02c1 204004b7 call p_mouse_sensor_poweron -02c2 6800c6de fetch 1 ,mem_sensor_id2 -02c3 c02d02c5 beq p_mx8650 ,p_mouse_mx8650_init_param -02c4 202040e1 branch mouse_init_p32xx_id2_judge + 1 +02c2 204004b7 call p_mouse_sensor_poweron +02c3 6800c6de fetch 1 ,mem_sensor_id2 +02c4 c02d02c6 beq p_mx8650 ,p_mouse_mx8650_init_param +02c5 202040e1 branch mouse_init_p32xx_id2_judge + 1 p_mouse_mx8650_init_param: -02c5 7046e007 jam mx8650 ,mem_config_sensor_type -02c6 58008006 setarg 0x8006 -02c7 20406413 call twspi_write -02c8 20407ec1 call delay_10ms -02c9 da604b6e arg mem_sensor_8650_init ,regc -02ca 204002cc call p_sensor_wr_seq -02cb 202004bb branch p_mouse_dpi_config +02c6 7046e007 jam mx8650 ,mem_config_sensor_type +02c7 58008006 setarg 0x8006 +02c8 20406413 call twspi_write +02c9 20407ec1 call delay_10ms +02ca da604b6e arg mem_sensor_8650_init ,regc +02cb 204002cd call p_sensor_wr_seq +02cc 202004bb branch p_mouse_dpi_config p_sensor_wr_seq: -02cc ea610000 ifetch 2 ,regc -02cd d840ffff arg 0xffff ,temp -02ce 98467c00 isub temp ,null -02cf 20628000 rtn zero -02d0 20406413 call twspi_write -02d1 1a60a602 increase 2 ,regc -02d2 202002cc branch p_sensor_wr_seq +02cd ea610000 ifetch 2 ,regc +02ce d840ffff arg 0xffff ,temp +02cf 98467c00 isub temp ,null +02d0 20628000 rtn zero +02d1 20406413 call twspi_write +02d2 1a60a602 increase 2 ,regc +02d3 202002cd branch p_sensor_wr_seq p_mouse_p3065_init_param: -02d3 204004b7 call p_mouse_sensor_poweron -02d4 6800c6de fetch 1 ,mem_sensor_id2 -02d5 c0004139 beq p3205_tjnt_id2 ,mouse_3205_3t_init_param -02d6 202040ea branch mouse_p3065_init_param +02d4 204004b7 call p_mouse_sensor_poweron +02d5 6800c6de fetch 1 ,mem_sensor_id2 +02d6 c0004139 beq p3205_tjnt_id2 ,mouse_3205_3t_init_param +02d7 202040ea branch mouse_p3065_init_param p_mouse_setting_config: -02d7 7011c580 jam zcode_80 ,mem_zcode_temp_param0 -02d8 20200748 branch p_zcode_entrance +02d8 7011c580 jam zcode_80 ,mem_zcode_temp_param0 +02d9 20200748 branch p_zcode_entrance p_spid_init_flash: -02d9 70808640 jam 0x40 ,core_spid_ctrl -02da 70808700 jam 0x0 ,core_spid_delay -02db 68108081 hfetch 1 ,core_gpio_sel1 -02dc 793ffe00 set0 0 ,pdata -02dd 793ffe01 set0 1 ,pdata -02de 79207e03 set1 3 ,pdata -02df 793ffe04 set0 4 ,pdata -02e0 60108081 hstore 1 ,core_gpio_sel1 -02e1 58000000 setarg 0 -02e2 600201f5 store 4 ,mem_spid_tbuf -02e3 20600000 rtn +02da 70808640 jam 0x40 ,core_spid_ctrl +02db 70808700 jam 0x0 ,core_spid_delay +02dc 68108081 hfetch 1 ,core_gpio_sel1 +02dd 793ffe00 set0 0 ,pdata +02de 793ffe01 set0 1 ,pdata +02df 79207e03 set1 3 ,pdata +02e0 793ffe04 set0 4 ,pdata +02e1 60108081 hstore 1 ,core_gpio_sel1 +02e2 58000000 setarg 0 +02e3 600201f5 store 4 ,mem_spid_tbuf +02e4 20600000 rtn p_mouse_load_flash_info_check: -02e4 2040032f call p_flash_release_deep_power_down -02e5 20404423 call mouse_load_flash_flag -02e6 68014778 fetch 2 ,mem_store_flag -02e7 d840aa55 arg eeprom_init_flag ,temp -02e8 98467c00 isub temp ,null -02e9 20228321 branch p_mouse_load_flash_device_info ,zero -02ea 60094778 storet 2 ,mem_store_flag -02eb 2040441c call mouse_ble_init_address -02ec 6800c6e1 fetch 1 ,mem_config_sensor_motion -02ed 6000c77a store 1 ,mem_mouse_dpi -02ee 68024b4d fetch 4 ,mem_mouse_24g_addr_init -02ef 6002477b store 4 ,mem_mouse_24g_addr -02f0 60024c69 store 4 ,mem_24g_addr +02e5 20400330 call p_flash_release_deep_power_down +02e6 20404423 call mouse_load_flash_flag +02e7 68014778 fetch 2 ,mem_store_flag +02e8 d840aa55 arg eeprom_init_flag ,temp +02e9 98467c00 isub temp ,null +02ea 20228322 branch p_mouse_load_flash_device_info ,zero +02eb 60094778 storet 2 ,mem_store_flag +02ec 2040441c call mouse_ble_init_address +02ed 6800c6e1 fetch 1 ,mem_config_sensor_motion +02ee 6000c77a store 1 ,mem_mouse_dpi +02ef 68024b4d fetch 4 ,mem_mouse_24g_addr_init +02f0 6002477b store 4 ,mem_mouse_24g_addr +02f1 60024c69 store 4 ,mem_24g_addr p_mouse_store_flash_device_info: -02f1 2040032f call p_flash_release_deep_power_down -02f2 20400300 call p_flash_erase_sector -02f3 20400318 call p_mouse_information_flash_parameters -02f4 20400304 call p_spid_write_flash -02f5 2040030f call p_wait_flash_done +02f2 20400330 call p_flash_release_deep_power_down +02f3 20400301 call p_flash_erase_sector +02f4 20400319 call p_mouse_information_flash_parameters +02f5 20400305 call p_spid_write_flash +02f6 20400310 call p_wait_flash_done p_mouse_store_random_addr_increase_count: -02f6 204002d9 call p_spid_init_flash -02f7 d8400002 arg 2 ,temp -02f8 da2047c4 arg mem_random_addr_increase_count ,rega -02f9 da40005f arg mouse_random_addr_count_eeprom_offset ,regb -02fa 6801c700 fetch 3 ,mem_flash_base -02fb 9a40fe00 iadd regb ,pdata -02fc 20400304 call p_spid_write_flash -02fd 2040030f call p_wait_flash_done -02fe 20400327 call p_flash_deep_power_down -02ff 202002b1 branch p_mouse_spi_init +02f7 204002da call p_spid_init_flash +02f8 d8400002 arg 2 ,temp +02f9 da2047c4 arg mem_random_addr_increase_count ,rega +02fa da40005f arg mouse_random_addr_count_eeprom_offset ,regb +02fb 6801c700 fetch 3 ,mem_flash_base +02fc 9a40fe00 iadd regb ,pdata +02fd 20400305 call p_spid_write_flash +02fe 20400310 call p_wait_flash_done +02ff 20400328 call p_flash_deep_power_down +0300 202002b2 branch p_mouse_spi_init p_flash_erase_sector: -0300 6801c700 fetch 3 ,mem_flash_base -0301 6001c232 store 3 ,mem_spi_write_addr -0302 2040652a call flash_erase_sector + 2 -0303 2020030f branch p_wait_flash_done +0301 6801c700 fetch 3 ,mem_flash_base +0302 6001c232 store 3 ,mem_spi_write_addr +0303 2040652a call flash_erase_sector + 2 +0304 20200310 branch p_wait_flash_done p_spid_write_flash: -0304 1fe22600 copy pdata ,regc -0305 1a227e00 copy rega ,pdata -0306 1fe0fffc increase -4 ,pdata -0307 1fe22400 copy pdata ,regb -0308 ea420000 ifetch 4 ,regb -0309 60024b48 store 4 ,mem_write_flash_head_temp -030a 1a627e00 copy regc ,pdata -030b 20406552 call spid_write_flash -030c 68024b48 fetch 4 ,mem_write_flash_head_temp -030d e2420000 istore 4 ,regb -030e 20600000 rtn +0305 1fe22600 copy pdata ,regc +0306 1a227e00 copy rega ,pdata +0307 1fe0fffc increase -4 ,pdata +0308 1fe22400 copy pdata ,regb +0309 ea420000 ifetch 4 ,regb +030a 60024b48 store 4 ,mem_write_flash_head_temp +030b 1a627e00 copy regc ,pdata +030c 20406552 call spid_write_flash +030d 68024b48 fetch 4 ,mem_write_flash_head_temp +030e e2420000 istore 4 ,regb +030f 20600000 rtn p_wait_flash_done: -030f 580186a0 setarg 100000 -0310 20402a8f call sleep -0311 2040650b call spid_unlock_flash -0312 580001fa setarg mem_spid_rbuf -0313 6011008c hstore 2 ,core_spid_rxaddr -0314 58000005 setarg flash_read_satus -0315 204064f3 call spid_read_reg -0316 c280030f bbit1 flash_status_wip ,p_wait_flash_done -0317 20600000 rtn +0310 580186a0 setarg 100000 +0311 20402a8f call sleep +0312 2040650b call spid_unlock_flash +0313 580001fa setarg mem_spid_rbuf +0314 6011008c hstore 2 ,core_spid_rxaddr +0315 58000005 setarg flash_read_satus +0316 204064f3 call spid_read_reg +0317 c2800310 bbit1 flash_status_wip ,p_wait_flash_done +0318 20600000 rtn p_mouse_information_flash_parameters: -0318 5800477f setarg mem_mouse_information_end -0319 d8404720 arg mem_mouse_information_start ,temp -031a 98460400 isub temp ,temp -031b 6801c700 fetch 3 ,mem_flash_base -031c da204720 arg mem_mouse_information_start ,rega -031d 20600000 rtn +0319 5800477f setarg mem_mouse_information_end +031a d8404720 arg mem_mouse_information_start ,temp +031b 98460400 isub temp ,temp +031c 6801c700 fetch 3 ,mem_flash_base +031d da204720 arg mem_mouse_information_start ,rega +031e 20600000 rtn p_mouse_read_flash: -031e 2040032f call p_flash_release_deep_power_down -031f 20400318 call p_mouse_information_flash_parameters -0320 20206562 branch spid_read_flash +031f 20400330 call p_flash_release_deep_power_down +0320 20400319 call p_mouse_information_flash_parameters +0321 20206562 branch spid_read_flash p_mouse_load_flash_device_info: -0321 2040031e call p_mouse_read_flash -0322 20400331 call p_mouse_load_random_addr_increase_count -0323 2040431a call mouse_select_reconn_device -0324 6802477b fetch 4 ,mem_mouse_24g_addr -0325 60024c69 store 4 ,mem_24g_addr -0326 20600000 rtn +0322 2040031f call p_mouse_read_flash +0323 20400332 call p_mouse_load_random_addr_increase_count +0324 2040431a call mouse_select_reconn_device +0325 6802477b fetch 4 ,mem_mouse_24g_addr +0326 60024c69 store 4 ,mem_24g_addr +0327 20600000 rtn p_flash_deep_power_down: -0327 700aa2b9 jam flash_command_deep_power_down ,mem_temp +0328 700aa2b9 jam flash_command_deep_power_down ,mem_temp p_spid_write_flash_cmd: -0328 204002d9 call p_spid_init_flash -0329 204069ac call delay_nop100 -032a 2040650b call spid_unlock_flash -032b da204b48 arg mem_write_flash_head_temp ,rega -032c 68088aa2 fetcht 1 ,mem_temp -032d 20406556 call spid_write_flash_common -032e 202069ac branch delay_nop100 +0329 204002da call p_spid_init_flash +032a 204069ac call delay_nop100 +032b 2040650b call spid_unlock_flash +032c da204b48 arg mem_write_flash_head_temp ,rega +032d 68088aa2 fetcht 1 ,mem_temp +032e 20406556 call spid_write_flash_common +032f 202069ac branch delay_nop100 p_flash_release_deep_power_down: -032f 700aa2ab jam flash_command_release_deep_power_down ,mem_temp -0330 20200328 branch p_spid_write_flash_cmd +0330 700aa2ab jam flash_command_release_deep_power_down ,mem_temp +0331 20200329 branch p_spid_write_flash_cmd p_mouse_load_random_addr_increase_count: -0331 2040032f call p_flash_release_deep_power_down -0332 d8400002 arg 2 ,temp -0333 da2047c4 arg mem_random_addr_increase_count ,rega -0334 da40005f arg mouse_random_addr_count_eeprom_offset ,regb -0335 6801c700 fetch 3 ,mem_flash_base -0336 9a40fe00 iadd regb ,pdata -0337 20206562 branch spid_read_flash +0332 20400330 call p_flash_release_deep_power_down +0333 d8400002 arg 2 ,temp +0334 da2047c4 arg mem_random_addr_increase_count ,rega +0335 da40005f arg mouse_random_addr_count_eeprom_offset ,regb +0336 6801c700 fetch 3 ,mem_flash_base +0337 9a40fe00 iadd regb ,pdata +0338 20206562 branch spid_read_flash p_mouse_start_24g_mode: -0338 204006ce call p_mouse_mode_24g_device_multi_led_on 0339 6800c241 fetch 1 ,mem_power_on_flag 033a c28101c5 bbit1 2 ,p_g24_start_24g_mode @@ -1186,7 +1186,7 @@ p_mouse_le_next: 0375 6800c79e fetch 1 ,mem_mouse_clear_sensor_data_flag -0376 205a02bb call p_mouse_clear_sensor_data ,blank +0376 205a02bc call p_mouse_clear_sensor_data ,blank 0377 680246d3 fetch mouse_flag_len ,mem_mouse_flag 0378 c282c179 bbit1 mouse_bt_discovery_button_down_flag ,mouse_le_send_empty_packet 0379 20403f97 call mouse_motion @@ -1243,7 +1243,7 @@ 039e 20405271 call l2cap_malloc_is_fifo_nearly_full 039f 247a0000 nrtn blank 03a0 6800c79e fetch 1 ,mem_mouse_clear_sensor_data_flag -03a1 205a02bb call p_mouse_clear_sensor_data ,blank +03a1 205a02bc call p_mouse_clear_sensor_data ,blank 03a2 680246d3 fetch mouse_flag_len ,mem_mouse_flag 03a3 c282bf8a bbit1 mouse_bt_discovery_button_down_flag ,mouse_send_empty_data 03a4 c284bf8a bbit1 mouse_bt_discovery_button_long_down_flag ,mouse_send_empty_data @@ -1325,7 +1325,7 @@ 03e4 2020417d branch mouse_priority_bb_event + 1 p_mouse_le_bb_event_connected: -03e5 204002bd call p_mouse_init_sensor_reset +03e5 204002be call p_mouse_init_sensor_reset 03e6 20403410 call app_ble_store_reconn_info 03e7 704b6a01 jam 1 ,mem_mouse_le_bb_connected_flag 03e8 6800c7a1 fetch 1 ,mem_mouse_le_reconnect_flag @@ -1371,7 +1371,7 @@ p_mouse_bb_event_connected: 03fc 70480b00 jam 0 ,mem_mouse_send_switch_req_timer -03fd 204002bd call p_mouse_init_sensor_reset +03fd 204002be call p_mouse_init_sensor_reset 03fe 202042ca branch mouse_stop_discovery p_mouse_bb_event_disconnected: @@ -1385,7 +1385,7 @@ p_mouse_24g_pairing_complete: 0404 204006da call p_mouse_discovey_led_blink_off -0405 204002bd call p_mouse_init_sensor_reset +0405 204002be call p_mouse_init_sensor_reset 0406 7011c592 jam zcode_92 ,mem_zcode_temp_param0 0407 20200748 branch p_zcode_entrance @@ -1399,7 +1399,7 @@ p_mouse_24g_attempt_success: 040d 204006da call p_mouse_discovey_led_blink_off 040e 20400347 call p_g24_pair_timeout_clear -040f 204002bd call p_mouse_init_sensor_reset +040f 204002be call p_mouse_init_sensor_reset p_mouse_24g_no_data_timer_init: 0410 20203f8d branch mouse_no_data_timer_init @@ -1416,7 +1416,7 @@ p_mouse_sensor_powerdown: 0417 20600000 rtn -0418 204002b3 call p_mouse_init_sunt +0418 204002b4 call p_mouse_init_sunt 0419 58000806 setarg 0x0806 041a 20206413 branch twspi_write @@ -1510,7 +1510,7 @@ 0453 6808c720 fetcht 1 ,mem_device_flag 0454 6800c703 fetch 1 ,mem_24g_device_number 0455 98467c00 isub temp ,null -0456 202282ae branch p_mouse_24g_pairing_button ,zero +0456 202282af branch p_mouse_24g_pairing_button ,zero 0457 68014682 fetch 2 ,mem_ui_state_map 0458 2feffe0b isolate1 ui_state_ble_adv ,pdata 0459 2040c2d4 call mouse_stop_le_adv ,true @@ -1557,7 +1557,7 @@ 0478 244143cc ncall mouse_select_device_count_clean ,positive 0479 6008c720 storet 1 ,mem_device_flag 047a 7041bd00 jam 0 ,mem_link_key_exists -047b 204002f1 call p_mouse_store_flash_device_info +047b 204002f2 call p_mouse_store_flash_device_info 047c 680246d3 fetch mouse_flag_len ,mem_mouse_flag 047d c1048000 rtneq mouse_bt_discovery_button_long_down_flag 047e 2020437e branch mouse_set_reconnection @@ -1633,7 +1633,7 @@ 04b6 20600000 rtn p_mouse_sensor_poweron: -04b7 204002b1 call p_mouse_spi_init +04b7 204002b2 call p_mouse_spi_init 04b8 58008006 setarg 0x8006 04b9 20406413 call twspi_write 04ba 20002ee0 nop 12000 @@ -1802,7 +1802,7 @@ 0521 58000000 setarg 0 0522 600146ac store 2 ,mem_mouse_discovery_timer 0523 6000c714 store 1 ,mem_mouse_blink_count -0524 204002bd call p_mouse_init_sensor_reset +0524 204002be call p_mouse_init_sensor_reset 0525 202042cb branch mouse_stop_discovery + 1 p_le_slave_match: @@ -2325,7 +2325,7 @@ p_mouse_unplug_clean_bdaddr: 0698 204042fb call mouse_before_store_reconn_info -0699 202002f1 branch p_mouse_store_flash_device_info +0699 202002f2 branch p_mouse_store_flash_device_info p_mouse_multi_led_blink_timer: 069a 6800cb27 fetch 1 ,mem_mouse_multi_led_blink_enable @@ -2595,7 +2595,7 @@ 0754 9840fe00 iadd temp ,pdata 0755 1fe0fffb increase -5 ,pdata 0756 6001cb5d store 3 ,mem_flash_address -0757 2040032f call p_flash_release_deep_power_down +0757 20400330 call p_flash_release_deep_power_down p_zcode_read_loop: 0758 6801cb5d fetch 3 ,mem_flash_address @@ -2606,7 +2606,7 @@ 075d 680a4b60 fetcht 4 ,mem_zcode_head 075e 98467c00 isub temp ,null 075f 24228758 nbranch p_zcode_read_loop ,zero -0760 204002b1 call p_mouse_spi_init +0760 204002b2 call p_mouse_spi_init 0761 58001f00 setarg mem_zcode_buff 0762 60014199 store 2 ,mem_patch_ptr 0763 70419b40 jam zcode_code_size ,mem_patch_len @@ -35482,83 +35482,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 204006ce 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 204002a0 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 2040051c 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 204002a1 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 2040051c 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 20200417 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 20200417 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: @@ -35675,23 +35674,23 @@ z_mouse_start_discovery: 60003 704b6c00 jam 0 ,mem_le_send_security_request_flag -60004 20400296 call p_mouse_tx_power_init +60004 20400298 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 20400331 call p_mouse_load_random_addr_increase_count +60008 20400332 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 204002f6 call p_mouse_store_random_addr_increase_count +6000d 204002f7 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 204002a7 call p_mouse_le_fast_conn_disable +60012 204002a8 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 @@ -35714,7 +35713,7 @@ z_check_51cmd_adv: 60026 7047a100 jam 0 ,mem_mouse_le_reconnect_flag -60027 204002a0 call p_le_check_adv_flag +60027 204002a1 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 @@ -35817,7 +35816,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 202002f1 branch p_mouse_store_flash_device_info +80020 202002f2 branch p_mouse_store_flash_device_info org 0x90001 z_entrance8: @@ -35851,16 +35850,16 @@ 90016 2040582c call le_set_fixed_ltk 90017 20405818 call le_set_config_read_authentication 90018 20400518 call p_le_addr_random_config -90019 204002e4 call p_mouse_load_flash_info_check +90019 204002e5 call p_mouse_load_flash_info_check 9001a df200003 arg 3 ,loopcnt 9001b d8c0473f arg mem_device2_addr ,contr 9001c 2040034d call p_pdata_0xff_check -9001d 243402a7 nbranch p_mouse_le_fast_conn_disable ,user +9001d 243402a8 nbranch p_mouse_le_fast_conn_disable ,user 9001e df200003 arg 3 ,loopcnt 9001f d8c0475c arg mem_device3_addr ,contr 90020 2040034d call p_pdata_0xff_check -90021 243402a7 nbranch p_mouse_le_fast_conn_disable ,user -90022 204002a9 call p_mouse_fast_conn_init +90021 243402a8 nbranch p_mouse_le_fast_conn_disable ,user +90022 204002aa call p_mouse_fast_conn_init 90023 20600000 rtn z_mouse_bt_sdp_update: @@ -35972,10 +35971,10 @@ a0036 7046a700 jam 0 ,mem_mouse_move_flag a0037 20400347 call p_g24_pair_timeout_clear a0038 2040405d call mouse_read_sensor_common -a0039 20400296 call p_mouse_tx_power_init +a0039 20400298 call p_mouse_tx_power_init a003a 68024c69 fetch 4 ,mem_24g_addr a003b 6002477b store 4 ,mem_mouse_24g_addr -a003c 202002f1 branch p_mouse_store_flash_device_info +a003c 202002f2 branch p_mouse_store_flash_device_info org 0xb0001 z_entrancea: @@ -35988,7 +35987,7 @@ z_mouse_24g_attempt_fail: b0007 704d8100 jam g24_tx_timer_int_disable ,mem_24g_transmit_by_interrupt -b0008 20400296 call p_mouse_tx_power_init +b0008 20400298 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 @@ -36028,7 +36027,7 @@ b0025 70479e00 jam 0 ,mem_mouse_clear_sensor_data_flag b0026 20400380 call p_mouse_data_init b0027 20405816 call le_clr_config_more_data -b0028 204002f1 call p_mouse_store_flash_device_info +b0028 204002f2 call p_mouse_store_flash_device_info b0029 202041d9 branch mouse_bb_disconnected z_mouse_before_hibernate: @@ -36039,10 +36038,10 @@ b002e 20402c21 call lpm_write_ctrl b002f 204074bd call disable_authrom b0030 204006c6 call p_mouse_multi_led_off -b0031 204002f1 call p_mouse_store_flash_device_info +b0031 204002f2 call p_mouse_store_flash_device_info b0032 20403e9f call mouse_before_hibernate_wheel_gpio_set b0033 20400269 call p_mouse_setgpio_hibernate -b0034 20400327 call p_flash_deep_power_down +b0034 20400328 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 @@ -36091,7 +36090,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 204002f1 call p_mouse_store_flash_device_info +c001b 204002f2 call p_mouse_store_flash_device_info c001c 202041d9 branch mouse_bb_disconnected org 0xd0001 @@ -36122,7 +36121,7 @@ z_g24_auto_pair_skip_rx_length: d0016 704d9100 jam 0 ,mem_24g_conn_sm -d0017 20400296 call p_mouse_tx_power_init +d0017 20400298 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 @@ -36152,7 +36151,7 @@ d002c 202001ac branch p_g24_pair_init z_g24_auto_pair_first_attemp: -d002d 20400296 call p_mouse_tx_power_init +d002d 20400298 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_Li/output/romcode.rom (revision 3823) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Li/output/romcode.rom (working copy) @@ -24628,35 +24628,34 @@ 18427e00 c00283f8 20204d41 -c0100016 -c010802a -c0110023 +c0100015 +c0108029 +c0110022 c0118006 20600000 704b6c01 -204006ce 7047a101 680146a8 6808cbb1 18467cff -2422800e +2422800d 58000258 600146ae 20403418 -204002a0 +204002a1 58000004 e0c08000 d8c04390 2040051c 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 -20400296 +20400298 70479e00 68014682 c2858010 -20400331 +20400332 680947c4 18408401 600947c4 600944a1 -204002f6 +204002f7 180a7e00 6000c4a0 6801cbae 6001c4a3 -204002a7 +204002a8 20403418 68014687 600146ac @@ -24797,7 +24796,7 @@ 204042c4 202006d3 7047a100 -204002a0 +204002a1 58000005 e0c08000 d8c04b12 @@ -24874,7 +24873,7 @@ 704bb1ff 204042fb 704721ff -202002f1 +202002f2 c040000a c0408004 20600000 @@ -24899,16 +24898,16 @@ 2040582c 20405818 20400518 -204002e4 +204002e5 df200003 d8c0473f 2040034d -243402a7 +243402a8 df200003 d8c0475c 2040034d -243402a7 -204002a9 +243402a8 +204002aa 20600000 204074b9 d8c08c00 @@ -24993,10 +24992,10 @@ 7046a700 20400347 2040405d -20400296 +20400298 68024c69 6002477b -202002f1 +202002f2 c0500007 c050800d c0510020 @@ -25004,7 +25003,7 @@ c052002a 20600000 704d8100 -20400296 +20400298 204001c9 7041bd00 20400269 @@ -25036,7 +25035,7 @@ 70479e00 20400380 20405816 -204002f1 +204002f2 202041d9 78347c00 68120138 @@ -25045,10 +25044,10 @@ 20402c21 204074bd 204006c6 -204002f1 +204002f2 20403e9f 20400269 -20400327 +20400328 68108081 1fe17ef7 60108081 @@ -25082,7 +25081,7 @@ 704b0100 704b0300 704b0c00 -204002f1 +204002f2 202041d9 6800cd8c c000add4 @@ -25106,7 +25105,7 @@ 6800cc3f c1840000 704d9100 -20400296 +20400298 68024c69 680a4c4d 98467c00 @@ -25128,7 +25127,7 @@ c000002d c0010037 202001ac -20400296 +20400298 68024c78 60024c69 6800cd8f @@ -25146,4 +25145,4 @@ 20400035 6008cd90 20600000 -00009592 +000060b4 Index: program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Li/program/patch.prog (revision 3823) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Li/program/patch.prog (working copy) @@ -1129,6 +1129,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 @@ -1157,7 +1159,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 @@ -1388,7 +1390,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_Li/program/z.prog (revision 3823) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Li/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_Li/sched/mouse.dat (revision 3823) +++ /branch/mouse_project/YJX_Project/YJX_1066/LXL_Project/LXL-186_PBSwitch_3mode_3ch_24M_Li/sched/mouse.dat (working copy) @@ -62,7 +62,7 @@ mem_app_connection_options:06 mem_lap:25 13 19 20 18 10 mem_local_name_length: -'Go charge mouse +'Go Charge Mouse 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 charge +'\09Go Charge mem_le_scan_data_len:1f mem_le_scan_data: #name -'\09Go charge +'\09Go Charge #max 20bytes, att list data rom limits mem_le_name_len: -'Go charge +'Go Charge 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