Index: output/eeprom.dat =================================================================== --- /YC1308AF/branch/mouse/mouse_public_4mode_usb/output/eeprom.dat (revision 3216) +++ /YC1308AF/branch/mouse/mouse_public_4mode_usb/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -8e +82 19 c2 84 @@ -3807,7 +3807,7 @@ 20 40 06 -32 +2f 20 60 00 @@ -6203,7 +6203,7 @@ 20 20 06 -1d +1a 6f e0 c9 @@ -6249,21 +6249,9 @@ 63 21 20 -40 -47 -66 20 -40 03 -68 -78 -55 -fc -00 -20 -20 -3c -7f +40 6f e0 c9 @@ -6387,7 +6375,7 @@ 20 20 06 -3c +39 6f f0 8c @@ -6403,7 +6391,7 @@ c3 0a 86 -42 +3f 6f e0 cb @@ -6411,7 +6399,7 @@ c0 00 86 -48 +45 20 40 37 @@ -6443,7 +6431,7 @@ 20 3a 06 -53 +50 6f e4 4b @@ -6459,11 +6447,11 @@ c0 01 86 -55 +52 c0 01 06 -5c +59 20 40 37 @@ -6487,7 +6475,7 @@ 20 20 06 -4b +48 20 40 37 @@ -6544,8 +6532,8 @@ 60 00 00 -12 -15 +80 +47 aa 55 40 @@ -7936,8 +7924,8 @@ 55 34 9f -aa -f5 +35 +f3 ff ff ff @@ -8188,5 +8176,17 @@ ff ff ff -93 -14 +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +5f +35 Index: output/program.lis =================================================================== --- /YC1308AF/branch/mouse/mouse_public_4mode_usb/output/program.lis (revision 3216) +++ /YC1308AF/branch/mouse/mouse_public_4mode_usb/output/program.lis (working copy) @@ -1274,7 +1274,7 @@ 03b3 20404714 call mouse_bt_button_check 03b4 20403fc8 call mouse_wheel_check 03b5 20400604 call p_mouse_usb_isr -03b6 20400632 call p_mouse_usb_mode +03b6 2040062f call p_mouse_usb_mode 03b7 20600000 rtn p_mouse_dpi_check: @@ -2097,7 +2097,7 @@ 060a 68488b58 fetcht 1 ,mem_usb_offline_check_gpio 060b 204060fd call gpio_get_bit 060c 2420860e nbranch p_mouse_usb_gpio_low ,true -060d 2020061d branch p_mouse_usb_gpio_high +060d 2020061a branch p_mouse_usb_gpio_high p_mouse_usb_gpio_low: 060e 6fe0c930 fetch 1 ,mem_mouse_usb_vdd_status @@ -2111,98 +2111,95 @@ 0616 67f10050 store 2 ,core_clkoff 0617 70409901 jam 1 ,mem_lpm_mode 0618 20406321 call select_system_clk_12m_dpll -0619 20404766 call mouse_drawing_optima_init -061a 20400368 call p_mouse_sensor_powerdown -061b 7855fc00 disable wake -061c 20203c7f branch mouse_init_wireless +0619 20200340 branch p_mouse_soft_reset p_mouse_usb_gpio_high: -061d 6fe0c930 fetch 1 ,mem_mouse_usb_vdd_status -061e c12d0000 rtneq mouse_usb_interface_insert -061f 7049305a jam mouse_usb_interface_insert ,mem_mouse_usb_vdd_status -0620 58000000 setarg 0 -0621 67e14887 store 2 ,mem_24g_pair_timeout -0622 67e1488b store 2 ,mem_24g_reconn_timeout -0623 70409900 jam 0 ,mem_lpm_mode -0624 204005f2 call p_select_system_clk_24m_dpll -0625 20404831 call mouse_24g_stop -0626 20404356 call mouse_stop_bluetooth_mode -0627 7855fc00 disable wake -0628 2040430a call mouse_init_sensor_reset -0629 580005c6 setarg p_mouse_usb_config_param -062a 67e10b45 store 2 ,mem_cb_usb_config -062b 6fe0cc87 fetch 1 ,mem_usb_tx_interval_retention -062c 67e08b47 store 1 ,mem_usb_tx_interval -062d d8c04c88 arg mem_usb_vid_pid_retention ,contr -062e d8a00b48 arg mem_usb_vid_pid ,contw -062f df200009 arg 9 ,loopcnt -0630 20407dd4 call memcpy -0631 20207a08 branch usb_init +061a 6fe0c930 fetch 1 ,mem_mouse_usb_vdd_status +061b c12d0000 rtneq mouse_usb_interface_insert +061c 7049305a jam mouse_usb_interface_insert ,mem_mouse_usb_vdd_status +061d 58000000 setarg 0 +061e 67e14887 store 2 ,mem_24g_pair_timeout +061f 67e1488b store 2 ,mem_24g_reconn_timeout +0620 70409900 jam 0 ,mem_lpm_mode +0621 204005f2 call p_select_system_clk_24m_dpll +0622 20404831 call mouse_24g_stop +0623 20404356 call mouse_stop_bluetooth_mode +0624 7855fc00 disable wake +0625 2040430a call mouse_init_sensor_reset +0626 580005c6 setarg p_mouse_usb_config_param +0627 67e10b45 store 2 ,mem_cb_usb_config +0628 6fe0cc87 fetch 1 ,mem_usb_tx_interval_retention +0629 67e08b47 store 1 ,mem_usb_tx_interval +062a d8c04c88 arg mem_usb_vid_pid_retention ,contr +062b d8a00b48 arg mem_usb_vid_pid ,contw +062c df200009 arg 9 ,loopcnt +062d 20407dd4 call memcpy +062e 20207a08 branch usb_init p_mouse_usb_mode: -0632 6fe44bbc fetch mouse_flag_len ,mem_mouse_flag -0633 c4068000 rtnbit0 mouse_enable_usb -0634 6ff08c02 fetch 1 ,core_usb_addr -0635 67e0c92f store 1 ,mem_usb_addr -0636 c4038000 rtnbit0 7 -0637 204005dd call p_usb_timer_check -0638 24740000 nrtn user -0639 20403fb0 call mouse_motion -063a 24740000 nrtn user -063b 2020063c branch p_mouse_push_data_to_usb +062f 6fe44bbc fetch mouse_flag_len ,mem_mouse_flag +0630 c4068000 rtnbit0 mouse_enable_usb +0631 6ff08c02 fetch 1 ,core_usb_addr +0632 67e0c92f store 1 ,mem_usb_addr +0633 c4038000 rtnbit0 7 +0634 204005dd call p_usb_timer_check +0635 24740000 nrtn user +0636 20403fb0 call mouse_motion +0637 24740000 nrtn user +0638 20200639 branch p_mouse_push_data_to_usb p_mouse_push_data_to_usb: -063c 6ff08c02 fetch 1 ,core_usb_addr -063d c4038000 rtnbit0 7 -063e 6fe44bbc fetch mouse_flag_len ,mem_mouse_flag -063f c30a8642 bbit0 mouse_enable_keyboard ,p_mouse_push_mouse_data_to_usb -0640 6fe0cb9c fetch 1 ,mem_customer_key -0641 c0008648 beq 1 ,p_mouse_push_keyboard_data_to_usb +0639 6ff08c02 fetch 1 ,core_usb_addr +063a c4038000 rtnbit0 7 +063b 6fe44bbc fetch mouse_flag_len ,mem_mouse_flag +063c c30a863f bbit0 mouse_enable_keyboard ,p_mouse_push_mouse_data_to_usb +063d 6fe0cb9c fetch 1 ,mem_customer_key +063e c0008645 beq 1 ,p_mouse_push_keyboard_data_to_usb p_mouse_push_mouse_data_to_usb: -0642 2040370f call dongle_usb_tx_ms_data -0643 58000001 setarg ms_report_id -0644 67e08bff store 1 ,mem_usb_mouse_data -0645 6fe3c8d4 fetch 7 ,mem_mouse_key -0646 e7e38005 istore 7 ,contw -0647 20600000 rtn +063f 2040370f call dongle_usb_tx_ms_data +0640 58000001 setarg ms_report_id +0641 67e08bff store 1 ,mem_usb_mouse_data +0642 6fe3c8d4 fetch 7 ,mem_mouse_key +0643 e7e38005 istore 7 ,contw +0644 20600000 rtn p_mouse_push_keyboard_data_to_usb: -0648 6fe0cb9d fetch 1 ,mem_customer_data_trigger -0649 203a0653 branch p_mouse_push_release_keyboard_data_to_usb ,blank -064a 6fe44bde fetch 8 ,mem_customer_key_press + 1 +0645 6fe0cb9d fetch 1 ,mem_customer_data_trigger +0646 203a0650 branch p_mouse_push_release_keyboard_data_to_usb ,blank +0647 6fe44bde fetch 8 ,mem_customer_key_press + 1 p_mouse_push_keyboard_package_data_to_usb: -064b 67e4095c store 8 ,mem_pdatatemp -064c 6fe0cbdd fetch 1 ,mem_customer_key_press -064d c0018655 beq kb_multikey_report_id ,p_mouse_push_multimedia_key_data_to_usb -064e c001065c beq kb_system_conctrl_report_id ,p_mouse_push_systemctrl_key_data_to_usb -064f 2040371d call dongle_usb_tx_kb_data -0650 6fe4095c fetch 8 ,mem_pdatatemp -0651 67e40c0f store 8 ,mem_usb_kb_data -0652 20600000 rtn +0648 67e4095c store 8 ,mem_pdatatemp +0649 6fe0cbdd fetch 1 ,mem_customer_key_press +064a c0018652 beq kb_multikey_report_id ,p_mouse_push_multimedia_key_data_to_usb +064b c0010659 beq kb_system_conctrl_report_id ,p_mouse_push_systemctrl_key_data_to_usb +064c 2040371d call dongle_usb_tx_kb_data +064d 6fe4095c fetch 8 ,mem_pdatatemp +064e 67e40c0f store 8 ,mem_usb_kb_data +064f 20600000 rtn p_mouse_push_release_keyboard_data_to_usb: -0653 6fe44be7 fetch 8 ,mem_customer_key_release + 1 -0654 2020064b branch p_mouse_push_keyboard_package_data_to_usb +0650 6fe44be7 fetch 8 ,mem_customer_key_release + 1 +0651 20200648 branch p_mouse_push_keyboard_package_data_to_usb p_mouse_push_multimedia_key_data_to_usb: -0655 20403710 call dongle_usb_tx_enable_ep2 -0656 700bf821 jam usb_ep2_multikey ,mem_usb_ep2_data -0657 58000003 setarg kb_multikey_report_id -0658 67e08c1f store 1 ,mem_usb_kb_multikey -0659 6fe1095c fetch 2 ,mem_pdatatemp -065a e7e10005 istore 2 ,contw -065b 20600000 rtn +0652 20403710 call dongle_usb_tx_enable_ep2 +0653 700bf821 jam usb_ep2_multikey ,mem_usb_ep2_data +0654 58000003 setarg kb_multikey_report_id +0655 67e08c1f store 1 ,mem_usb_kb_multikey +0656 6fe1095c fetch 2 ,mem_pdatatemp +0657 e7e10005 istore 2 ,contw +0658 20600000 rtn p_mouse_push_systemctrl_key_data_to_usb: -065c 20403710 call dongle_usb_tx_enable_ep2 -065d 700bf822 jam usb_ep2_systemkey ,mem_usb_ep2_data -065e 58000002 setarg kb_system_conctrl_report_id -065f 67e08c2f store 1 ,mem_usb_kb_system -0660 6fe0895c fetch 1 ,mem_pdatatemp -0661 e7e08005 istore 1 ,contw -0662 20600000 rtn +0659 20403710 call dongle_usb_tx_enable_ep2 +065a 700bf822 jam usb_ep2_systemkey ,mem_usb_ep2_data +065b 58000002 setarg kb_system_conctrl_report_id +065c 67e08c2f store 1 ,mem_usb_kb_system +065d 6fe0895c fetch 1 ,mem_pdatatemp +065e e7e08005 istore 1 ,contw +065f 20600000 rtn org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AF/branch/mouse/mouse_public_4mode_usb/program/patch.prog (revision 3216) +++ /YC1308AF/branch/mouse/mouse_public_4mode_usb/program/patch.prog (working copy) @@ -2526,10 +2526,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