Index: output/bt_program23.icode =================================================================== --- /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/output/bt_program23.icode (revision 2418) +++ /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/output/bt_program23.icode (working copy) @@ -27134,49 +27134,48 @@ 00720939 0x00009466 call 0x000002f3 00720940 0x00009467 call 0x00003e9f 00720941 0x00009468 call 0x000000c7 - 00720942 0x00009469 fetch 0x00000001 , 0x00004720 - 00720943 0x0000946a sub 0x0000003f , 0x00000002 , 0x0000003e - 00720944 0x0000946c call 0x00000333 - 00720945 0x0000946d hfetch 0x00000001 , 0x00008081 - 00720946 0x0000946e and 0x0000003f , 0x000000f7 , 0x0000003f - 00720947 0x0000946f hstore 0x00000001 , 0x00008081 - 00720948 0x00009470 hfetch 0x00000001 , 0x0000807f - 00720949 0x00009471 set1 0x00000000 , 0x0000003f - 00720950 0x00009472 hstore 0x00000001 , 0x0000807f - 00720951 0x00009473 rtn - 00786433 0x0000947a beq 0x000000b1 , 0x000c0007 - 00786434 0x0000947b beq 0x000000b2 , 0x000c000d - 00786435 0x0000947c beq 0x000000b3 , 0x000c0012 - 00786436 0x0000947d beq 0x000000b4 , 0x000c0019 - 00786437 0x0000947e beq 0x000000b5 , 0x000c001e - 00786438 0x0000947f rtn - 00786439 0x00009482 fetch 0x00000001 , 0x000049e3 - 00786440 0x00009483 rtneq 0x00000002 - 00786441 0x00009484 increase 0x00000001 , 0x0000003f - 00786442 0x00009485 store 0x00000001 , 0x000049e3 - 00786443 0x00009486 jam 0x00000012 , 0x000041e3 - 00786444 0x00009487 branch 0x0000340e - 00786445 0x0000948a fetch 0x00000001 , 0x000049e3 - 00786446 0x0000948b rtnne 0x00000002 - 00786447 0x0000948c jam 0x00000000 , 0x000049e3 - 00786448 0x0000948d jam 0x0000000e , 0x000041e3 - 00786449 0x0000948e branch 0x0000340e - 00786450 0x00009491 fetch 0x00000001 , 0x000047a1 - 00786451 0x00009492 beq 0x00000001 , 0x000c0015 - 00786452 0x00009493 branch 0x000c0017 - 00786453 0x00009495 call 0x000003f0 - 00786454 0x00009496 jam 0x00000005 , 0x000046c6 - 00786455 0x00009498 arg 0x00000001 , 0x00000007 - 00786456 0x00009499 branch 0x000041b9 - 00786457 0x0000949c jam 0x00000000 , 0x00004cda - 00786458 0x0000949d jam 0x00000000 , 0x00004cdc - 00786459 0x0000949e jam 0x00000000 , 0x00004ce5 - 00786460 0x0000949f call 0x000002f3 - 00786461 0x000094a0 branch 0x000041d9 - 00786462 0x000094a3 setarg 0x00000001 - 00786463 0x000094a4 store 0x00000006 , 0x00000040 - 00786464 0x000094a5 jam 0x00000033 , 0x00000185 - 00786465 0x000094a6 jam 0x000000ff , 0x00004d3e - 00786466 0x000094a7 call 0x000042fb - 00786467 0x000094a8 jam 0x000000ff , 0x00004721 - 00786468 0x000094a9 branch 0x000002f3 + 00720942 0x00009469 call 0x00000567 + 00720943 0x0000946a call 0x00000333 + 00720944 0x0000946b hfetch 0x00000001 , 0x00008081 + 00720945 0x0000946c and 0x0000003f , 0x000000f7 , 0x0000003f + 00720946 0x0000946d hstore 0x00000001 , 0x00008081 + 00720947 0x0000946e hfetch 0x00000001 , 0x0000807f + 00720948 0x0000946f set1 0x00000000 , 0x0000003f + 00720949 0x00009470 hstore 0x00000001 , 0x0000807f + 00720950 0x00009471 rtn + 00786433 0x00009478 beq 0x000000b1 , 0x000c0007 + 00786434 0x00009479 beq 0x000000b2 , 0x000c000d + 00786435 0x0000947a beq 0x000000b3 , 0x000c0012 + 00786436 0x0000947b beq 0x000000b4 , 0x000c0019 + 00786437 0x0000947c beq 0x000000b5 , 0x000c001e + 00786438 0x0000947d rtn + 00786439 0x00009480 fetch 0x00000001 , 0x000049e3 + 00786440 0x00009481 rtneq 0x00000002 + 00786441 0x00009482 increase 0x00000001 , 0x0000003f + 00786442 0x00009483 store 0x00000001 , 0x000049e3 + 00786443 0x00009484 jam 0x00000012 , 0x000041e3 + 00786444 0x00009485 branch 0x0000340e + 00786445 0x00009488 fetch 0x00000001 , 0x000049e3 + 00786446 0x00009489 rtnne 0x00000002 + 00786447 0x0000948a jam 0x00000000 , 0x000049e3 + 00786448 0x0000948b jam 0x0000000e , 0x000041e3 + 00786449 0x0000948c branch 0x0000340e + 00786450 0x0000948f fetch 0x00000001 , 0x000047a1 + 00786451 0x00009490 beq 0x00000001 , 0x000c0015 + 00786452 0x00009491 branch 0x000c0017 + 00786453 0x00009493 call 0x000003f0 + 00786454 0x00009494 jam 0x00000005 , 0x000046c6 + 00786455 0x00009496 arg 0x00000001 , 0x00000007 + 00786456 0x00009497 branch 0x000041b9 + 00786457 0x0000949a jam 0x00000000 , 0x00004cda + 00786458 0x0000949b jam 0x00000000 , 0x00004cdc + 00786459 0x0000949c jam 0x00000000 , 0x00004ce5 + 00786460 0x0000949d call 0x000002f3 + 00786461 0x0000949e branch 0x000041d9 + 00786462 0x000094a1 setarg 0x00000001 + 00786463 0x000094a2 store 0x00000006 , 0x00000040 + 00786464 0x000094a3 jam 0x00000033 , 0x00000185 + 00786465 0x000094a4 jam 0x000000ff , 0x00004d3e + 00786466 0x000094a5 call 0x000042fb + 00786467 0x000094a6 jam 0x000000ff , 0x00004721 + 00786468 0x000094a7 branch 0x000002f3 Index: output/bt_program23.list =================================================================== --- /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/output/bt_program23.list (revision 2418) +++ /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/output/bt_program23.list (working copy) @@ -31646,58 +31646,57 @@ 0xb002b 037990 call p_mouse_store_flash_device_info 0xb002c 037991 call mouse_before_hibernate_wheel_gpio_set 0xb002d 037992 call p_mouse_setgpio_hibernate -0xb002e 037993 fetch 1 ,mem_device_flag -0xb002f 037994 sub pdata ,mode_24g_device ,null -0xb0030 037996 call p_flash_deep_power_down -0xb0031 037997 hfetch 1 ,core_gpio_sel1 -0xb0032 037998 and pdata ,0xf7 ,pdata -0xb0033 037999 hstore 1 ,core_gpio_sel1 -0xb0034 038000 hfetch 1 ,core_gpio_pd3 -0xb0035 038001 set1 0 ,pdata -0xb0036 038002 hstore 1 ,core_gpio_pd3 -0xb0037 038003 rtn +0xb002e 037993 call p_mouse_select_device_button_gpio_set_suspend +0xb002f 037994 call p_flash_deep_power_down +0xb0030 037995 hfetch 1 ,core_gpio_sel1 +0xb0031 037996 and pdata ,0xf7 ,pdata +0xb0032 037997 hstore 1 ,core_gpio_sel1 +0xb0033 037998 hfetch 1 ,core_gpio_pd3 +0xb0034 037999 set1 0 ,pdata +0xb0035 038000 hstore 1 ,core_gpio_pd3 +0xb0036 038001 rtn org 0xc0001 -: 038008 z_entranceb: -0xc0001 038010 beq zcode_b1 ,z_mouse_sniff_not_accept -0xc0002 038011 beq zcode_b2 ,z_mouse_enter_sniff_check -0xc0003 038012 beq zcode_b3 ,z_mouse_le_ll_start_encryt -0xc0004 038013 beq zcode_b4 ,z_mouse_bb_event_disconnected -0xc0005 038014 beq zcode_b5 ,z_mouse_irtual_cable_unplug -0xc0006 038015 rtn -: 038017 z_mouse_sniff_not_accept: -0xc0007 038018 fetch 1 ,mem_mouse_enter_sniff_count -0xc0008 038019 rtneq 2 -0xc0009 038020 increase 1 ,pdata -0xc000a 038021 store 1 ,mem_mouse_enter_sniff_count -0xc000b 038022 jam 0x12 ,mem_sniff_param_interval -0xc000c 038023 branch app_bt_enter_sniff -: 038025 z_mouse_enter_sniff_check: -0xc000d 038026 fetch 1 ,mem_mouse_enter_sniff_count -0xc000e 038027 rtnne 2 -0xc000f 038028 jam 0 ,mem_mouse_enter_sniff_count -0xc0010 038029 jam 0x0e ,mem_sniff_param_interval -0xc0011 038030 branch app_bt_enter_sniff -: 038032 z_mouse_le_ll_start_encryt: -0xc0012 038033 fetch 1 ,mem_mouse_le_reconnect_flag -0xc0013 038034 beq 1 ,z_mouse_le_ll_reconn_start_encryt -0xc0014 038035 branch z_mouse_le_ll_enable_start_enc_flag -: 038036 z_mouse_le_ll_reconn_start_encryt: -0xc0015 038037 call p_app_updata_le_param -0xc0016 038038 jam 5 ,mem_le_start_encrypt_timer -: 038039 z_mouse_le_ll_enable_start_enc_flag: -0xc0017 038040 arg ll_start_enc_flag ,queue -0xc0018 038041 branch mouse_le_enable_connect_flag -: 038043 z_mouse_bb_event_disconnected: -0xc0019 038044 jam 0 ,mem_bt_rcvd_switch_req_accept -0xc001a 038045 jam 0 ,mem_bt_send_lmp_setup_complete -0xc001b 038046 jam 0 ,mem_mouse_bt_send_first_package_flag -0xc001c 038047 call p_mouse_store_flash_device_info -0xc001d 038048 branch mouse_bb_disconnected -: 038050 z_mouse_irtual_cable_unplug: -0xc001e 038051 setarg 0x01 -0xc001f 038052 store 6 ,mem_plap -0xc0020 038053 jam rec_3_mode ,mem_record_bt_mode -0xc0021 038054 jam 0xff ,mem_mouse_fast_conn_flag -0xc0022 038055 call mouse_before_store_reconn_info -0xc0023 038056 jam 0xff ,mem_device1_type -0xc0024 038057 branch p_mouse_store_flash_device_info +: 038006 z_entranceb: +0xc0001 038008 beq zcode_b1 ,z_mouse_sniff_not_accept +0xc0002 038009 beq zcode_b2 ,z_mouse_enter_sniff_check +0xc0003 038010 beq zcode_b3 ,z_mouse_le_ll_start_encryt +0xc0004 038011 beq zcode_b4 ,z_mouse_bb_event_disconnected +0xc0005 038012 beq zcode_b5 ,z_mouse_irtual_cable_unplug +0xc0006 038013 rtn +: 038015 z_mouse_sniff_not_accept: +0xc0007 038016 fetch 1 ,mem_mouse_enter_sniff_count +0xc0008 038017 rtneq 2 +0xc0009 038018 increase 1 ,pdata +0xc000a 038019 store 1 ,mem_mouse_enter_sniff_count +0xc000b 038020 jam 0x12 ,mem_sniff_param_interval +0xc000c 038021 branch app_bt_enter_sniff +: 038023 z_mouse_enter_sniff_check: +0xc000d 038024 fetch 1 ,mem_mouse_enter_sniff_count +0xc000e 038025 rtnne 2 +0xc000f 038026 jam 0 ,mem_mouse_enter_sniff_count +0xc0010 038027 jam 0x0e ,mem_sniff_param_interval +0xc0011 038028 branch app_bt_enter_sniff +: 038030 z_mouse_le_ll_start_encryt: +0xc0012 038031 fetch 1 ,mem_mouse_le_reconnect_flag +0xc0013 038032 beq 1 ,z_mouse_le_ll_reconn_start_encryt +0xc0014 038033 branch z_mouse_le_ll_enable_start_enc_flag +: 038034 z_mouse_le_ll_reconn_start_encryt: +0xc0015 038035 call p_app_updata_le_param +0xc0016 038036 jam 5 ,mem_le_start_encrypt_timer +: 038037 z_mouse_le_ll_enable_start_enc_flag: +0xc0017 038038 arg ll_start_enc_flag ,queue +0xc0018 038039 branch mouse_le_enable_connect_flag +: 038041 z_mouse_bb_event_disconnected: +0xc0019 038042 jam 0 ,mem_bt_rcvd_switch_req_accept +0xc001a 038043 jam 0 ,mem_bt_send_lmp_setup_complete +0xc001b 038044 jam 0 ,mem_mouse_bt_send_first_package_flag +0xc001c 038045 call p_mouse_store_flash_device_info +0xc001d 038046 branch mouse_bb_disconnected +: 038048 z_mouse_irtual_cable_unplug: +0xc001e 038049 setarg 0x01 +0xc001f 038050 store 6 ,mem_plap +0xc0020 038051 jam rec_3_mode ,mem_record_bt_mode +0xc0021 038052 jam 0xff ,mem_mouse_fast_conn_flag +0xc0022 038053 call mouse_before_store_reconn_info +0xc0023 038054 jam 0xff ,mem_device1_type +0xc0024 038055 branch p_mouse_store_flash_device_info Index: output/bt_program23.meta =================================================================== --- /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/output/bt_program23.meta (revision 2418) +++ /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/output/bt_program23.meta (working copy) @@ -37990,9 +37990,7 @@ call p_mouse_store_flash_device_info call mouse_before_hibernate_wheel_gpio_set call p_mouse_setgpio_hibernate - fetch 1,mem_device_flag - sub pdata,MODE_24G_DEVICE,null -// call p_mouse_select_device_button_gpio_set_suspend,zero + call p_mouse_select_device_button_gpio_set_suspend call p_flash_deep_power_down hfetch 1,core_gpio_sel1 and pdata,0xf7,pdata Index: output/bt_program23.rom =================================================================== --- /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/output/bt_program23.rom (revision 2418) +++ /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/output/bt_program23.rom (working copy) @@ -720940,8 +720940,7 @@ 00100000010000000000001011110011 00100000010000000011111010011111 00100000010000000000000011000111 -01101000000000001100011100100000 -00011111111001100111110000000010 +00100000010000000000010101100111 00100000010000000000001100110011 01101000000100001000000010000001 00011111111000010111111011110111 @@ -786431,6 +786430,7 @@ + 11000000010110001000000000000111 11000000010110010000000000001101 11000000010110011000000000010010 Index: output/flash.dat =================================================================== --- /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/output/flash.dat (revision 2418) +++ /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/output/flash.dat (working copy) @@ -10060,14 +10060,10 @@ 40 00 c7 -68 -00 -c7 20 -1f -e6 -7c -02 +40 +05 +67 20 40 03 @@ -10132,6 +10128,10 @@ 00 00 00 +00 +00 +00 +00 20 20 00 @@ -12696,5 +12696,5 @@ 55 00 00 -c1 -c7 +9f +81 Index: output/program.lis =================================================================== --- /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/output/program.lis (revision 2418) +++ /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/output/program.lis (working copy) @@ -36144,16 +36144,15 @@ b002b 204002f3 call p_mouse_store_flash_device_info b002c 20403e9f call mouse_before_hibernate_wheel_gpio_set b002d 204000c7 call p_mouse_setgpio_hibernate -b002e 6800c720 fetch 1 ,mem_device_flag -b002f 1fe67c02 sub pdata ,mode_24g_device ,null -b0030 20400333 call p_flash_deep_power_down -b0031 68108081 hfetch 1 ,core_gpio_sel1 -b0032 1fe17ef7 and pdata ,0xf7 ,pdata -b0033 60108081 hstore 1 ,core_gpio_sel1 -b0034 6810807f hfetch 1 ,core_gpio_pd3 -b0035 79207e00 set1 0 ,pdata -b0036 6010807f hstore 1 ,core_gpio_pd3 -b0037 20600000 rtn +b002e 20400567 call p_mouse_select_device_button_gpio_set_suspend +b002f 20400333 call p_flash_deep_power_down +b0030 68108081 hfetch 1 ,core_gpio_sel1 +b0031 1fe17ef7 and pdata ,0xf7 ,pdata +b0032 60108081 hstore 1 ,core_gpio_sel1 +b0033 6810807f hfetch 1 ,core_gpio_pd3 +b0034 79207e00 set1 0 ,pdata +b0035 6010807f hstore 1 ,core_gpio_pd3 +b0036 20600000 rtn org 0xc0001 z_entranceb: Index: output/romcode.rom =================================================================== --- /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/output/romcode.rom (revision 2409) +++ /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/output/romcode.rom (working copy) @@ -25138,8 +25138,7 @@ 204002f3 20403e9f 204000c7 -6800c720 -1fe67c02 +20400567 20400333 68108081 1fe17ef7 @@ -25184,4 +25183,4 @@ 204042fb 704721ff 202002f3 -0000a2b3 +000039ff Index: program/z.prog =================================================================== --- /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/program/z.prog (revision 2409) +++ /branch/mouse_project/SA/YC1059/SI_9562_BD_PB/program/z.prog (working copy) @@ -888,9 +888,7 @@ call p_mouse_store_flash_device_info call mouse_before_hibernate_wheel_gpio_set call p_mouse_setgpio_hibernate - fetch 1,mem_device_flag - sub pdata,MODE_24G_DEVICE,null -// call p_mouse_select_device_button_gpio_set_suspend,zero + call p_mouse_select_device_button_gpio_set_suspend call p_flash_deep_power_down hfetch 1,core_gpio_sel1 and pdata,0xf7,pdata