Index: output/eeprom.dat =================================================================== --- /YC1308AF/branch/mouse/mouse_public_4mode_usb _1M/output/eeprom.dat (revision 3565) +++ /YC1308AF/branch/mouse/mouse_public_4mode_usb _1M/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -2a +1e 15 c2 84 @@ -2795,7 +2795,7 @@ 20 40 05 -19 +16 20 60 00 @@ -5066,8 +5066,8 @@ f2 20 20 -05 -02 +04 +ff 6f e0 c9 @@ -5117,21 +5117,9 @@ 63 21 20 -40 -47 -66 20 -40 02 -68 -78 -55 -fc -00 -20 -20 -3c -7f +40 6f e0 c9 @@ -5263,7 +5251,7 @@ 20 20 05 -23 +20 6f f0 8c @@ -5279,7 +5267,7 @@ c3 0a 85 -29 +26 6f e0 cb @@ -5287,7 +5275,7 @@ c0 00 85 -2f +2c 20 40 37 @@ -5319,7 +5307,7 @@ 20 3a 05 -3a +37 6f e4 4b @@ -5335,11 +5323,11 @@ c0 01 85 -3c +39 c0 01 05 -43 +40 20 40 37 @@ -5363,7 +5351,7 @@ 20 20 05 -32 +2f 20 40 37 @@ -5420,8 +5408,8 @@ 60 00 00 -b6 -a3 +59 +3e aa 55 40 @@ -6821,8 +6809,20 @@ 55 8b a1 -0d -9d +d5 +d7 +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff ff ff ff @@ -8189,4 +8189,4 @@ ff ff a4 -34 +f4 Index: output/program.lis =================================================================== --- /YC1308AF/branch/mouse/mouse_public_4mode_usb _1M/output/program.lis (revision 3565) +++ /YC1308AF/branch/mouse/mouse_public_4mode_usb _1M/output/program.lis (working copy) @@ -959,7 +959,7 @@ 02b6 20404714 call mouse_bt_button_check 02b7 20403fc8 call mouse_wheel_check 02b8 204004e8 call p_mouse_usb_isr -02b9 20400519 call p_mouse_usb_mode +02b9 20400516 call p_mouse_usb_mode 02ba 20600000 rtn p_mouse_select_device_check: @@ -1733,7 +1733,7 @@ 04ee 68488b58 fetcht 1 ,mem_usb_offline_check_gpio 04ef 204060fd call gpio_get_bit 04f0 242084f2 nbranch p_mouse_usb_gpio_low ,true -04f1 20200502 branch p_mouse_usb_gpio_high +04f1 202004ff branch p_mouse_usb_gpio_high p_mouse_usb_gpio_low: 04f2 6fe0c930 fetch 1 ,mem_mouse_usb_vdd_status @@ -1748,100 +1748,97 @@ 04fb 67f10050 store 2 ,core_clkoff 04fc 70409901 jam 1 ,mem_lpm_mode 04fd 20406321 call select_system_clk_12m_dpll -04fe 20404766 call mouse_drawing_optima_init -04ff 20400268 call p_mouse_sensor_powerdown -0500 7855fc00 disable wake -0501 20203c7f branch mouse_init_wireless +04fe 20200240 branch p_mouse_soft_reset p_mouse_usb_gpio_high: -0502 6fe0c930 fetch 1 ,mem_mouse_usb_vdd_status -0503 c12d0000 rtneq mouse_usb_interface_insert -0504 7049305a jam mouse_usb_interface_insert ,mem_mouse_usb_vdd_status -0505 58000000 setarg 0 -0506 67e14887 store 2 ,mem_24g_pair_timeout -0507 67e1488b store 2 ,mem_24g_reconn_timeout -0508 704caf01 jam 1 ,mem_usb_mode_enable -0509 204001ce call p_mouse_multi_led_blink_disable -050a 70409900 jam 0 ,mem_lpm_mode -050b 204004d6 call p_select_system_clk_24m_dpll -050c 20404831 call mouse_24g_stop -050d 20400042 call p_mouse_stop_bluetooth_mode -050e 7855fc00 disable wake -050f 2040430a call mouse_init_sensor_reset -0510 580004aa setarg p_mouse_usb_config_param -0511 67e10b45 store 2 ,mem_cb_usb_config -0512 6fe0cc87 fetch 1 ,mem_usb_tx_interval_retention -0513 67e08b47 store 1 ,mem_usb_tx_interval -0514 d8c04c88 arg mem_usb_vid_pid_retention ,contr -0515 d8a00b48 arg mem_usb_vid_pid ,contw -0516 df200009 arg 9 ,loopcnt -0517 20407dd4 call memcpy -0518 20207a08 branch usb_init +04ff 6fe0c930 fetch 1 ,mem_mouse_usb_vdd_status +0500 c12d0000 rtneq mouse_usb_interface_insert +0501 7049305a jam mouse_usb_interface_insert ,mem_mouse_usb_vdd_status +0502 58000000 setarg 0 +0503 67e14887 store 2 ,mem_24g_pair_timeout +0504 67e1488b store 2 ,mem_24g_reconn_timeout +0505 704caf01 jam 1 ,mem_usb_mode_enable +0506 204001ce call p_mouse_multi_led_blink_disable +0507 70409900 jam 0 ,mem_lpm_mode +0508 204004d6 call p_select_system_clk_24m_dpll +0509 20404831 call mouse_24g_stop +050a 20400042 call p_mouse_stop_bluetooth_mode +050b 7855fc00 disable wake +050c 2040430a call mouse_init_sensor_reset +050d 580004aa setarg p_mouse_usb_config_param +050e 67e10b45 store 2 ,mem_cb_usb_config +050f 6fe0cc87 fetch 1 ,mem_usb_tx_interval_retention +0510 67e08b47 store 1 ,mem_usb_tx_interval +0511 d8c04c88 arg mem_usb_vid_pid_retention ,contr +0512 d8a00b48 arg mem_usb_vid_pid ,contw +0513 df200009 arg 9 ,loopcnt +0514 20407dd4 call memcpy +0515 20207a08 branch usb_init p_mouse_usb_mode: -0519 6fe44bbc fetch mouse_flag_len ,mem_mouse_flag -051a c4068000 rtnbit0 mouse_enable_usb -051b 6ff08c02 fetch 1 ,core_usb_addr -051c 67e0c92f store 1 ,mem_usb_addr -051d c4038000 rtnbit0 7 -051e 204004c1 call p_usb_timer_check -051f 24740000 nrtn user -0520 20403fb0 call mouse_motion -0521 24740000 nrtn user -0522 20200523 branch p_mouse_push_data_to_usb +0516 6fe44bbc fetch mouse_flag_len ,mem_mouse_flag +0517 c4068000 rtnbit0 mouse_enable_usb +0518 6ff08c02 fetch 1 ,core_usb_addr +0519 67e0c92f store 1 ,mem_usb_addr +051a c4038000 rtnbit0 7 +051b 204004c1 call p_usb_timer_check +051c 24740000 nrtn user +051d 20403fb0 call mouse_motion +051e 24740000 nrtn user +051f 20200520 branch p_mouse_push_data_to_usb p_mouse_push_data_to_usb: -0523 6ff08c02 fetch 1 ,core_usb_addr -0524 c4038000 rtnbit0 7 -0525 6fe44bbc fetch mouse_flag_len ,mem_mouse_flag -0526 c30a8529 bbit0 mouse_enable_keyboard ,p_mouse_push_mouse_data_to_usb -0527 6fe0cb9c fetch 1 ,mem_customer_key -0528 c000852f beq 1 ,p_mouse_push_keyboard_data_to_usb +0520 6ff08c02 fetch 1 ,core_usb_addr +0521 c4038000 rtnbit0 7 +0522 6fe44bbc fetch mouse_flag_len ,mem_mouse_flag +0523 c30a8526 bbit0 mouse_enable_keyboard ,p_mouse_push_mouse_data_to_usb +0524 6fe0cb9c fetch 1 ,mem_customer_key +0525 c000852c beq 1 ,p_mouse_push_keyboard_data_to_usb p_mouse_push_mouse_data_to_usb: -0529 2040370f call dongle_usb_tx_ms_data -052a 58000001 setarg ms_report_id -052b 67e08bff store 1 ,mem_usb_mouse_data -052c 6fe3c8d4 fetch 7 ,mem_mouse_key -052d e7e38005 istore 7 ,contw -052e 20600000 rtn +0526 2040370f call dongle_usb_tx_ms_data +0527 58000001 setarg ms_report_id +0528 67e08bff store 1 ,mem_usb_mouse_data +0529 6fe3c8d4 fetch 7 ,mem_mouse_key +052a e7e38005 istore 7 ,contw +052b 20600000 rtn p_mouse_push_keyboard_data_to_usb: -052f 6fe0cb9d fetch 1 ,mem_customer_data_trigger -0530 203a053a branch p_mouse_push_release_keyboard_data_to_usb ,blank -0531 6fe44bde fetch 8 ,mem_customer_key_press + 1 +052c 6fe0cb9d fetch 1 ,mem_customer_data_trigger +052d 203a0537 branch p_mouse_push_release_keyboard_data_to_usb ,blank +052e 6fe44bde fetch 8 ,mem_customer_key_press + 1 p_mouse_push_keyboard_package_data_to_usb: -0532 67e4095c store 8 ,mem_pdatatemp -0533 6fe0cbdd fetch 1 ,mem_customer_key_press -0534 c001853c beq kb_multikey_report_id ,p_mouse_push_multimedia_key_data_to_usb -0535 c0010543 beq kb_system_conctrl_report_id ,p_mouse_push_systemctrl_key_data_to_usb -0536 2040371d call dongle_usb_tx_kb_data -0537 6fe4095c fetch 8 ,mem_pdatatemp -0538 67e40c0f store 8 ,mem_usb_kb_data -0539 20600000 rtn +052f 67e4095c store 8 ,mem_pdatatemp +0530 6fe0cbdd fetch 1 ,mem_customer_key_press +0531 c0018539 beq kb_multikey_report_id ,p_mouse_push_multimedia_key_data_to_usb +0532 c0010540 beq kb_system_conctrl_report_id ,p_mouse_push_systemctrl_key_data_to_usb +0533 2040371d call dongle_usb_tx_kb_data +0534 6fe4095c fetch 8 ,mem_pdatatemp +0535 67e40c0f store 8 ,mem_usb_kb_data +0536 20600000 rtn p_mouse_push_release_keyboard_data_to_usb: -053a 6fe44be7 fetch 8 ,mem_customer_key_release + 1 -053b 20200532 branch p_mouse_push_keyboard_package_data_to_usb +0537 6fe44be7 fetch 8 ,mem_customer_key_release + 1 +0538 2020052f branch p_mouse_push_keyboard_package_data_to_usb p_mouse_push_multimedia_key_data_to_usb: -053c 20403710 call dongle_usb_tx_enable_ep2 -053d 700bf821 jam usb_ep2_multikey ,mem_usb_ep2_data -053e 58000003 setarg kb_multikey_report_id -053f 67e08c1f store 1 ,mem_usb_kb_multikey -0540 6fe1095c fetch 2 ,mem_pdatatemp -0541 e7e10005 istore 2 ,contw -0542 20600000 rtn +0539 20403710 call dongle_usb_tx_enable_ep2 +053a 700bf821 jam usb_ep2_multikey ,mem_usb_ep2_data +053b 58000003 setarg kb_multikey_report_id +053c 67e08c1f store 1 ,mem_usb_kb_multikey +053d 6fe1095c fetch 2 ,mem_pdatatemp +053e e7e10005 istore 2 ,contw +053f 20600000 rtn p_mouse_push_systemctrl_key_data_to_usb: -0543 20403710 call dongle_usb_tx_enable_ep2 -0544 700bf822 jam usb_ep2_systemkey ,mem_usb_ep2_data -0545 58000002 setarg kb_system_conctrl_report_id -0546 67e08c2f store 1 ,mem_usb_kb_system -0547 6fe0895c fetch 1 ,mem_pdatatemp -0548 e7e08005 istore 1 ,contw -0549 20600000 rtn +0540 20403710 call dongle_usb_tx_enable_ep2 +0541 700bf822 jam usb_ep2_systemkey ,mem_usb_ep2_data +0542 58000002 setarg kb_system_conctrl_report_id +0543 67e08c2f store 1 ,mem_usb_kb_system +0544 6fe0895c fetch 1 ,mem_pdatatemp +0545 e7e08005 istore 1 ,contw +0546 20600000 rtn org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AF/branch/mouse/mouse_public_4mode_usb _1M/program/patch.prog (revision 3565) +++ /YC1308AF/branch/mouse/mouse_public_4mode_usb _1M/program/patch.prog (working copy) @@ -2149,10 +2149,11 @@ store 2,core_clkoff jam 1,mem_lpm_mode call select_system_clk_12M_dpll - call mouse_drawing_optima_init - call p_mouse_sensor_powerdown - disable wake //using for mouse_init_sensor_reset - branch mouse_init_wireless + branch p_mouse_soft_reset +// call mouse_drawing_optima_init +// call p_mouse_sensor_powerdown +// disable wake //using for mouse_init_sensor_reset +// branch mouse_init_wireless p_mouse_usb_gpio_high: fetch 1,mem_mouse_usb_vdd_status