Index: output/eeprom.dat =================================================================== --- /YC1308AF/branch/mouse/YDN_Project/Multi_Mode/PB_3m_3ch_pair_G903-FS/output/eeprom.dat (revision 4431) +++ /YC1308AF/branch/mouse/YDN_Project/Multi_Mode/PB_3m_3ch_pair_G903-FS/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -6a +62 19 c2 84 @@ -59,7 +59,7 @@ c0 66 85 -ef +ed c0 67 04 @@ -71,7 +71,7 @@ c0 68 06 -17 +15 c0 69 03 @@ -107,11 +107,11 @@ c0 6c 85 -5f +5d c0 6d 05 -69 +67 c0 4f 80 @@ -119,7 +119,7 @@ c0 73 85 -77 +75 20 20 13 @@ -135,11 +135,11 @@ c0 42 85 -6c +6a c0 53 05 -70 +6e c0 6f 02 @@ -171,31 +171,31 @@ c0 0b 85 -95 +93 c0 0c 85 -8b +89 c0 0f 05 -9f +9d c0 4f 85 -ab +a9 c0 50 85 -b5 +b3 c0 5f 05 -b7 +b5 c0 6c 85 -dd +db 20 20 13 @@ -3971,7 +3971,7 @@ 20 40 06 -47 +45 d8 40 00 @@ -4191,7 +4191,7 @@ 20 40 06 -4a +48 68 48 c9 @@ -5460,14 +5460,6 @@ 20 22 ef -6f -e0 -cb -bb -24 -3a -7e -c7 78 34 7c @@ -5583,7 +5575,7 @@ c2 80 85 -74 +72 20 20 16 @@ -5627,7 +5619,7 @@ c0 04 85 -7f +7d 20 20 4d @@ -5703,7 +5695,7 @@ c0 03 85 -92 +90 20 20 57 @@ -5731,7 +5723,7 @@ c0 09 85 -99 +97 20 20 54 @@ -5783,7 +5775,7 @@ c0 02 05 -a6 +a4 20 20 5a @@ -5863,7 +5855,7 @@ c0 02 05 -ba +b8 20 20 19 @@ -5879,11 +5871,11 @@ c0 05 05 -bf +bd c0 09 05 -ce +cc 20 20 1c @@ -5911,7 +5903,7 @@ c2 81 85 -c9 +c7 6f e1 44 @@ -5939,11 +5931,11 @@ 24 22 85 -c5 +c3 24 34 05 -c5 +c3 20 20 1d @@ -6023,7 +6015,7 @@ c0 06 05 -e2 +e0 20 20 20 @@ -6095,7 +6087,7 @@ 20 40 05 -ff +fd 58 00 00 @@ -6119,7 +6111,7 @@ 20 40 06 -14 +12 6f e0 c8 @@ -6139,7 +6131,7 @@ 20 40 06 -0f +0d 20 20 45 @@ -6159,11 +6151,11 @@ c0 06 06 -05 +03 c0 05 86 -05 +03 20 20 42 @@ -6179,7 +6171,7 @@ c0 7f 86 -0b +09 68 48 c9 @@ -6231,11 +6223,11 @@ 20 40 06 -17 +15 20 40 06 -4d +4b 20 20 41 @@ -6255,15 +6247,15 @@ 20 40 06 -1e +1c 20 40 06 -2d +2b 20 40 06 -3a +38 20 20 41 @@ -6275,7 +6267,7 @@ 20 40 06 -47 +45 20 40 41 @@ -6295,7 +6287,7 @@ 20 40 06 -47 +45 20 40 41 @@ -6315,7 +6307,7 @@ 20 40 06 -47 +45 20 40 41 @@ -6359,7 +6351,7 @@ c0 7f 86 -36 +34 20 20 41 @@ -6371,7 +6363,7 @@ 20 40 06 -4a +48 68 48 c9 @@ -6411,7 +6403,7 @@ c0 7f 86 -43 +41 20 20 41 @@ -6423,7 +6415,7 @@ 20 40 06 -4a +48 68 48 c9 @@ -6475,11 +6467,11 @@ 20 40 06 -54 +52 20 40 06 -57 +55 20 20 41 @@ -6508,8 +6500,8 @@ 60 00 00 -b8 -9e +c3 +18 aa 55 40 @@ -6594,7 +6586,7 @@ 7a 41 88 -1f +12 ce aa 55 @@ -6889,7 +6881,7 @@ 00 01 49 -01 +02 aa 55 01 @@ -6966,9 +6958,9 @@ 00 a8 40 -2d +10 +04 04 -f4 96 08 53 @@ -7626,10 +7618,10 @@ 90 48 01 -0e -0e -0e -0e +0f +0f +0f +0f aa 55 06 @@ -7837,10 +7829,10 @@ aa aa 55 -a3 -90 -ad -4e +8e +8f +32 +6c ff ff ff @@ -8188,5 +8180,13 @@ ff ff ff -1b -ed +ff +ff +ff +ff +ff +ff +ff +ff +bf +13 Index: output/program.lis =================================================================== --- /YC1308AF/branch/mouse/YDN_Project/Multi_Mode/PB_3m_3ch_pair_G903-FS/output/program.lis (revision 4431) +++ /YC1308AF/branch/mouse/YDN_Project/Multi_Mode/PB_3m_3ch_pair_G903-FS/output/program.lis (working copy) @@ -13,10 +13,10 @@ 000a c06403d7 beq patch19_0 ,p_mouse_setgpio_hibernate 000b c06483fc beq patch19_1 ,p_mouse_lpm_before_common 000c c06582f2 beq patch19_3 ,p_mouse_adc_read_start -000d c06685ef beq patch19_5 ,p_mouse_motion +000d c06685ed beq patch19_5 ,p_mouse_motion 000e c0670419 beq patch19_6 ,p_mouse_dpi_process 000f c067842a beq patch19_7 ,p_mouse_seting_dpi -0010 c0680617 beq patch1a_0 ,p_mouse_check_key_gpio +0010 c0680615 beq patch1a_0 ,p_mouse_check_key_gpio 0011 c069039f beq patch1a_2 ,p_mouse_init_sunt 0012 c06983bb beq patch1a_3 ,p_mouse_sensor_poweron 0013 c06a8472 beq patch1a_5 ,p_mouse_priority_bb_event @@ -25,17 +25,17 @@ 0016 c06f0044 beq patch1b_6 ,p_mouse_ready_reconnection_by_button 0017 c070003d beq patch1c_0 ,p_mouse_led_off 0018 c070803a beq patch1c_1 ,p_mouse_led_on -0019 c06c855f beq patch1b_1 ,p_mouse_start_discovery -001a c06d0569 beq patch1b_2 ,p_mouse_stop_discovery +0019 c06c855d beq patch1b_1 ,p_mouse_start_discovery +001a c06d0567 beq patch1b_2 ,p_mouse_stop_discovery 001b c04f809d beq patch13_7 ,p_init_param -001c c0738577 beq patch1c_7 ,p_hid_rx_process +001c c0738575 beq patch1c_7 ,p_hid_rx_process 001d 2020137e branch loop pf_patch_ext: 001e c00f80b4 beq patch23_7 ,p_twspi_reset 001f c0150031 beq patch25_2 ,p_efuse_vdd_off -0020 c042856c beq patch30_5 ,p_ui_timer_check -0021 c0530570 beq patch34_6 ,p_le_enable_phy_by_pdata +0020 c042856a beq patch30_5 ,p_ui_timer_check +0021 c053056e beq patch34_6 ,p_le_enable_phy_by_pdata 0022 c06f0213 beq patch3b_6 ,p_g24_receive_packet 0023 c07082a5 beq patch3c_1 ,p_g24_transmit 0024 c07104eb beq patch3c_2 ,p_g24_pair_dispatch @@ -43,13 +43,13 @@ 0026 c074851d beq patch3d_1 ,p_g24_reconn_dispatch 0027 c075015b beq patch3d_2 ,p_g24_transmit_no_interrupt 0028 c0760554 beq patch3d_4 ,p_g24_lpm_wait -0029 c00b8595 beq patch22_7 ,p_parse_lmp_accepted -002a c00c858b beq patch23_1 ,p_send_lmp -002b c00f059f beq patch23_6 ,p_process_conn_sm -002c c04f85ab beq patch33_7 ,p_le_slave_match -002d c05085b5 beq patch34_1 ,p_le_slave_unsync -002e c05f05b7 beq patch37_6 ,p_le_parse_l2cap -002f c06c85dd beq patch3b_1 ,p_le_pairing_sm +0029 c00b8593 beq patch22_7 ,p_parse_lmp_accepted +002a c00c8589 beq patch23_1 ,p_send_lmp +002b c00f059d beq patch23_6 ,p_process_conn_sm +002c c04f85a9 beq patch33_7 ,p_le_slave_match +002d c05085b3 beq patch34_1 ,p_le_slave_unsync +002e c05f05b5 beq patch37_6 ,p_le_parse_l2cap +002f c06c85db beq patch3b_1 ,p_le_pairing_sm 0030 2020137e branch loop p_efuse_vdd_off: @@ -1327,7 +1327,7 @@ 03dc 6848c914 fetcht 1 ,mem_matrix_public_gpio 03dd 204060e6 call gpio_clr_wake 03de 6fe0c924 fetch 1 ,mem_mouse_sensor_sdio_gpio -03df 20400647 call p_mouse_gpio_config_output_high +03df 20400645 call p_mouse_gpio_config_output_high 03e0 d8400003 arg 3 ,temp 03e1 20403f96 call mouse_gpio_config_input_pu 03e2 20403e80 call mouse_lpm_before_common @@ -1402,7 +1402,7 @@ p_mouse_3io6key_dpi_check: 0415 6fe0c913 fetch 1 ,mem_dpi_button_gpio -0416 2040064a call p_mouse_gpio_config_output_low +0416 20400648 call p_mouse_gpio_config_output_low 0417 6848c913 fetcht 1 ,mem_dpi_button_gpio 0418 202041d5 branch mouse_3io6key_check @@ -1846,358 +1846,356 @@ 0553 202022ef branch g24_pair_init_param p_g24_lpm_wait: -0554 6fe0cbbb fetch 1 ,mem_24g_device_led_status -0555 243a7ec7 nbranch disable_user ,blank -0556 78347c00 enable user -0557 20401436 call lpo_calibration -0558 6fe1c174 fetch 3 ,mem_clks_per_lpo +0554 78347c00 enable user +0555 20401436 call lpo_calibration +0556 6fe1c174 fetch 3 ,mem_clks_per_lpo +0557 203a7ec7 branch disable_user ,blank +0558 6fe0c099 fetch 1 ,mem_lpm_mode 0559 203a7ec7 branch disable_user ,blank -055a 6fe0c099 fetch 1 ,mem_lpm_mode -055b 203a7ec7 branch disable_user ,blank -055c 6fe0c8c1 fetch 1 ,mem_24g_transmit_by_interrupt -055d c000fec7 beq g24_tx_timer_int_enable ,disable_user -055e 20600000 rtn +055a 6fe0c8c1 fetch 1 ,mem_24g_transmit_by_interrupt +055b c000fec7 beq g24_tx_timer_int_enable ,disable_user +055c 20600000 rtn p_mouse_start_discovery: -055f 20400366 call p_mouse_device_discovery_led_config -0560 6fe1478f fetch 2 ,mem_ui_state_map -0561 2feffe0b isolate1 ui_state_ble_adv ,pdata -0562 2040c5c1 call mouse_stop_le_adv ,true -0563 6fe1478f fetch 2 ,mem_ui_state_map -0564 2feffe07 isolate1 ui_state_bt_reconnect ,pdata -0565 2040c362 call mouse_cancel_reconnect ,true -0566 58000000 setarg 0 -0567 67e14b03 store 2 ,mem_le_battery_level_updata_timer -0568 20204594 branch mouse_start_discovery + 1 +055d 20400366 call p_mouse_device_discovery_led_config +055e 6fe1478f fetch 2 ,mem_ui_state_map +055f 2feffe0b isolate1 ui_state_ble_adv ,pdata +0560 2040c5c1 call mouse_stop_le_adv ,true +0561 6fe1478f fetch 2 ,mem_ui_state_map +0562 2feffe07 isolate1 ui_state_bt_reconnect ,pdata +0563 2040c362 call mouse_cancel_reconnect ,true +0564 58000000 setarg 0 +0565 67e14b03 store 2 ,mem_le_battery_level_updata_timer +0566 20204594 branch mouse_start_discovery + 1 p_mouse_stop_discovery: -0569 58000000 setarg 0 -056a 67e14ad3 store 2 ,mem_mouse_discovery_timer -056b 202045b7 branch mouse_stop_discovery + 1 +0567 58000000 setarg 0 +0568 67e14ad3 store 2 ,mem_mouse_discovery_timer +0569 202045b7 branch mouse_stop_discovery + 1 p_ui_timer_check: -056c 6fe0cbf4 fetch 1 ,mem_power_on_flag -056d 245a78cc ncall ui_timer_init ,blank -056e 704bf400 jam 0 ,mem_power_on_flag -056f 202078bc branch ui_timer_check + 1 +056a 6fe0cbf4 fetch 1 ,mem_power_on_flag +056b 245a78cc ncall ui_timer_init ,blank +056c 704bf400 jam 0 ,mem_power_on_flag +056d 202078bc branch ui_timer_check + 1 p_le_enable_phy_by_pdata: -0570 18427e00 copy temp ,pdata -0571 c2801651 bbit1 bit_le_1m_phy ,le_enable -0572 c2808574 bbit1 bit_le_2m_phy ,p_le_enable_2m -0573 2020163c branch le_enable_phy_by_pdata + 5 +056e 18427e00 copy temp ,pdata +056f c2801651 bbit1 bit_le_1m_phy ,le_enable +0570 c2808572 bbit1 bit_le_2m_phy ,p_le_enable_2m +0571 2020163c branch le_enable_phy_by_pdata + 5 p_le_enable_2m: -0574 20401640 call le_enable_2m -0575 708a6d89 jam 0x89 ,core_rx_bq_cfg0 -0576 20600000 rtn +0572 20401640 call le_enable_2m +0573 708a6d89 jam 0x89 ,core_rx_bq_cfg0 +0574 20600000 rtn p_hid_rx_process: -0577 6fe10315 fetch 2 ,mem_l2cap_payload_ptr -0578 1fe20c00 copy pdata ,contr -0579 efe08006 ifetch 1 ,contr -057a 67e0c5f8 store 1 ,mem_l2cap_rcv_hidtype -057b 1fe1040f and pdata ,0x0f ,temp -057c 1ff1fe00 rshift4 pdata ,pdata -057d c004857f beq hid_type_set_idle ,p_hid_rx_process_handshake -057e 20204df1 branch hid_rx_process + 7 +0575 6fe10315 fetch 2 ,mem_l2cap_payload_ptr +0576 1fe20c00 copy pdata ,contr +0577 efe08006 ifetch 1 ,contr +0578 67e0c5f8 store 1 ,mem_l2cap_rcv_hidtype +0579 1fe1040f and pdata ,0x0f ,temp +057a 1ff1fe00 rshift4 pdata ,pdata +057b c004857d beq hid_type_set_idle ,p_hid_rx_process_handshake +057c 20204df1 branch hid_rx_process + 7 p_hid_rx_process_handshake: -057f da200001 arg 1 ,rega -0580 20404e1e call hid_malloc_tx_buff -0581 6fe144df fetch 2 ,mem_hid_ctrl_remote_cid -0582 e7e10005 istore 2 ,contw -0583 58000000 setarg 0 -0584 e7e08005 istore 1 ,contw -0585 70095001 jam 1 ,mem_ui_data_txbuff_length -0586 6fe0c4e5 fetch 1 ,mem_hid_control_state -0587 79207e06 set1 l2cap_channel_hid_handshake_done ,pdata -0588 67e0c4e5 store 1 ,mem_hid_control_state -0589 70095b12 jam bt_evt_hid_handshake ,mem_fifo_temp -058a 202078dc branch ui_ipc_send_event +057d da200001 arg 1 ,rega +057e 20404e1e call hid_malloc_tx_buff +057f 6fe144df fetch 2 ,mem_hid_ctrl_remote_cid +0580 e7e10005 istore 2 ,contw +0581 58000000 setarg 0 +0582 e7e08005 istore 1 ,contw +0583 70095001 jam 1 ,mem_ui_data_txbuff_length +0584 6fe0c4e5 fetch 1 ,mem_hid_control_state +0585 79207e06 set1 l2cap_channel_hid_handshake_done ,pdata +0586 67e0c4e5 store 1 ,mem_hid_control_state +0587 70095b12 jam bt_evt_hid_handshake ,mem_fifo_temp +0588 202078dc branch ui_ipc_send_event p_send_lmp: -058b 78547c00 disable user -058c 20405a44 call lmo_fifo_process -058d 6fe08048 fetch 1 ,mem_lmp_to_send -058e 207a0000 rtn blank -058f c283d78e bbit1 7 ,send_lmp_escape +0589 78547c00 disable user +058a 20405a44 call lmo_fifo_process +058b 6fe08048 fetch 1 ,mem_lmp_to_send +058c 207a0000 rtn blank +058d c283d78e bbit1 7 ,send_lmp_escape p_send_lmp0: -0590 c0038592 beq lmp_detach ,p_send_lmp_detach -0591 2020575f branch send_lmp0 +058e c0038590 beq lmp_detach ,p_send_lmp_detach +058f 2020575f branch send_lmp0 p_send_lmp_detach: -0592 204058bb call send_lmp_detach -0593 70007278 jam 120 ,mem_conn_timer -0594 20600000 rtn +0590 204058bb call send_lmp_detach +0591 70007278 jam 120 ,mem_conn_timer +0592 20600000 rtn p_parse_lmp_accepted: -0595 6fe080cf fetch 1 ,mem_rxbuf + 1 -0596 67e0839d store 1 ,mem_lmi_accepted_opcode -0597 c0098599 beq lmp_switch_req ,p_parse_lmp_accepted_switch -0598 202054c3 branch parse_lmp_accepted + 3 +0593 6fe080cf fetch 1 ,mem_rxbuf + 1 +0594 67e0839d store 1 ,mem_lmi_accepted_opcode +0595 c0098597 beq lmp_switch_req ,p_parse_lmp_accepted_switch +0596 202054c3 branch parse_lmp_accepted + 3 p_parse_lmp_accepted_switch: -0599 6fe080bc fetch 1 ,mem_connection_options -059a 793ffe02 set0 connection_switch ,pdata -059b 67e080bc store 1 ,mem_connection_options -059c 70095b20 jam bt_evt_switch_accept ,mem_fifo_temp -059d 204078dc call ui_ipc_send_event -059e 202009dd branch role_switch_prepare0 +0597 6fe080bc fetch 1 ,mem_connection_options +0598 793ffe02 set0 connection_switch ,pdata +0599 67e080bc store 1 ,mem_connection_options +059a 70095b20 jam bt_evt_switch_accept ,mem_fifo_temp +059b 204078dc call ui_ipc_send_event +059c 202009dd branch role_switch_prepare0 p_process_conn_sm: -059f 20405a3f call lmo_fifo_check -05a0 247a0000 nrtn blank +059d 20405a3f call lmo_fifo_check +059e 247a0000 nrtn blank p_process_conn_sm_continue: +059f 6fe08055 fetch 1 ,mem_conn_sm +05a0 207a0000 rtn blank 05a1 6fe08055 fetch 1 ,mem_conn_sm -05a2 207a0000 rtn blank -05a3 6fe08055 fetch 1 ,mem_conn_sm -05a4 c00205a6 beq conn_sm_send_conn_req ,p_host_create_conn_send_conn_req -05a5 20205aa3 branch process_conn_sm_continue + 2 +05a2 c00205a4 beq conn_sm_send_conn_req ,p_host_create_conn_send_conn_req +05a3 20205aa3 branch process_conn_sm_continue + 2 p_host_create_conn_send_conn_req: -05a6 70005505 jam conn_sm_wait_conn_accept ,mem_conn_sm -05a7 7003a6ff jam 0xfff ,mem_soft_timer -05a8 793f8022 set0 mark_reconn_recieve_switch ,mark -05a9 70007c33 jam lmp_host_connection_req ,mem_lmo_opcode2 -05aa 202053ee branch init_lmp_reinit +05a4 70005505 jam conn_sm_wait_conn_accept ,mem_conn_sm +05a5 7003a6ff jam 0xfff ,mem_soft_timer +05a6 793f8022 set0 mark_reconn_recieve_switch ,mark +05a7 70007c33 jam lmp_host_connection_req ,mem_lmo_opcode2 +05a8 202053ee branch init_lmp_reinit p_le_slave_match: -05ab 6fe0c3dd fetch 1 ,mem_le_md_count -05ac 1fe0fe01 pincrease 1 -05ad 67e0c3dd store 1 ,mem_le_md_count -05ae c0061606 beq le_md_max_count ,le_slave_cont -05af 204018c7 call le_acknowledge -05b0 20401916 call le_prepare_tx -05b1 6fe082bd fetch 1 ,mem_le_tx_phy -05b2 20401637 call le_enable_phy_by_pdata -05b3 204017e4 call le_transmit -05b4 20201601 branch le_slave_match + 10 +05a9 6fe0c3dd fetch 1 ,mem_le_md_count +05aa 1fe0fe01 pincrease 1 +05ab 67e0c3dd store 1 ,mem_le_md_count +05ac c0061606 beq le_md_max_count ,le_slave_cont +05ad 204018c7 call le_acknowledge +05ae 20401916 call le_prepare_tx +05af 6fe082bd fetch 1 ,mem_le_tx_phy +05b0 20401637 call le_enable_phy_by_pdata +05b1 204017e4 call le_transmit +05b2 20201601 branch le_slave_match + 10 p_le_slave_unsync: -05b5 20400e7c call end_of_packet -05b6 2020160d branch le_slave_unsync + 1 +05b3 20400e7c call end_of_packet +05b4 2020160d branch le_slave_unsync + 1 p_le_parse_l2cap: -05b7 efe10006 ifetch 2 ,contr -05b8 c00205ba beq le_l2cap_cid_att ,p_le_parse_att -05b9 20201990 branch le_parse_l2cap + 10 +05b5 efe10006 ifetch 2 ,contr +05b6 c00205b8 beq le_l2cap_cid_att ,p_le_parse_att +05b7 20201990 branch le_parse_l2cap + 10 p_le_parse_att: -05ba efe18006 ifetch 3 ,contr -05bb 67e1c436 store 3 ,mem_le_att_opcode -05bc c00505bf beq attop_read_request ,p_le_parse_att_read_request -05bd c00905ce beq attop_write_request ,p_le_parse_att_write_request -05be 20201c7f branch le_parse_att + 2 +05b8 efe18006 ifetch 3 ,contr +05b9 67e1c436 store 3 ,mem_le_att_opcode +05ba c00505bd beq attop_read_request ,p_le_parse_att_read_request +05bb c00905cc beq attop_write_request ,p_le_parse_att_write_request +05bc 20201c7f branch le_parse_att + 2 p_le_parse_att_read_request: -05bf 6fe44bbc fetch mouse_flag_len ,mem_mouse_flag -05c0 c31d9d93 bbit0 mouse_enable_le_battery_service_cancel ,le_parse_att_read_request -05c1 20401e39 call le_check_encrypt_state -05c2 68494437 fetcht 2 ,mem_le_att_handle -05c3 6fe0c3c0 fetch 1 ,mem_le_configuration -05c4 c28185c9 bbit1 bit_ble_read_auth ,p_le_send_att_read_response_check_auth +05bd 6fe44bbc fetch mouse_flag_len ,mem_mouse_flag +05be c31d9d93 bbit0 mouse_enable_le_battery_service_cancel ,le_parse_att_read_request +05bf 20401e39 call le_check_encrypt_state +05c0 68494437 fetcht 2 ,mem_le_att_handle +05c1 6fe0c3c0 fetch 1 ,mem_le_configuration +05c2 c28185c7 bbit1 bit_ble_read_auth ,p_le_send_att_read_response_check_auth p_le_send_att_read_response: -05c5 6fe14437 fetch 2 ,mem_le_att_handle -05c6 c0181e74 beq 0x30 ,le_send_att_error_response_notfound -05c7 68494437 fetcht 2 ,mem_le_att_handle -05c8 20201d97 branch le_send_att_read_response +05c3 6fe14437 fetch 2 ,mem_le_att_handle +05c4 c0181e74 beq 0x30 ,le_send_att_error_response_notfound +05c5 68494437 fetcht 2 ,mem_le_att_handle +05c6 20201d97 branch le_send_att_read_response p_le_send_att_read_response_check_auth: -05c9 6fe143d1 fetch 2 ,mem_le_pairing_handle -05ca 98467c00 isub temp ,null -05cb 242285c5 nbranch p_le_send_att_read_response ,zero -05cc 243405c5 nbranch p_le_send_att_read_response ,user -05cd 20201dbc branch le_send_att_read_response_error_insufficient_auth +05c7 6fe143d1 fetch 2 ,mem_le_pairing_handle +05c8 98467c00 isub temp ,null +05c9 242285c3 nbranch p_le_send_att_read_response ,zero +05ca 243405c3 nbranch p_le_send_att_read_response ,user +05cb 20201dbc branch le_send_att_read_response_error_insufficient_auth p_le_parse_att_write_request: -05ce 18c22200 copy contr ,rega -05cf 6fe143d4 fetch 2 ,mem_le_l2cap_size -05d0 1fe0a5fd add pdata ,-3 ,regb -05d1 204019d1 call le_writeatt_cb -05d2 6fe0cad2 fetch 1 ,mem_mouse_bluetooth_fast_conn_flag -05d3 c07f9e1f beq 0xff ,le_send_att_write_response_check_auth -05d4 6fe0cad8 fetch 1 ,mem_mouse_le_reconnect_flag -05d5 203a1e1f branch le_send_att_write_response_check_auth ,blank -05d6 6fe0cb86 fetch 1 ,mem_le_connect_status_flag -05d7 c2809e1f bbit1 ll_start_enc_flag ,le_send_att_write_response_check_auth -05d8 5800001a setarg 0x001a -05d9 68494437 fetcht 2 ,mem_le_att_handle -05da 98467c00 isub temp ,null -05db 24229e1f nbranch le_send_att_write_response_check_auth ,zero -05dc 20201dbc branch le_send_att_read_response_error_insufficient_auth +05cc 18c22200 copy contr ,rega +05cd 6fe143d4 fetch 2 ,mem_le_l2cap_size +05ce 1fe0a5fd add pdata ,-3 ,regb +05cf 204019d1 call le_writeatt_cb +05d0 6fe0cad2 fetch 1 ,mem_mouse_bluetooth_fast_conn_flag +05d1 c07f9e1f beq 0xff ,le_send_att_write_response_check_auth +05d2 6fe0cad8 fetch 1 ,mem_mouse_le_reconnect_flag +05d3 203a1e1f branch le_send_att_write_response_check_auth ,blank +05d4 6fe0cb86 fetch 1 ,mem_le_connect_status_flag +05d5 c2809e1f bbit1 ll_start_enc_flag ,le_send_att_write_response_check_auth +05d6 5800001a setarg 0x001a +05d7 68494437 fetcht 2 ,mem_le_att_handle +05d8 98467c00 isub temp ,null +05d9 24229e1f nbranch le_send_att_write_response_check_auth ,zero +05da 20201dbc branch le_send_att_read_response_error_insufficient_auth p_le_pairing_sm: -05dd 20401b24 call le_fifo_check_nearly_full -05de 247a0000 nrtn blank -05df 6fe0c39b fetch 1 ,mem_le_pairing_state -05e0 c00605e2 beq flag_le_paring_send_master_identification ,p_le_pairng_sm_send_master_indentification -05e1 2020202e branch le_pairing_sm + 4 +05db 20401b24 call le_fifo_check_nearly_full +05dc 247a0000 nrtn blank +05dd 6fe0c39b fetch 1 ,mem_le_pairing_state +05de c00605e0 beq flag_le_paring_send_master_identification ,p_le_pairng_sm_send_master_indentification +05df 2020202e branch le_pairing_sm + 4 p_le_pairng_sm_send_master_indentification: -05e2 6fe0c34f fetch 1 ,mem_le_preq_resp_key_distribution -05e3 6848c356 fetcht 1 ,mem_le_pres_resp_key_distribution -05e4 98417e00 iand temp ,pdata -05e5 2fec0001 isolate0 le_initator_irk_bit ,pdata -05e6 2020a05e branch le_parse_start_enc_rsp_after_auth_end ,true -05e7 70439b0d jam flag_le_paring_send_indentity_information ,mem_le_pairing_state +05e0 6fe0c34f fetch 1 ,mem_le_preq_resp_key_distribution +05e1 6848c356 fetcht 1 ,mem_le_pres_resp_key_distribution +05e2 98417e00 iand temp ,pdata +05e3 2fec0001 isolate0 le_initator_irk_bit ,pdata +05e4 2020a05e branch le_parse_start_enc_rsp_after_auth_end ,true +05e5 70439b0d jam flag_le_paring_send_indentity_information ,mem_le_pairing_state p_le_send_smp_identity_information: -05e8 18002211 force 17 ,rega -05e9 204020b6 call le_fifo_malloc_tx_l2cap_smp -05ea 58000008 setarg smp_identity_information -05eb e7e08005 istore 1 ,contw -05ec df200010 arg 16 ,loopcnt -05ed d8c04316 arg mem_le_ltk ,contr -05ee 20207dd4 branch memcpy +05e6 18002211 force 17 ,rega +05e7 204020b6 call le_fifo_malloc_tx_l2cap_smp +05e8 58000008 setarg smp_identity_information +05e9 e7e08005 istore 1 ,contw +05ea df200010 arg 16 ,loopcnt +05eb d8c04316 arg mem_le_ltk ,contr +05ec 20207dd4 branch memcpy p_mouse_motion: -05ef 78547c00 disable user -05f0 58000000 setarg 0 -05f1 67e348d5 store 6 ,mem_mouse_x -05f2 204005ff call p_mouse_check_sensor_data -05f3 58000089 setarg 0x0089 -05f4 20405d5e call twspi_write -05f5 2040042b call p_mouse_seting_sensor_type -05f6 20403fbe call mouse_zwheel -05f7 20403fc3 call mouse_t_zwheel -05f8 20400614 call p_mouse_key -05f9 6fe0c8d4 fetch 1 ,mem_mouse_key -05fa 1fe17e1f and_into 0x1f ,pdata -05fb 67e0c8d4 store 1 ,mem_mouse_key -05fc 24344766 nbranch mouse_drawing_optima_init ,user -05fd 2040060f call p_mouse_drawing_optima -05fe 20204584 branch mouse_no_data_timer_init +05ed 78547c00 disable user +05ee 58000000 setarg 0 +05ef 67e348d5 store 6 ,mem_mouse_x +05f0 204005fd call p_mouse_check_sensor_data +05f1 58000089 setarg 0x0089 +05f2 20405d5e call twspi_write +05f3 2040042b call p_mouse_seting_sensor_type +05f4 20403fbe call mouse_zwheel +05f5 20403fc3 call mouse_t_zwheel +05f6 20400612 call p_mouse_key +05f7 6fe0c8d4 fetch 1 ,mem_mouse_key +05f8 1fe17e1f and_into 0x1f ,pdata +05f9 67e0c8d4 store 1 ,mem_mouse_key +05fa 24344766 nbranch mouse_drawing_optima_init ,user +05fb 2040060d call p_mouse_drawing_optima +05fc 20204584 branch mouse_no_data_timer_init p_mouse_check_sensor_data: -05ff 6fe0c4ae fetch 1 ,mem_spi_write_flash_sm -0600 c1800000 rtnne flash_sm_no_buys -0601 6fe0c92c fetch 1 ,mem_config_sensor_type -0602 c0060605 beq ka5857 ,p_mouse_ka5857_sensor_motion -0603 c0058605 beq ka8g2 ,p_mouse_ka5857_sensor_motion -0604 20204283 branch mouse_check_sensor_data + 3 +05fd 6fe0c4ae fetch 1 ,mem_spi_write_flash_sm +05fe c1800000 rtnne flash_sm_no_buys +05ff 6fe0c92c fetch 1 ,mem_config_sensor_type +0600 c0060603 beq ka5857 ,p_mouse_ka5857_sensor_motion +0601 c0058603 beq ka8g2 ,p_mouse_ka5857_sensor_motion +0602 20204283 branch mouse_check_sensor_data + 3 p_mouse_ka5857_sensor_motion: -0605 20404304 call mouse_clear_sensor_data -0606 6fe0c915 fetch 1 ,mem_sensor_motion_gpio -0607 c07f860b beq gpio_disable ,p_mouse_ka5857_sensor_motion_1 -0608 6848c915 fetcht 1 ,mem_sensor_motion_gpio -0609 204060fd call gpio_get_bit -060a 24608000 nrtn true +0603 20404304 call mouse_clear_sensor_data +0604 6fe0c915 fetch 1 ,mem_sensor_motion_gpio +0605 c07f8609 beq gpio_disable ,p_mouse_ka5857_sensor_motion_1 +0606 6848c915 fetcht 1 ,mem_sensor_motion_gpio +0607 204060fd call gpio_get_bit +0608 24608000 nrtn true p_mouse_ka5857_sensor_motion_1: -060b 58000000 setarg pan_reg_pid_l -060c 20405d65 call twspi_read -060d c0ac41f2 bne pka8g2_id1 ,mouse_twspi_reset -060e 202042b9 branch mouse_p3212_sensor_motion_2 +0609 58000000 setarg pan_reg_pid_l +060a 20405d65 call twspi_read +060b c0ac41f2 bne pka8g2_id1 ,mouse_twspi_reset +060c 202042b9 branch mouse_p3212_sensor_motion_2 p_mouse_drawing_optima: -060f 6fe0c92c fetch 1 ,mem_config_sensor_type -0610 c1018000 rtneq p3212 -0611 c1058000 rtneq ka8g2 -0612 c1020000 rtneq p3065_xy -0613 20204758 branch mouse_drawing_optima +060d 6fe0c92c fetch 1 ,mem_config_sensor_type +060e c1018000 rtneq p3212 +060f c1058000 rtneq ka8g2 +0610 c1020000 rtneq p3065_xy +0611 20204758 branch mouse_drawing_optima p_mouse_key: -0614 20400617 call p_mouse_check_key_gpio -0615 2040064d call p_mouse_ghost_key_check -0616 2020411e branch mouse_key + 2 +0612 20400615 call p_mouse_check_key_gpio +0613 2040064b call p_mouse_ghost_key_check +0614 2020411e branch mouse_key + 2 p_mouse_check_key_gpio: -0617 6fe0cbf2 fetch 1 ,mem_sensor_shutdown_flag -0618 245a4161 ncall mouse_check_key_gpio_once ,blank -0619 da200000 arg 0 ,rega -061a 2040061e call p_mouse_check_lkey_gpio -061b 2040062d call p_mouse_check_bkkey_gpio -061c 2040063a call p_mouse_check_fwkey_gpio -061d 2020415e branch mouse_check_key_gpio_next +0615 6fe0cbf2 fetch 1 ,mem_sensor_shutdown_flag +0616 245a4161 ncall mouse_check_key_gpio_once ,blank +0617 da200000 arg 0 ,rega +0618 2040061c call p_mouse_check_lkey_gpio +0619 2040062b call p_mouse_check_bkkey_gpio +061a 20400638 call p_mouse_check_fwkey_gpio +061b 2020415e branch mouse_check_key_gpio_next p_mouse_check_lkey_gpio: -061e 6fe0c91c fetch 1 ,mem_lbutton_gpio -061f 20400647 call p_mouse_gpio_config_output_high -0620 20404164 call mouse_check_lkey_gpio -0621 6848c91c fetcht 1 ,mem_lbutton_gpio -0622 20403f96 call mouse_gpio_config_input_pu +061c 6fe0c91c fetch 1 ,mem_lbutton_gpio +061d 20400645 call p_mouse_gpio_config_output_high +061e 20404164 call mouse_check_lkey_gpio +061f 6848c91c fetcht 1 ,mem_lbutton_gpio +0620 20403f96 call mouse_gpio_config_input_pu p_mouse_check_rkey_gpio: -0623 6fe0c91d fetch 1 ,mem_rbutton_gpio -0624 20400647 call p_mouse_gpio_config_output_high -0625 2040416a call mouse_check_rkey_gpio -0626 6848c91d fetcht 1 ,mem_rbutton_gpio -0627 20403f96 call mouse_gpio_config_input_pu +0621 6fe0c91d fetch 1 ,mem_rbutton_gpio +0622 20400645 call p_mouse_gpio_config_output_high +0623 2040416a call mouse_check_rkey_gpio +0624 6848c91d fetcht 1 ,mem_rbutton_gpio +0625 20403f96 call mouse_gpio_config_input_pu p_mouse_check_mkey_gpio: -0628 6fe0c91e fetch 1 ,mem_mbutton_gpio -0629 20400647 call p_mouse_gpio_config_output_high -062a 20404170 call mouse_check_mkey_gpio -062b 6848c91e fetcht 1 ,mem_mbutton_gpio -062c 20203f96 branch mouse_gpio_config_input_pu +0626 6fe0c91e fetch 1 ,mem_mbutton_gpio +0627 20400645 call p_mouse_gpio_config_output_high +0628 20404170 call mouse_check_mkey_gpio +0629 6848c91e fetcht 1 ,mem_mbutton_gpio +062a 20203f96 branch mouse_gpio_config_input_pu p_mouse_check_bkkey_gpio: -062d 6fe0c911 fetch 1 ,mem_bk_button_gpio -062e c17f8000 rtneq gpio_disable -062f 704ba703 jam mouse_bk_key ,mem_mouse_key_temp -0630 6fe0cba2 fetch 1 ,mem_mouse_bkkey_press_status -0631 1fe22600 copy pdata ,regc -0632 6848c911 fetcht 1 ,mem_bk_button_gpio -0633 6fe0c914 fetch 1 ,mem_matrix_public_gpio -0634 c07f8636 beq gpio_disable ,p_mouse_3io6key_bk_check -0635 2020417e branch mouse_check_bkkey_gpio_next +062b 6fe0c911 fetch 1 ,mem_bk_button_gpio +062c c17f8000 rtneq gpio_disable +062d 704ba703 jam mouse_bk_key ,mem_mouse_key_temp +062e 6fe0cba2 fetch 1 ,mem_mouse_bkkey_press_status +062f 1fe22600 copy pdata ,regc +0630 6848c911 fetcht 1 ,mem_bk_button_gpio +0631 6fe0c914 fetch 1 ,mem_matrix_public_gpio +0632 c07f8634 beq gpio_disable ,p_mouse_3io6key_bk_check +0633 2020417e branch mouse_check_bkkey_gpio_next p_mouse_3io6key_bk_check: -0636 6fe0c911 fetch 1 ,mem_bk_button_gpio -0637 2040064a call p_mouse_gpio_config_output_low -0638 6848c911 fetcht 1 ,mem_bk_button_gpio -0639 2020418b branch mouse_3io6key_bk_check +0634 6fe0c911 fetch 1 ,mem_bk_button_gpio +0635 20400648 call p_mouse_gpio_config_output_low +0636 6848c911 fetcht 1 ,mem_bk_button_gpio +0637 2020418b branch mouse_3io6key_bk_check p_mouse_check_fwkey_gpio: -063a 6fe0c912 fetch 1 ,mem_fw_button_gpio -063b c17f8000 rtneq gpio_disable -063c 704ba704 jam mouse_fw_key ,mem_mouse_key_temp -063d 6fe0cba3 fetch 1 ,mem_mouse_fwkey_press_status -063e 1fe22600 copy pdata ,regc -063f 6848c912 fetcht 1 ,mem_fw_button_gpio -0640 6fe0c914 fetch 1 ,mem_matrix_public_gpio -0641 c07f8643 beq gpio_disable ,p_mouse_3io6key_fw_check -0642 20204197 branch mouse_check_fwkey_gpio_next +0638 6fe0c912 fetch 1 ,mem_fw_button_gpio +0639 c17f8000 rtneq gpio_disable +063a 704ba704 jam mouse_fw_key ,mem_mouse_key_temp +063b 6fe0cba3 fetch 1 ,mem_mouse_fwkey_press_status +063c 1fe22600 copy pdata ,regc +063d 6848c912 fetcht 1 ,mem_fw_button_gpio +063e 6fe0c914 fetch 1 ,mem_matrix_public_gpio +063f c07f8641 beq gpio_disable ,p_mouse_3io6key_fw_check +0640 20204197 branch mouse_check_fwkey_gpio_next p_mouse_3io6key_fw_check: -0643 6fe0c912 fetch 1 ,mem_fw_button_gpio -0644 2040064a call p_mouse_gpio_config_output_low -0645 6848c912 fetcht 1 ,mem_fw_button_gpio -0646 202041a4 branch mouse_3io6key_fw_check +0641 6fe0c912 fetch 1 ,mem_fw_button_gpio +0642 20400648 call p_mouse_gpio_config_output_low +0643 6848c912 fetcht 1 ,mem_fw_button_gpio +0644 202041a4 branch mouse_3io6key_fw_check p_mouse_gpio_config_output_high: -0647 c17f8000 rtneq gpio_disable -0648 d840003f arg gpcfg_output_high ,temp -0649 2020612c branch gpio_config_function_int +0645 c17f8000 rtneq gpio_disable +0646 d840003f arg gpcfg_output_high ,temp +0647 2020612c branch gpio_config_function_int p_mouse_gpio_config_output_low: -064a c17f8000 rtneq gpio_disable -064b d840003e arg gpcfg_output_low ,temp -064c 2020612c branch gpio_config_function_int +0648 c17f8000 rtneq gpio_disable +0649 d840003e arg gpcfg_output_low ,temp +064a 2020612c branch gpio_config_function_int p_mouse_ghost_key_check: -064d 704ba900 jam 0 ,mem_mouse_matrix_key_cow_count -064e 704baa00 jam 0 ,mem_mouse_matrix_key_row_count -064f 704bab00 jam 0 ,mem_mouse_ghost_flag -0650 1fe20400 copy pdata ,temp -0651 20400654 call p_mouse_ghost_key_check_l_bk -0652 20400657 call p_mouse_ghost_key_check_r_fw -0653 20204133 branch mouse_ghost_key_check + 6 +064b 704ba900 jam 0 ,mem_mouse_matrix_key_cow_count +064c 704baa00 jam 0 ,mem_mouse_matrix_key_row_count +064d 704bab00 jam 0 ,mem_mouse_ghost_flag +064e 1fe20400 copy pdata ,temp +064f 20400652 call p_mouse_ghost_key_check_l_bk +0650 20400655 call p_mouse_ghost_key_check_r_fw +0651 20204133 branch mouse_ghost_key_check + 6 p_mouse_ghost_key_check_l_bk: -0654 18417e09 and temp ,mouse_l_bk_button ,pdata -0655 c004c14e beq mouse_l_bk_button ,mouse_matrix_cow_more_than_one_key -0656 20600000 rtn +0652 18417e09 and temp ,mouse_l_bk_button ,pdata +0653 c004c14e beq mouse_l_bk_button ,mouse_matrix_cow_more_than_one_key +0654 20600000 rtn p_mouse_ghost_key_check_r_fw: -0657 18417e12 and temp ,mouse_r_fw_button ,pdata -0658 c009414e beq mouse_r_fw_button ,mouse_matrix_cow_more_than_one_key -0659 20600000 rtn +0655 18417e12 and temp ,mouse_r_fw_button ,pdata +0656 c009414e beq mouse_r_fw_button ,mouse_matrix_cow_more_than_one_key +0657 20600000 rtn org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AF/branch/mouse/YDN_Project/Multi_Mode/PB_3m_3ch_pair_G903-FS/program/patch.prog (revision 4431) +++ /YC1308AF/branch/mouse/YDN_Project/Multi_Mode/PB_3m_3ch_pair_G903-FS/program/patch.prog (working copy) @@ -2048,8 +2048,8 @@ branch g24_pair_init_param p_g24_lpm_wait: // ice connect led - fetch 1,mem_24g_device_led_status - nbranch disable_user,blank +// fetch 1,mem_24g_device_led_status +// nbranch disable_user,blank enable user call lpo_calibration fetch 3,mem_clks_per_lpo Index: sched/mouse.dat =================================================================== --- /YC1308AF/branch/mouse/YDN_Project/Multi_Mode/PB_3m_3ch_pair_G903-FS/sched/mouse.dat (revision 4431) +++ /YC1308AF/branch/mouse/YDN_Project/Multi_Mode/PB_3m_3ch_pair_G903-FS/sched/mouse.dat (working copy) @@ -1,6 +1,6 @@ mem_device_option:08 #08 mouse -mem_lpm_config:88 1f ce #4khz +mem_lpm_config:88 12 ce #4khz mem_fcomp_div:18 mem_rf_init_data:ff @@ -190,7 +190,7 @@ mem_store_information_delay_timer_init:01 #adc start -mem_adc_config_flag_init:01 #00-vinlpm 01-hvin 02-gpio +mem_adc_config_flag_init:02 #00-vinlpm 01-hvin 02-gpio mem_adc_channel:05 #00-gpio4 01-gpio5 02-gpio6 03-gpio7 04-gpio9 05-gpio10 06-gpio11 07-gpio12 mem_mouse_vdd_full_vol:0f 01 #1.5V a2 00#mem_mouse_vdd_empty_vol :0.9V @@ -211,7 +211,7 @@ mem_lpm_mult_init:20 mem_app_connection_options:06 -mem_lap:2d 04 f4 96 08 53 +mem_lap:10 04 04 96 08 53 mem_local_name_length: 'BT3.0 Mouse mem_sniff_param_interval: @@ -467,7 +467,7 @@ mem_24g_pair_addr:20 15 10 05 mem_24g_pair_ch:4a mem_24g_fast_conn_enable:01 -mem_24g_fast_conn_addr:0e 0e 0e 0e +mem_24g_fast_conn_addr:0f 0f 0f 0f mem_24g_short_sleep_set:0c f8 00 mem_24g_long_sleep_set:00 77 01 mem_24g_enter_hibernate:00 48 60