Index: output/eeprom.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_Only24g_New_LRpair/output/eeprom.dat (revision 2896) +++ /branch/mouse_project/YJX_Project/YJX_Only24g_New_LRpair/output/eeprom.dat (working copy) @@ -15,11 +15,11 @@ c0 00 80 -13 +15 c0 01 00 -1b +1d c0 42 84 @@ -39,11 +39,11 @@ c0 59 00 -24 +26 c0 62 00 -f2 +f4 c0 71 82 @@ -68,6 +68,14 @@ 20 2a 8e +70 +89 +5b +86 +70 +89 +5c +a0 68 10 81 @@ -143,7 +151,7 @@ 20 3a 00 -1e +20 20 20 20 @@ -159,11 +167,11 @@ c2 80 80 -3a +3c c2 81 00 -5a +5c 68 00 cd @@ -171,7 +179,7 @@ c0 00 80 -68 +6a 20 40 03 @@ -179,7 +187,7 @@ 24 34 00 -83 +85 20 40 03 @@ -219,7 +227,7 @@ 20 40 00 -8e +90 24 74 00 @@ -227,7 +235,7 @@ 20 40 00 -ef +f1 58 00 f8 @@ -279,11 +287,11 @@ 20 22 80 -47 +49 20 40 00 -54 +56 24 74 00 @@ -335,11 +343,11 @@ 20 42 80 -58 +5a 20 20 00 -63 +65 68 00 cc @@ -431,7 +439,7 @@ 20 40 00 -7d +7f 68 01 4d @@ -455,11 +463,11 @@ 20 42 80 -72 +74 20 20 00 -2a +2c 70 4d 5f @@ -503,7 +511,7 @@ 20 20 00 -79 +7b 68 00 cc @@ -519,11 +527,11 @@ c0 02 00 -7b +7d c0 02 80 -77 +79 20 60 00 @@ -535,7 +543,7 @@ 20 5a 00 -a3 +a5 68 00 cd @@ -547,11 +555,11 @@ 20 40 00 -b4 +b6 20 40 00 -8e +90 24 74 00 @@ -607,11 +615,11 @@ 20 40 00 -a0 +a2 20 40 00 -ef +f1 20 40 3e @@ -711,7 +719,7 @@ 20 20 00 -2d +2f 58 00 00 @@ -783,7 +791,7 @@ 24 21 00 -c8 +ca 20 40 04 @@ -795,15 +803,15 @@ 24 2c 00 -ce +d0 24 37 80 -ce +d0 20 40 00 -d8 +da 20 40 03 @@ -823,7 +831,7 @@ c0 08 00 -d0 +d2 20 60 00 @@ -835,7 +843,7 @@ 20 20 00 -be +c0 70 4d 69 @@ -875,7 +883,7 @@ 20 3a 00 -b1 +b3 70 4d 69 @@ -935,7 +943,7 @@ 20 20 00 -e3 +e5 c6 13 00 @@ -943,7 +951,7 @@ 20 40 00 -96 +98 68 00 c0 @@ -951,7 +959,7 @@ c3 00 00 -ef +f1 68 00 80 @@ -972,14 +980,6 @@ 60 00 00 -70 -89 -5b -86 -70 -89 -5c -a0 20 40 34 @@ -1287,7 +1287,7 @@ 24 22 80 -e3 +e5 58 00 00 @@ -1303,7 +1303,7 @@ 24 22 80 -e3 +e5 58 00 00 @@ -1319,7 +1319,7 @@ 24 22 80 -e3 +e5 70 46 e0 @@ -1571,7 +1571,7 @@ 20 40 00 -e0 +e2 20 20 01 @@ -1623,7 +1623,7 @@ 58 00 00 -e9 +eb 60 01 41 @@ -1807,7 +1807,7 @@ 20 40 00 -e0 +e2 d8 e0 00 @@ -1895,7 +1895,7 @@ 20 40 00 -e0 +e2 20 40 3f @@ -1939,7 +1939,7 @@ 20 40 00 -98 +9a 68 08 c6 @@ -3463,7 +3463,7 @@ 20 20 00 -e0 +e2 70 4c 28 @@ -7340,8 +7340,8 @@ 60 00 00 -00 -35 +d2 +0b aa 55 08 @@ -7785,7 +7785,7 @@ 00 95 4b -05 +06 00 aa 55 @@ -7860,8 +7860,8 @@ 0f 0f 0f -60 -71 +65 +12 ff ff ff Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_Only24g_New_LRpair/output/program.lis (revision 2896) +++ /branch/mouse_project/YJX_Project/YJX_Only24g_New_LRpair/output/program.lis (working copy) @@ -2,14 +2,14 @@ org 0x0000 0000 c284000d bbit1 8 ,pf_patch_ext 0001 c0000010 beq patch00_0 ,p_soft_reset -0002 c0008013 beq patch00_1 ,p_soft_reset_1 -0003 c001001b beq patch00_2 ,p_soft_reset_2 +0002 c0008015 beq patch00_1 ,p_soft_reset_1 +0003 c001001d beq patch00_2 ,p_soft_reset_2 0004 c0428491 beq patch10_5 ,p_shutdown_radio 0005 c0448464 beq patch11_1 ,p_set_freq_tx 0006 c0450493 beq patch11_2 ,p_initialize_radio_cont 0007 c0538496 beq patch14_7 ,p_lpm_dispatch -0008 c0590024 beq patch16_2 ,p_g24_dispatch -0009 c06200f2 beq patch18_4 ,p_device_init +0008 c0590026 beq patch16_2 ,p_g24_dispatch +0009 c06200f4 beq patch18_4 ,p_device_init 000a c071828c beq patch1c_3 ,p_mouse_seting_dpi 000b c0730208 beq patch1c_6 ,p_mouse_motion 000c 20202a8e branch loop @@ -20,312 +20,312 @@ 000f 20202a8e branch loop p_soft_reset: -0010 6810813b hfetch 1 ,0x813b -0011 6000cb19 store 1 ,mem_power_on_flag -0012 20202002 branch soft_reset + 1 +0010 70895b86 jam 0x86 ,0x895b +0011 70895ca0 jam 0xa0 ,0x895c +0012 6810813b hfetch 1 ,0x813b +0013 6000cb19 store 1 ,mem_power_on_flag +0014 20202002 branch soft_reset + 1 p_soft_reset_1: -0013 d8a009ae arg mem_sp_state ,contw -0014 df20000c arg 12 ,loopcnt -0015 20407ed4 call clear_mem -0016 20406a03 call rfcomm_init -0017 20405cf6 call init_lmp -0018 2455ac65 ncall lpm_disable_exen_output ,wake -0019 20407ccd call ui_init + 1 -001a 2020200c branch soft_reset + 11 +0015 d8a009ae arg mem_sp_state ,contw +0016 df20000c arg 12 ,loopcnt +0017 20407ed4 call clear_mem +0018 20406a03 call rfcomm_init +0019 20405cf6 call init_lmp +001a 2455ac65 ncall lpm_disable_exen_output ,wake +001b 20407ccd call ui_init + 1 +001c 2020200c branch soft_reset + 11 p_soft_reset_2: -001b 2055b2e3 call app_lpm_init ,wake -001c 2040756a call publickey_init -001d 2055ab41 call lpm_recover_clk ,wake +001d 2055b2e3 call app_lpm_init ,wake +001e 2040756a call publickey_init +001f 2055ab41 call lpm_recover_clk ,wake p_sp_cal_loop: -001e 204076dc call sp_calc_sequence -001f 6800c65a fetch 1 ,mem_ssp_enable -0020 203a2012 branch main_loop ,blank -0021 6800c5b1 fetch 1 ,mem_sp_local_key_invalid -0022 203a001e branch p_sp_cal_loop ,blank -0023 20202012 branch main_loop +0020 204076dc call sp_calc_sequence +0021 6800c65a fetch 1 ,mem_ssp_enable +0022 203a2012 branch main_loop ,blank +0023 6800c5b1 fetch 1 ,mem_sp_local_key_invalid +0024 203a0020 branch p_sp_cal_loop ,blank +0025 20202012 branch main_loop p_g24_dispatch: -0024 c6930000 rtnmark0 mark_24g -0025 6800cd6b fetch 1 ,mem_g24_conn_sm -0026 c280803a bbit1 state_24g_pair ,p_g24_pair_dispatch -0027 c281005a bbit1 state_24g_reconn ,p_g24_reconn_dispatch -0028 6800cd5f fetch 1 ,mem_24g_transmit_by_interrupt -0029 c0008068 beq g24_tx_timer_int_enable ,p_g24_transmit_by_interrupt +0026 c6930000 rtnmark0 mark_24g +0027 6800cd6b fetch 1 ,mem_g24_conn_sm +0028 c280803c bbit1 state_24g_pair ,p_g24_pair_dispatch +0029 c281005c bbit1 state_24g_reconn ,p_g24_reconn_dispatch +002a 6800cd5f fetch 1 ,mem_24g_transmit_by_interrupt +002b c000806a beq g24_tx_timer_int_enable ,p_g24_transmit_by_interrupt p_g24_transmit_process: -002a 20400336 call p_g24_txdata_prep -002b 24340083 nbranch p_g24_nodata_transmit ,user -002c 2040031b call p_g24_rf_sta_check +002c 20400336 call p_g24_txdata_prep +002d 24340085 nbranch p_g24_nodata_transmit ,user +002e 2040031b call p_g24_rf_sta_check p_g24_transmit_start: -002d 20400361 call p_g24_transmit_packet -002e 6800cc2f fetch 1 ,mem_24g_pairing_sm -002f c1ff8000 rtnne state_24g_pairing_success -0030 204003b6 call power_ctrl_start -0031 58017700 setarg g24_long_sleep_step1 -0032 6001cc4e store 3 ,mem_24g_enter_hibernate -0033 5800012c setarg 0x012c -0034 60014810 store 2 ,mem_24g_long_sleep_param_update_timer +002f 20400361 call p_g24_transmit_packet +0030 6800cc2f fetch 1 ,mem_24g_pairing_sm +0031 c1ff8000 rtnne state_24g_pairing_success +0032 204003b6 call power_ctrl_start +0033 58017700 setarg g24_long_sleep_step1 +0034 6001cc4e store 3 ,mem_24g_enter_hibernate +0035 5800012c setarg 0x012c +0036 60014810 store 2 ,mem_24g_long_sleep_param_update_timer p_g24_short_sleep: -0035 2040008e call p_g24_lpm_wait -0036 24740000 nrtn user -0037 204000ef call p_clear_wake -0038 5800f80c setarg 63500 -0039 20202b93 branch lpm_dispatch_sleep +0037 20400090 call p_g24_lpm_wait +0038 24740000 nrtn user +0039 204000f1 call p_clear_wake +003a 5800f80c setarg 63500 +003b 20202b93 branch lpm_dispatch_sleep p_g24_pair_dispatch: -003a 6800cb43 fetch 1 ,mem_g24_stop_g24_mode -003b c000add4 beq 1 ,g24_stop_24g_mode -003c 20400427 call p_g24_tx_attemp_data_prep -003d 2040037a call p_g24_transmit_receive_ack -003e 242c0434 nbranch p_g24_pair_txdata_retry ,sync -003f 24378434 nbranch p_g24_pair_txdata_retry ,user3 -0040 204003a2 call p_g24_ackpayload_parse -0041 68024c47 fetch 4 ,mem_24g_addr -0042 680a4d64 fetcht 4 ,mem_24g_allpowerful_addr -0043 98467c00 isub temp ,null -0044 20228047 branch p_g24_auto_pair_skip_rx_length ,zero -0045 20400054 call p_g24_pair_ackpayload_length_check -0046 24740000 nrtn user +003c 6800cb43 fetch 1 ,mem_g24_stop_g24_mode +003d c000add4 beq 1 ,g24_stop_24g_mode +003e 20400427 call p_g24_tx_attemp_data_prep +003f 2040037a call p_g24_transmit_receive_ack +0040 242c0434 nbranch p_g24_pair_txdata_retry ,sync +0041 24378434 nbranch p_g24_pair_txdata_retry ,user3 +0042 204003a2 call p_g24_ackpayload_parse +0043 68024c47 fetch 4 ,mem_24g_addr +0044 680a4d64 fetcht 4 ,mem_24g_allpowerful_addr +0045 98467c00 isub temp ,null +0046 20228049 branch p_g24_auto_pair_skip_rx_length ,zero +0047 20400056 call p_g24_pair_ackpayload_length_check +0048 24740000 nrtn user p_g24_auto_pair_skip_rx_length: -0047 6800cd6b fetch 1 ,mem_g24_conn_sm -0048 793ffe01 set0 state_24g_pair ,pdata -0049 6000cd6b store 1 ,mem_g24_conn_sm -004a 204001ce call p_mouse_tx_power_init -004b 68024c47 fetch 4 ,mem_24g_addr -004c 680a4c2b fetcht 4 ,mem_24g_paring_addr -004d 98467c00 isub temp ,null -004e 202283de branch p_g24_start_pairing_sm1 ,zero -004f 68024c47 fetch 4 ,mem_24g_addr -0050 680a4c56 fetcht 4 ,mem_24g_device_addr -0051 98467c00 isub temp ,null -0052 20428058 call p_g24_store_dongle_addr ,zero -0053 20200063 branch p_g24_tx_attemp_dongle_succ +0049 6800cd6b fetch 1 ,mem_g24_conn_sm +004a 793ffe01 set0 state_24g_pair ,pdata +004b 6000cd6b store 1 ,mem_g24_conn_sm +004c 204001ce call p_mouse_tx_power_init +004d 68024c47 fetch 4 ,mem_24g_addr +004e 680a4c2b fetcht 4 ,mem_24g_paring_addr +004f 98467c00 isub temp ,null +0050 202283de branch p_g24_start_pairing_sm1 ,zero +0051 68024c47 fetch 4 ,mem_24g_addr +0052 680a4c56 fetcht 4 ,mem_24g_device_addr +0053 98467c00 isub temp ,null +0054 2042805a call p_g24_store_dongle_addr ,zero +0055 20200065 branch p_g24_tx_attemp_dongle_succ p_g24_pair_ackpayload_length_check: -0054 6800cc1d fetch 1 ,mem_24g_rxdata_length -0055 c0047fe7 beq bind_ackpayload_length ,enable_user -0056 c003ffe7 beq bind_ackpayload_length_yc1131 ,enable_user -0057 20207fe9 branch disable_user +0056 6800cc1d fetch 1 ,mem_24g_rxdata_length +0057 c0047fe7 beq bind_ackpayload_length ,enable_user +0058 c003ffe7 beq bind_ackpayload_length_yc1131 ,enable_user +0059 20207fe9 branch disable_user p_g24_store_dongle_addr: -0058 68024bff fetch 4 ,mem_24g_rxpayload + 2 -0059 202003e6 branch p_g24_update_addr_and_synccrc8 +005a 68024bff fetch 4 ,mem_24g_rxpayload + 2 +005b 202003e6 branch p_g24_update_addr_and_synccrc8 p_g24_reconn_dispatch: -005a 6800cb43 fetch 1 ,mem_g24_stop_g24_mode -005b c000add4 beq 1 ,g24_stop_24g_mode -005c 20400427 call p_g24_tx_attemp_data_prep -005d 2040037a call p_g24_transmit_receive_ack -005e 242c02e3 nbranch p_g24_ch ,sync -005f 243782e3 nbranch p_g24_ch ,user3 -0060 6800cd6b fetch 1 ,mem_g24_conn_sm -0061 793ffe02 set0 state_24g_reconn ,pdata -0062 6000cd6b store 1 ,mem_g24_conn_sm +005c 6800cb43 fetch 1 ,mem_g24_stop_g24_mode +005d c000add4 beq 1 ,g24_stop_24g_mode +005e 20400427 call p_g24_tx_attemp_data_prep +005f 2040037a call p_g24_transmit_receive_ack +0060 242c02e3 nbranch p_g24_ch ,sync +0061 243782e3 nbranch p_g24_ch ,user3 +0062 6800cd6b fetch 1 ,mem_g24_conn_sm +0063 793ffe02 set0 state_24g_reconn ,pdata +0064 6000cd6b store 1 ,mem_g24_conn_sm p_g24_tx_attemp_dongle_succ: -0063 79200026 set1 mark_24g ,mark -0064 70480e00 jam 0 ,mem_mouse_long_mult_flag -0065 20402f20 call g24_tx_attemp_dongle_succ + 4 -0066 20400377 call p_g24_txbuf_clear -0067 202001a2 branch p_g24_transmit_by_interrupt_enable +0065 79200026 set1 mark_24g ,mark +0066 70480e00 jam 0 ,mem_mouse_long_mult_flag +0067 20402f20 call g24_tx_attemp_dongle_succ + 4 +0068 20400377 call p_g24_txbuf_clear +0069 202001a2 branch p_g24_transmit_by_interrupt_enable p_g24_transmit_by_interrupt: -0068 20400498 call p_g24_timer_check -0069 24740000 nrtn user -006a 2040007d call p_g24_interval_calibrate -006b 68014d60 fetch 2 ,mem_24g_transmit_by_interrupt_exit_count -006c 1fe0fe01 increase 1 ,pdata -006d 60014d60 store 2 ,mem_24g_transmit_by_interrupt_exit_count -006e 68094d62 fetcht 2 ,mem_24g_transmit_by_interrupt_exit_count_init -006f 98467c00 isub temp ,null -0070 20428072 call p_g24_transmit_by_interrupt_exit ,zero -0071 2020002a branch p_g24_transmit_process +006a 20400498 call p_g24_timer_check +006b 24740000 nrtn user +006c 2040007f call p_g24_interval_calibrate +006d 68014d60 fetch 2 ,mem_24g_transmit_by_interrupt_exit_count +006e 1fe0fe01 increase 1 ,pdata +006f 60014d60 store 2 ,mem_24g_transmit_by_interrupt_exit_count +0070 68094d62 fetcht 2 ,mem_24g_transmit_by_interrupt_exit_count_init +0071 98467c00 isub temp ,null +0072 20428074 call p_g24_transmit_by_interrupt_exit ,zero +0073 2020002c branch p_g24_transmit_process p_g24_transmit_by_interrupt_exit: -0072 704d5f00 jam g24_tx_timer_int_disable ,mem_24g_transmit_by_interrupt -0073 58000000 setarg 0 -0074 60014d60 store 2 ,mem_24g_transmit_by_interrupt_exit_count -0075 58000064 setarg 100 -0076 60014d62 store 2 ,mem_24g_transmit_by_interrupt_exit_count_init +0074 704d5f00 jam g24_tx_timer_int_disable ,mem_24g_transmit_by_interrupt +0075 58000000 setarg 0 +0076 60014d60 store 2 ,mem_24g_transmit_by_interrupt_exit_count +0077 58000064 setarg 100 +0078 60014d62 store 2 ,mem_24g_transmit_by_interrupt_exit_count_init p_g24_interval_min: -0077 704c5a00 jam 0 ,mem_24g_pac_index -0078 6800cc45 fetch 1 ,mem_24g_interval_min +0079 704c5a00 jam 0 ,mem_24g_pac_index +007a 6800cc45 fetch 1 ,mem_24g_interval_min p_g24_interval_store: -0079 6000cc44 store 1 ,mem_24g_interval -007a 20600000 rtn +007b 6000cc44 store 1 ,mem_24g_interval +007c 20600000 rtn p_g24_interval_max: -007b 6800cc46 fetch 1 ,mem_24g_interval_max -007c 20200079 branch p_g24_interval_store +007d 6800cc46 fetch 1 ,mem_24g_interval_max +007e 2020007b branch p_g24_interval_store p_g24_interval_calibrate: -007d 6800cc5a fetch 1 ,mem_24g_pac_index -007e 1fe0fe01 increase 1 ,pdata -007f 6000cc5a store 1 ,mem_24g_pac_index -0080 c002007b beq 4 ,p_g24_interval_max -0081 c0028077 beq 5 ,p_g24_interval_min -0082 20600000 rtn +007f 6800cc5a fetch 1 ,mem_24g_pac_index +0080 1fe0fe01 increase 1 ,pdata +0081 6000cc5a store 1 ,mem_24g_pac_index +0082 c002007d beq 4 ,p_g24_interval_max +0083 c0028079 beq 5 ,p_g24_interval_min +0084 20600000 rtn p_g24_nodata_transmit: -0083 6800cc4b fetch 1 ,mem_24g_abort_pac -0084 205a00a3 call p_g24_send_abort_packet ,blank -0085 6800cd5f fetch 1 ,mem_24g_transmit_by_interrupt -0086 c1008000 rtneq g24_tx_timer_int_enable -0087 204000b4 call p_g24_search_dongle +0085 6800cc4b fetch 1 ,mem_24g_abort_pac +0086 205a00a5 call p_g24_send_abort_packet ,blank +0087 6800cd5f fetch 1 ,mem_24g_transmit_by_interrupt +0088 c1008000 rtneq g24_tx_timer_int_enable +0089 204000b6 call p_g24_search_dongle p_g24_long_sleep: -0088 2040008e call p_g24_lpm_wait -0089 24740000 nrtn user -008a 6801cc4e fetch 3 ,mem_24g_enter_hibernate -008b 20407f49 call clk2lpo -008c 600a415b storet 4 ,mem_sleep_counter -008d 20202b2a branch lpm_sleep +008a 20400090 call p_g24_lpm_wait +008b 24740000 nrtn user +008c 6801cc4e fetch 3 ,mem_24g_enter_hibernate +008d 20407f49 call clk2lpo +008e 600a415b storet 4 ,mem_sleep_counter +008f 20202b2a branch lpm_sleep p_g24_lpm_wait: -008e 78347c00 enable user -008f 20402afa call lpo_calibration -0090 6801c16f fetch 3 ,mem_clks_per_lpo -0091 203a7fe9 branch disable_user ,blank -0092 6800c091 fetch 1 ,mem_lpm_mode +0090 78347c00 enable user +0091 20402afa call lpo_calibration +0092 6801c16f fetch 3 ,mem_clks_per_lpo 0093 203a7fe9 branch disable_user ,blank -0094 6800cd5f fetch 1 ,mem_24g_transmit_by_interrupt -0095 c000ffe9 beq g24_tx_timer_int_enable ,disable_user +0094 6800c091 fetch 1 ,mem_lpm_mode +0095 203a7fe9 branch disable_user ,blank +0096 6800cd5f fetch 1 ,mem_24g_transmit_by_interrupt +0097 c000ffe9 beq g24_tx_timer_int_enable ,disable_user p_mouse_setgpio_lpm: -0096 204000a0 call p_mouse_set_sdio_high -0097 204000ef call p_clear_wake +0098 204000a2 call p_mouse_set_sdio_high +0099 204000f1 call p_clear_wake p_mouse_setgpio_lpm_before: -0098 20403ebf call mouse_lpm_before_common -0099 204001e6 call p_ice_gpio_set_input_pu -009a 68120070 hfetch 4 ,core_gpio_oe0 -009b 681a0078 hfetcht 4 ,core_gpio_pu0 -009c 98418400 ior temp ,temp -009d 18440400 invert temp ,temp -009e 601a007c hstoret 4 ,core_gpio_pd0 -009f 20600000 rtn +009a 20403ebf call mouse_lpm_before_common +009b 204001e6 call p_ice_gpio_set_input_pu +009c 68120070 hfetch 4 ,core_gpio_oe0 +009d 681a0078 hfetcht 4 ,core_gpio_pu0 +009e 98418400 ior temp ,temp +009f 18440400 invert temp ,temp +00a0 601a007c hstoret 4 ,core_gpio_pd0 +00a1 20600000 rtn p_mouse_set_sdio_high: -00a0 6800cb0a fetch 1 ,mem_mouse_init_sensor_reset_flag -00a1 207a0000 rtn blank -00a2 2020028c branch p_mouse_seting_sensor_type +00a2 6800cb0a fetch 1 ,mem_mouse_init_sensor_reset_flag +00a3 207a0000 rtn blank +00a4 2020028c branch p_mouse_seting_sensor_type p_g24_send_abort_packet: -00a3 704c4b01 jam 1 ,mem_24g_abort_pac -00a4 704d5400 jam 0 ,mem_24g_rf_hop_ch -00a5 204002d3 call p_g24_transmit_rf_ctrl_clear -00a6 6000cbbb store 1 ,mem_24g_txbuf -00a7 58000000 setarg 0 -00a8 6003cbbc store 7 ,mem_24g_txbuf + 1 -00a9 68024c56 fetch 4 ,mem_24g_device_addr -00aa 60024bc3 store 4 ,mem_24g_txbuf + 8 -00ab 704c1f0c jam 12 ,mem_24g_datalen -00ac 6800cc20 fetch 1 ,mem_24g_data_type -00ad 79207e03 set1 bit_abort ,pdata -00ae 6000cc20 store 1 ,mem_24g_data_type -00af 20400339 call p_g24_txdata_enable_tx -00b0 2020002d branch p_g24_transmit_start +00a5 704c4b01 jam 1 ,mem_24g_abort_pac +00a6 704d5400 jam 0 ,mem_24g_rf_hop_ch +00a7 204002d3 call p_g24_transmit_rf_ctrl_clear +00a8 6000cbbb store 1 ,mem_24g_txbuf +00a9 58000000 setarg 0 +00aa 6003cbbc store 7 ,mem_24g_txbuf + 1 +00ab 68024c56 fetch 4 ,mem_24g_device_addr +00ac 60024bc3 store 4 ,mem_24g_txbuf + 8 +00ad 704c1f0c jam 12 ,mem_24g_datalen +00ae 6800cc20 fetch 1 ,mem_24g_data_type +00af 79207e03 set1 bit_abort ,pdata +00b0 6000cc20 store 1 ,mem_24g_data_type +00b1 20400339 call p_g24_txdata_enable_tx +00b2 2020002f branch p_g24_transmit_start p_g24_search_dongle_init: -00b1 58000000 setarg 0 -00b2 6001cd68 store 3 ,mem_24g_search_dongle_action -00b3 20600000 rtn +00b3 58000000 setarg 0 +00b4 6001cd68 store 3 ,mem_24g_search_dongle_action +00b5 20600000 rtn p_g24_search_dongle: -00b4 6800c80e fetch 1 ,mem_mouse_long_mult_flag -00b5 207a0000 rtn blank -00b6 6800cc4b fetch 1 ,mem_24g_abort_pac +00b6 6800c80e fetch 1 ,mem_mouse_long_mult_flag 00b7 207a0000 rtn blank -00b8 6800cb46 fetch 1 ,mem_24g_search_dongle_wait -00b9 1fe0fe01 increase 1 ,pdata -00ba 1fe17e03 and_into 3 ,pdata -00bb 6000cb46 store 1 ,mem_24g_search_dongle_wait -00bc 247a0000 nrtn blank -00bd 704d6a00 jam 0 ,mem_24g_search_dongle_ch +00b8 6800cc4b fetch 1 ,mem_24g_abort_pac +00b9 207a0000 rtn blank +00ba 6800cb46 fetch 1 ,mem_24g_search_dongle_wait +00bb 1fe0fe01 increase 1 ,pdata +00bc 1fe17e03 and_into 3 ,pdata +00bd 6000cb46 store 1 ,mem_24g_search_dongle_wait +00be 247a0000 nrtn blank +00bf 704d6a00 jam 0 ,mem_24g_search_dongle_ch p_g24_search_dongle_loop: -00be 6800cd6a fetch 1 ,mem_24g_search_dongle_ch -00bf 1fe0fe01 increase 1 ,pdata -00c0 6000cd6a store 1 ,mem_24g_search_dongle_ch -00c1 1fe67c08 sub pdata ,g24_ch_number ,null -00c2 242100c8 nbranch p_g24_search_dongle_loop_end ,positive -00c3 20400427 call p_g24_tx_attemp_data_prep -00c4 2040037a call p_g24_transmit_receive_ack -00c5 242c00ce nbranch p_g24_search_dongle_loop_retry ,sync -00c6 243780ce nbranch p_g24_search_dongle_loop_retry ,user3 -00c7 204000d8 call p_g24_search_dongle_success +00c0 6800cd6a fetch 1 ,mem_24g_search_dongle_ch +00c1 1fe0fe01 increase 1 ,pdata +00c2 6000cd6a store 1 ,mem_24g_search_dongle_ch +00c3 1fe67c08 sub pdata ,g24_ch_number ,null +00c4 242100ca nbranch p_g24_search_dongle_loop_end ,positive +00c5 20400427 call p_g24_tx_attemp_data_prep +00c6 2040037a call p_g24_transmit_receive_ack +00c7 242c00d0 nbranch p_g24_search_dongle_loop_retry ,sync +00c8 243780d0 nbranch p_g24_search_dongle_loop_retry ,user3 +00c9 204000da call p_g24_search_dongle_success p_g24_search_dongle_loop_end: -00c8 20400377 call p_g24_txbuf_clear -00c9 6800cd69 fetch 1 ,mem_24g_search_dongle_count -00ca 1fe0fe01 increase 1 ,pdata -00cb 6000cd69 store 1 ,mem_24g_search_dongle_count -00cc c00800d0 beq g24_ch_poll_count ,p_g24_search_dongle_check -00cd 20600000 rtn +00ca 20400377 call p_g24_txbuf_clear +00cb 6800cd69 fetch 1 ,mem_24g_search_dongle_count +00cc 1fe0fe01 increase 1 ,pdata +00cd 6000cd69 store 1 ,mem_24g_search_dongle_count +00ce c00800d2 beq g24_ch_poll_count ,p_g24_search_dongle_check +00cf 20600000 rtn p_g24_search_dongle_loop_retry: -00ce 204002e3 call p_g24_ch -00cf 202000be branch p_g24_search_dongle_loop +00d0 204002e3 call p_g24_ch +00d1 202000c0 branch p_g24_search_dongle_loop p_g24_search_dongle_check: -00d0 704d6900 jam 0 ,mem_24g_search_dongle_count -00d1 6800cd68 fetch 1 ,mem_24g_search_dongle_action -00d2 c3800000 rtnbit1 g24_disconn_state -00d3 79207e00 set1 g24_disconn_state ,pdata -00d4 6000cd68 store 1 ,mem_24g_search_dongle_action -00d5 58000708 setarg g24_disconn_nodata_timer -00d6 600146b0 store 2 ,mem_mouse_no_data_timer -00d7 202001ef branch p_mouse_sensor_powerdown +00d2 704d6900 jam 0 ,mem_24g_search_dongle_count +00d3 6800cd68 fetch 1 ,mem_24g_search_dongle_action +00d4 c3800000 rtnbit1 g24_disconn_state +00d5 79207e00 set1 g24_disconn_state ,pdata +00d6 6000cd68 store 1 ,mem_24g_search_dongle_action +00d7 58000708 setarg g24_disconn_nodata_timer +00d8 600146b0 store 2 ,mem_mouse_no_data_timer +00d9 202001ef branch p_mouse_sensor_powerdown p_g24_search_dongle_success: -00d8 6800cc4b fetch 1 ,mem_24g_abort_pac -00d9 203a00b1 branch p_g24_search_dongle_init ,blank -00da 704d6900 jam 0 ,mem_24g_search_dongle_count -00db 6800cd68 fetch 1 ,mem_24g_search_dongle_action -00dc c4000000 rtnbit0 g24_disconn_state -00dd 793ffe00 set0 g24_disconn_state ,pdata -00de 6000cd68 store 1 ,mem_24g_search_dongle_action -00df 20403f8d call mouse_no_data_timer_init +00da 6800cc4b fetch 1 ,mem_24g_abort_pac +00db 203a00b3 branch p_g24_search_dongle_init ,blank +00dc 704d6900 jam 0 ,mem_24g_search_dongle_count +00dd 6800cd68 fetch 1 ,mem_24g_search_dongle_action +00de c4000000 rtnbit0 g24_disconn_state +00df 793ffe00 set0 g24_disconn_state ,pdata +00e0 6000cd68 store 1 ,mem_24g_search_dongle_action +00e1 20403f8d call mouse_no_data_timer_init p_mouse_init_sensor_reset: -00e0 704b0a01 jam 1 ,mem_mouse_init_sensor_reset_flag +00e2 704b0a01 jam 1 ,mem_mouse_init_sensor_reset_flag p_mouse_init_sunt: -00e1 20400128 call p_mouse_spi_init -00e2 204040c0 call mouse_spi_sdio_gpio_pollup +00e3 20400128 call p_mouse_spi_init +00e4 204040c0 call mouse_spi_sdio_gpio_pollup p_mouse_init_sensor: -00e3 204040d9 call mouse_read_sensor_id -00e4 c018012a beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge -00e5 c018814c beq p3065_id1 ,p_mouse_p3065_init_param -00e6 204040d1 call mouse_twspi_reset -00e7 200003e8 nop 1000 -00e8 202000e3 branch p_mouse_init_sensor +00e5 204040d9 call mouse_read_sensor_id +00e6 c018012a beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge +00e7 c018814c beq p3065_id1 ,p_mouse_p3065_init_param +00e8 204040d1 call mouse_twspi_reset +00e9 200003e8 nop 1000 +00ea 202000e5 branch p_mouse_init_sensor p_mouse_before_lpm: -00e9 c6130000 rtnmark1 mark_24g -00ea 20400096 call p_mouse_setgpio_lpm -00eb 6800c040 fetch 1 ,mem_context -00ec c30000ef bbit0 state_inconn ,p_clear_wake -00ed 680080a0 fetch 1 ,mem_lpm_current_mult -00ee 247a0000 nrtn blank +00eb c6130000 rtnmark1 mark_24g +00ec 20400098 call p_mouse_setgpio_lpm +00ed 6800c040 fetch 1 ,mem_context +00ee c30000f1 bbit0 state_inconn ,p_clear_wake +00ef 680080a0 fetch 1 ,mem_lpm_current_mult +00f0 247a0000 nrtn blank p_clear_wake: -00ef 58000000 setarg 0 -00f0 600400a1 store 8 ,mem_gpio_wakeup_low -00f1 20600000 rtn +00f1 58000000 setarg 0 +00f2 600400a1 store 8 ,mem_gpio_wakeup_low +00f3 20600000 rtn p_device_init: -00f2 70895b86 jam 0x86 ,0x895b -00f3 70895ca0 jam 0xa0 ,0x895c 00f4 20403416 call app_lpm_mult_enable 00f5 203580fd branch p_device_init_common ,wake 00f6 70807820 jam 0x20 ,core_gpio_pu0 @@ -430,15 +430,15 @@ 013d 58000016 setarg 0x16 013e 20406414 call twspi_read 013f 1fe67cbd sub pdata ,0xbd ,null -0140 242280e3 nbranch p_mouse_init_sensor ,zero +0140 242280e5 nbranch p_mouse_init_sensor ,zero 0141 58000019 setarg 0x19 0142 20406414 call twspi_read 0143 1fe67c55 sub pdata ,0x55 ,null -0144 242280e3 nbranch p_mouse_init_sensor ,zero +0144 242280e5 nbranch p_mouse_init_sensor ,zero 0145 5800001b setarg 0x1b 0146 20406414 call twspi_read 0147 1fe67c1d sub pdata ,0x1d ,null -0148 242280e3 nbranch p_mouse_init_sensor ,zero +0148 242280e5 nbranch p_mouse_init_sensor ,zero 0149 7046e008 jam p8009 ,mem_config_sensor_type 014a da604b73 arg mem_sensor_8009_init ,regc 014b 20200136 branch p_sensor_wr_seq @@ -525,7 +525,7 @@ 0184 6800cb19 fetch 1 ,mem_power_on_flag 0185 c3810000 rtnbit1 2 0186 704b4a14 jam 20 ,mem_mouse_sensor_powerdown_timer -0187 204000e0 call p_mouse_init_sensor_reset +0187 204000e2 call p_mouse_init_sensor_reset 0188 20200125 branch p_mouse_dpi_config_default p_g24_factory_check: @@ -546,7 +546,7 @@ p_mouse_cb_fuction: 0192 5800019f setarg p_mouse_g24_package_data 0193 60014d50 store 2 ,mem_cb_24g_data -0194 580000e9 setarg p_mouse_before_lpm +0194 580000eb setarg p_mouse_before_lpm 0195 600141ed store 2 ,mem_cb_before_lpm 0196 580001bb setarg p_mouse_priority_bb_event 0197 600141f5 store 2 ,mem_cb_bb_event_process @@ -606,7 +606,7 @@ p_mouse_24g_pairing_complete: 01c0 704b4a00 jam 0 ,mem_mouse_sensor_powerdown_timer 01c1 20400430 call p_g24_auto_pair_timeout_clear -01c2 204000e0 call p_mouse_init_sensor_reset +01c2 204000e2 call p_mouse_init_sensor_reset 01c3 d8e00003 arg mosue_24g_pairing_flag ,queue 01c4 204043d2 call mouse_disable_function_flag 01c5 7046a700 jam 0 ,mem_mouse_move_flag @@ -636,7 +636,7 @@ p_mouse_24g_attempt_success: 01d6 704b4a00 jam 0 ,mem_mouse_sensor_powerdown_timer 01d7 20400430 call p_g24_auto_pair_timeout_clear -01d8 204000e0 call p_mouse_init_sensor_reset +01d8 204000e2 call p_mouse_init_sensor_reset 01d9 20403f8d call mouse_no_data_timer_init 01da 204001ca call p_mouse_set_24g_addr_eeprom 01db 202065d1 branch iicd_write_protect_eep_data @@ -649,7 +649,7 @@ 01e0 204001ec call p_mouse_sensor_powerdown_check 01e1 204074bd call disable_authrom 01e2 20403e9f call mouse_before_hibernate_wheel_gpio_set -01e3 20400098 call p_mouse_setgpio_lpm_before +01e3 2040009a call p_mouse_setgpio_lpm_before 01e4 6808c6f7 fetcht 1 ,mem_select_sensor_angle_gpio 01e5 202067ed branch gpio_clr_wake @@ -1198,7 +1198,7 @@ 035d 58000000 setarg 0 035e 6000c80e store 1 ,mem_mouse_long_mult_flag 035f 6002469b store 4 ,mem_mouse_x -0360 202000e0 branch p_mouse_init_sensor_reset +0360 202000e2 branch p_mouse_init_sensor_reset p_g24_transmit_packet: 0361 704c2800 jam 0 ,mem_24g_retry Index: program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_Only24g_New_LRpair/program/patch.prog (revision 2896) +++ /branch/mouse_project/YJX_Project/YJX_Only24g_New_LRpair/program/patch.prog (working copy) @@ -39,6 +39,8 @@ ifdef MOUSE p_soft_reset: + jam 0x86,0x895b + jam 0xa0,0x895c hfetch 1,0x813b store 1,mem_power_on_flag branch soft_reset+1 @@ -343,8 +345,6 @@ rtn p_device_init: - jam 0x86,0x895b - jam 0xa0,0x895c ifdef DEBUGLOG call debuglog_init ifdef DEBUGLOG_STATUS Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_Only24g_New_LRpair/sched/mouse.dat (revision 2896) +++ /branch/mouse_project/YJX_Project/YJX_Only24g_New_LRpair/sched/mouse.dat (working copy) @@ -271,7 +271,7 @@ mem_24g_allpowerful_addr: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 -mem_firmware_version:05 00 +mem_firmware_version:06 00 mem_device_flag: 02