Index: output/eeprom.dat =================================================================== --- /1121s/1121se/branch/mouse/mouse_public_1M/output/eeprom.dat (revision 3672) +++ /1121s/1121se/branch/mouse/mouse_public_1M/output/eeprom.dat (working copy) @@ -2,32 +2,36 @@ 02 aa 55 -2a +22 02 c2 84 00 -07 +08 +c0 +39 +80 +0c c0 3c 80 -0b +0d +c0 +4b +80 +0f c0 47 80 -0d +10 c0 48 00 -20 -c0 -4b -80 -4b +23 c0 75 00 -87 +85 20 20 23 @@ -35,11 +39,11 @@ c0 5f 80 -32 +35 c0 64 80 -3d +40 c1 7f 80 @@ -49,6 +53,10 @@ 23 3e 20 +60 +00 +00 +20 40 37 17 @@ -56,6 +64,10 @@ 20 4d f6 +20 +60 +00 +00 1a 62 7e @@ -63,7 +75,7 @@ c0 1d 00 -10 +13 20 20 53 @@ -95,7 +107,7 @@ c0 00 80 -18 +1b 20 20 59 @@ -107,11 +119,11 @@ c2 9f 00 -1c +1f c2 98 00 -1c +1f 20 20 59 @@ -147,7 +159,7 @@ c0 7f 80 -27 +2a 6f e0 c8 @@ -175,19 +187,19 @@ c2 80 80 -2f +32 c2 80 00 -2f +32 c2 82 80 -2f +32 c2 83 00 -2f +32 20 20 54 @@ -235,7 +247,7 @@ c0 02 80 -3b +3e 20 20 35 @@ -255,7 +267,7 @@ c0 04 00 -40 +43 20 20 36 @@ -271,7 +283,7 @@ 20 40 00 -46 +49 6f e4 47 @@ -304,34 +316,14 @@ 20 59 e6 -6f -e4 -47 -0e -c2 -88 -d5 -80 -c2 -88 -55 -88 -c2 -89 -00 -50 -20 -60 -00 -00 20 40 00 -53 +51 20 40 00 -5a +58 20 20 55 @@ -375,11 +367,11 @@ c0 00 80 -5f +5d c0 01 00 -73 +71 20 60 00 @@ -403,7 +395,7 @@ 20 3a 00 -6b +69 67 e3 4a @@ -431,7 +423,7 @@ 20 20 00 -61 +5f 6f e3 4a @@ -483,7 +475,7 @@ 20 3a 00 -7f +7d 67 e3 4a @@ -511,7 +503,7 @@ 20 20 00 -75 +73 6f e3 4a @@ -556,8 +548,8 @@ 20 6b 26 -e1 -a7 +8d +95 aa 55 40 @@ -578,7 +570,7 @@ 00 00 00 -00 +08 02 00 80 @@ -819,7 +811,7 @@ 00 94 40 -00 +01 aa 55 01 @@ -1284,8 +1276,8 @@ 00 20 00 -64 -00 +2c +01 aa 55 06 @@ -1844,7 +1836,7 @@ ff aa 55 -1d +1c 00 dd 49 @@ -1868,7 +1860,6 @@ 00 ff ff -00 09 a5 0b @@ -1881,10 +1872,10 @@ aa aa 55 -0b -6d -5c -3b +dc +6c +6f +ef ff ff ff @@ -8188,5 +8179,14 @@ ff ff ff -81 -b2 +ff +ff +ff +ff +ff +ff +ff +ff +ff +4a +b6 Index: output/otp.dat =================================================================== --- /1121s/1121se/branch/mouse/mouse_public_1M/output/otp.dat (revision 3672) +++ /1121s/1121se/branch/mouse/mouse_public_1M/output/otp.dat (working copy) @@ -11,32 +11,36 @@ 00 aa 55 -2a +22 02 c2 84 00 -07 +08 +c0 +39 +80 +0c c0 3c 80 -0b +0d +c0 +4b +80 +0f c0 47 80 -0d +10 c0 48 00 -20 -c0 -4b -80 -4b +23 c0 75 00 -87 +85 20 20 23 @@ -44,11 +48,11 @@ c0 5f 80 -32 +35 c0 64 80 -3d +40 c1 7f 80 @@ -58,6 +62,10 @@ 23 3e 20 +60 +00 +00 +20 40 37 17 @@ -65,6 +73,10 @@ 20 4d f6 +20 +60 +00 +00 1a 62 7e @@ -72,7 +84,7 @@ c0 1d 00 -10 +13 20 20 53 @@ -104,7 +116,7 @@ c0 00 80 -18 +1b 20 20 59 @@ -116,11 +128,11 @@ c2 9f 00 -1c +1f c2 98 00 -1c +1f 20 20 59 @@ -156,7 +168,7 @@ c0 7f 80 -27 +2a 6f e0 c8 @@ -184,19 +196,19 @@ c2 80 80 -2f +32 c2 80 00 -2f +32 c2 82 80 -2f +32 c2 83 00 -2f +32 20 20 54 @@ -244,7 +256,7 @@ c0 02 80 -3b +3e 20 20 35 @@ -264,7 +276,7 @@ c0 04 00 -40 +43 20 20 36 @@ -280,7 +292,7 @@ 20 40 00 -46 +49 6f e4 47 @@ -313,34 +325,14 @@ 20 59 e6 -6f -e4 -47 -0e -c2 -88 -d5 -80 -c2 -88 -55 -88 -c2 -89 -00 -50 -20 -60 -00 -00 20 40 00 -53 +51 20 40 00 -5a +58 20 20 55 @@ -384,11 +376,11 @@ c0 00 80 -5f +5d c0 01 00 -73 +71 20 60 00 @@ -412,7 +404,7 @@ 20 3a 00 -6b +69 67 e3 4a @@ -440,7 +432,7 @@ 20 20 00 -61 +5f 6f e3 4a @@ -492,7 +484,7 @@ 20 3a 00 -7f +7d 67 e3 4a @@ -520,7 +512,7 @@ 20 20 00 -75 +73 6f e3 4a @@ -565,8 +557,8 @@ 20 6b 26 -e1 -a7 +8d +95 aa 55 40 @@ -587,7 +579,7 @@ 00 00 00 -00 +08 02 00 80 @@ -828,7 +820,7 @@ 00 94 40 -00 +01 aa 55 01 @@ -1293,8 +1285,8 @@ 00 20 00 -64 -00 +2c +01 aa 55 06 @@ -1853,7 +1845,7 @@ ff aa 55 -1d +1c 00 dd 49 @@ -1877,7 +1869,6 @@ 00 ff ff -00 09 a5 0b @@ -1890,7 +1881,7 @@ aa aa 55 -0b -6d -5c -3b +dc +6c +6f +ef Index: output/program.lis =================================================================== --- /1121s/1121se/branch/mouse/mouse_public_1M/output/program.lis (revision 3672) +++ /1121s/1121se/branch/mouse/mouse_public_1M/output/program.lis (working copy) @@ -1,193 +1,193 @@ include "bt_format " org 0x0000 -0000 c2840007 bbit1 8 ,pf_patch_ext -0001 c03c800b beq patch0f_1 ,p_mouse_start_work -0002 c047800d beq patch11_7 ,p_mouse_priority_bb_event -0003 c0480020 beq patch12_0 ,p_mouse_le -0004 c04b804b beq patch12_7 ,p_mouse_store_device_info -0005 c0750087 beq patch1d_2 ,p_otp_read_data -0006 2020233e branch assert +0000 c2840008 bbit1 8 ,pf_patch_ext +0001 c039800c beq patch0e_3 ,p_mouse_load_device_info_check +0002 c03c800d beq patch0f_1 ,p_mouse_start_work +0003 c04b800f beq patch12_7 ,p_mouse_store_device_info +0004 c0478010 beq patch11_7 ,p_mouse_priority_bb_event +0005 c0480023 beq patch12_0 ,p_mouse_le +0006 c0750085 beq patch1d_2 ,p_otp_read_data +0007 2020233e branch assert pf_patch_ext: -0007 c05f8032 beq patch37_7 ,p_g24_reconn_device_fail -0008 c064803d beq patch39_1 ,p_g24_retransmit -0009 c17f8000 rtneq patch3f_7 -000a 2020233e branch assert +0008 c05f8035 beq patch37_7 ,p_g24_reconn_device_fail +0009 c0648040 beq patch39_1 ,p_g24_retransmit +000a c17f8000 rtneq patch3f_7 +000b 2020233e branch assert + +p_mouse_load_device_info_check: +000c 20600000 rtn p_mouse_start_work: -000b 20403717 call app_param_init -000c 20204df6 branch mouse_start_work + 1 +000d 20403717 call app_param_init +000e 20204df6 branch mouse_start_work + 1 + +p_mouse_store_device_info: +000f 20600000 rtn p_mouse_priority_bb_event: -000d 1a627e00 copy regc ,pdata -000e c01d0010 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail -000f 202053dc branch mouse_priority_bb_event + 2 +0010 1a627e00 copy regc ,pdata +0011 c01d0013 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail +0012 202053dc branch mouse_priority_bb_event + 2 p_mouse_24g_attempt_fail: -0010 2040592b call mouse_soft_agc_disable -0011 20405933 call device_fetch_normal_tx_power -0012 6fe0c617 fetch 1 ,mem_24g_attempt_fail_flag -0013 243a590a nbranch mouse_24g_hibernate_set ,blank -0014 6fe0c5f9 fetch 1 ,mem_24g_reconn_type -0015 c002d98c beq pair_and_receiver ,mouse_24g_auto_pair_attempt_fail -0016 c0008018 beq fast_conn_and_receiver ,p_mouse_24g_fast_conn_attempt_fail -0017 20205975 branch mouse_24g_attempt_fail + 4 +0013 2040592b call mouse_soft_agc_disable +0014 20405933 call device_fetch_normal_tx_power +0015 6fe0c617 fetch 1 ,mem_24g_attempt_fail_flag +0016 243a590a nbranch mouse_24g_hibernate_set ,blank +0017 6fe0c5f9 fetch 1 ,mem_24g_reconn_type +0018 c002d98c beq pair_and_receiver ,mouse_24g_auto_pair_attempt_fail +0019 c000801b beq fast_conn_and_receiver ,p_mouse_24g_fast_conn_attempt_fail +001a 20205975 branch mouse_24g_attempt_fail + 4 p_mouse_24g_fast_conn_attempt_fail: -0018 6fe4470e fetch mouse_flag_len ,mem_mouse_flag -0019 c29f001c bbit1 mouse_enable_24g_first_auto_pairing ,p_mouse_24g_start_auto_pair -001a c298001c bbit1 mouse_enable_auto_24g_paring ,p_mouse_24g_start_auto_pair -001b 20205983 branch mouse_24g_fast_conn_attempt_fail + 3 +001b 6fe4470e fetch mouse_flag_len ,mem_mouse_flag +001c c29f001f bbit1 mouse_enable_24g_first_auto_pairing ,p_mouse_24g_start_auto_pair +001d c298001f bbit1 mouse_enable_auto_24g_paring ,p_mouse_24g_start_auto_pair +001e 20205983 branch mouse_24g_fast_conn_attempt_fail + 3 p_mouse_24g_start_auto_pair: -001c 6fe145ed fetch 2 ,mem_24g_pair_timeout_init -001d 67e145f5 store 2 ,mem_24g_reconn_timeout -001e 7045f905 jam pair_and_receiver ,mem_24g_reconn_type -001f 2020350a branch g24_reconn_start +001f 6fe145ed fetch 2 ,mem_24g_pair_timeout_init +0020 67e145f5 store 2 ,mem_24g_reconn_timeout +0021 7045f905 jam pair_and_receiver ,mem_24g_reconn_type +0022 2020350a branch g24_reconn_start p_mouse_le: -0020 20402a06 call le_fifo_check_nearly_full -0021 247a0000 nrtn blank -0022 6fe0c74f fetch 1 ,mem_device_fast_conn_flag -0023 c07f8027 beq 0xff ,p_mouse_le_next -0024 6fe0c882 fetch 1 ,mem_le_connect_status_flag -0025 1fe17e03 and pdata ,0x03 ,pdata -0026 c1818000 rtnne 0x03 +0023 20402a06 call le_fifo_check_nearly_full +0024 247a0000 nrtn blank +0025 6fe0c74f fetch 1 ,mem_device_fast_conn_flag +0026 c07f802a beq 0xff ,p_mouse_le_next +0027 6fe0c882 fetch 1 ,mem_le_connect_status_flag +0028 1fe17e03 and pdata ,0x03 ,pdata +0029 c1818000 rtnne 0x03 p_mouse_le_next: -0027 6fe0c9f9 fetch 1 ,mem_mouse_clear_sensor_data_flag -0028 205a538b call mouse_clear_sensor_data_by_reset ,blank -0029 6fe4470e fetch mouse_flag_len ,mem_mouse_flag -002a c280802f bbit1 mouse_24g_pairing_flag ,p_mouse_le_send_empty_packet -002b c280002f bbit1 mouse_select_device_flag ,p_mouse_le_send_empty_packet -002c c282802f bbit1 mouse_bt_discovery_button_down_flag ,p_mouse_le_send_empty_packet -002d c283002f bbit1 mouse_bt_discovery_button_long_down_flag ,p_mouse_le_send_empty_packet -002e 20205447 branch mouse_le_package +002a 6fe0c9f9 fetch 1 ,mem_mouse_clear_sensor_data_flag +002b 205a538b call mouse_clear_sensor_data_by_reset ,blank +002c 6fe4470e fetch mouse_flag_len ,mem_mouse_flag +002d c2808032 bbit1 mouse_24g_pairing_flag ,p_mouse_le_send_empty_packet +002e c2800032 bbit1 mouse_select_device_flag ,p_mouse_le_send_empty_packet +002f c2828032 bbit1 mouse_bt_discovery_button_down_flag ,p_mouse_le_send_empty_packet +0030 c2830032 bbit1 mouse_bt_discovery_button_long_down_flag ,p_mouse_le_send_empty_packet +0031 20205447 branch mouse_le_package p_mouse_le_send_empty_packet: -002f 58000000 setarg 0 -0030 67e3c65c store 7 ,mem_mouse_key -0031 2020683e branch hid_device_le_send_mouse_data +0032 58000000 setarg 0 +0033 67e3c65c store 7 ,mem_mouse_key +0034 2020683e branch hid_device_le_send_mouse_data p_g24_reconn_device_fail: -0032 6fe0c5fa fetch 1 ,mem_24g_fast_conn_enable -0033 203a3201 branch g24_ch ,blank -0034 6fe145f7 fetch 2 ,mem_24g_reconn_count -0035 1fe0fe01 increase 1 ,pdata -0036 67e145f7 store 2 ,mem_24g_reconn_count -0037 2feffe09 isolate1 9 ,pdata -0038 6fe0c5f9 fetch 1 ,mem_24g_reconn_type -0039 c002803b beq pair_and_receiver ,p_g24_reconn_pair_and_receiver -003a 20203565 branch g24_reconn_device_fail + 7 +0035 6fe0c5fa fetch 1 ,mem_24g_fast_conn_enable +0036 203a3201 branch g24_ch ,blank +0037 6fe145f7 fetch 2 ,mem_24g_reconn_count +0038 1fe0fe01 increase 1 ,pdata +0039 67e145f7 store 2 ,mem_24g_reconn_count +003a 2feffe09 isolate1 9 ,pdata +003b 6fe0c5f9 fetch 1 ,mem_24g_reconn_type +003c c002803e beq pair_and_receiver ,p_g24_reconn_pair_and_receiver +003d 20203565 branch g24_reconn_device_fail + 7 p_g24_reconn_pair_and_receiver: -003b 2020b51f branch g24_reconn_receiver_addr ,true -003c 2020327a branch g24_pair_init_param +003e 2020b51f branch g24_reconn_receiver_addr ,true +003f 2020327a branch g24_pair_init_param p_g24_retransmit: -003d 6fe0c3cf fetch 1 ,mem_device_option -003e c0040040 beq dvc_op_mouse ,p_mouse_g24_retransmit -003f 2020363b branch g24_retransmit0 +0040 6fe0c3cf fetch 1 ,mem_device_option +0041 c0040043 beq dvc_op_mouse ,p_mouse_g24_retransmit +0042 2020363b branch g24_retransmit0 p_mouse_g24_retransmit: -0040 6fe0c752 fetch 1 ,mem_device_need_soft_reset -0041 247a0000 nrtn blank -0042 20400046 call p_mouse_g24_retransmit_100ms_timer -0043 6fe4470e fetch mouse_flag_len ,mem_mouse_flag -0044 c3808000 rtnbit1 mouse_24g_pairing_flag -0045 2020363b branch g24_retransmit0 +0043 6fe0c752 fetch 1 ,mem_device_need_soft_reset +0044 247a0000 nrtn blank +0045 20400049 call p_mouse_g24_retransmit_100ms_timer +0046 6fe4470e fetch mouse_flag_len ,mem_mouse_flag +0047 c3808000 rtnbit1 mouse_24g_pairing_flag +0048 2020363b branch g24_retransmit0 p_mouse_g24_retransmit_100ms_timer: -0046 d8e0000c arg 12 ,queue -0047 20407cf1 call timer_check -0048 247a0000 nrtn blank -0049 204054d7 call mouse_commbination_key_process -004a 202059e6 branch mouse_g24_retransmit_100ms_timer_next - -p_mouse_store_device_info: -004b 6fe4470e fetch mouse_flag_len ,mem_mouse_flag -004c c288d580 bbit1 mouse_enable_eeprom ,mouse_store_eeprom_device_info -004d c2885588 bbit1 mouse_enable_flash ,mouse_store_flash_device_info -004e c2890050 bbit1 mouse_enable_otp ,p_mouse_store_otp_device_info -004f 20600000 rtn +0049 d8e0000c arg 12 ,queue +004a 20407cf1 call timer_check +004b 247a0000 nrtn blank +004c 204054d7 call mouse_commbination_key_process +004d 202059e6 branch mouse_g24_retransmit_100ms_timer_next p_mouse_store_otp_device_info: -0050 20400053 call p_mouse_write_otp_app_initflag -0051 2040005a call p_mouse_write_otp_locall_addr -0052 2020558b branch mouse_store_otp_device_info + 1 +004e 20400051 call p_mouse_write_otp_app_initflag +004f 20400058 call p_mouse_write_otp_locall_addr +0050 2020558b branch mouse_store_otp_device_info + 1 p_mouse_write_otp_app_initflag: -0053 20405699 call mouse_otp_load_app_initflag -0054 6fe146a0 fetch 2 ,mem_store_flag -0055 d840aa55 arg eeprom_init_flag ,temp -0056 98467c00 isub temp ,null -0057 20628000 rtn zero -0058 604946a0 storet 2 ,mem_store_flag -0059 2020569d branch mouse_otp_store_app_initflag +0051 20405699 call mouse_otp_load_app_initflag +0052 6fe146a0 fetch 2 ,mem_store_flag +0053 d840aa55 arg eeprom_init_flag ,temp +0054 98467c00 isub temp ,null +0055 20628000 rtn zero +0056 604946a0 storet 2 ,mem_store_flag +0057 2020569d branch mouse_otp_store_app_initflag p_mouse_write_otp_locall_addr: -005a 6fe0c678 fetch 1 ,mem_device_flag -005b c1000000 rtneq mode_24g_device -005c c000805f beq mode_bt_device1 ,p_mouse_write_otp_le_locall_addr1 -005d c0010073 beq mode_bt_device2 ,p_mouse_write_otp_le_locall_addr2 -005e 20600000 rtn +0058 6fe0c678 fetch 1 ,mem_device_flag +0059 c1000000 rtneq mode_24g_device +005a c000805d beq mode_bt_device1 ,p_mouse_write_otp_le_locall_addr1 +005b c0010071 beq mode_bt_device2 ,p_mouse_write_otp_le_locall_addr2 +005c 20600000 rtn p_mouse_write_otp_le_locall_addr1: -005f 6a414a8b fetchr regb ,2 ,mem_otp_offset_le_locall_addr1 -0060 1a422600 copy regb ,regc +005d 6a414a8b fetchr regb ,2 ,mem_otp_offset_le_locall_addr1 +005e 1a422600 copy regb ,regc p_mouse_write_otp_le_locall_addr1_loop: -0061 204056e5 call mouse_read_otp_le_locall_addr1_common -0062 6fe34a46 fetch 6 ,mem_mouse_le_locall_addr1_temp -0063 203a006b branch p_mouse_le_local_addr1_store ,blank -0064 67e34a40 store 6 ,mem_mouse_le_locall_addr1_last -0065 1a60a606 increase 6 ,regc -0066 6fe14a8d fetch 2 ,mem_otp_offset_le_locall_addr1_end -0067 9a667c00 isub regc ,null -0068 24610000 nrtn positive -0069 1a622400 copy regc ,regb -006a 20200061 branch p_mouse_write_otp_le_locall_addr1_loop +005f 204056e5 call mouse_read_otp_le_locall_addr1_common +0060 6fe34a46 fetch 6 ,mem_mouse_le_locall_addr1_temp +0061 203a0069 branch p_mouse_le_local_addr1_store ,blank +0062 67e34a40 store 6 ,mem_mouse_le_locall_addr1_last +0063 1a60a606 increase 6 ,regc +0064 6fe14a8d fetch 2 ,mem_otp_offset_le_locall_addr1_end +0065 9a667c00 isub regc ,null +0066 24610000 nrtn positive +0067 1a622400 copy regc ,regb +0068 2020005f branch p_mouse_write_otp_le_locall_addr1_loop p_mouse_le_local_addr1_store: -006b 6fe34a40 fetch 6 ,mem_mouse_le_locall_addr1_last -006c 684b4680 fetcht 6 ,mem_device1_locall_addr -006d 98467c00 isub temp ,null -006e 20628000 rtn zero -006f df200006 arg 6 ,loopcnt -0070 da204680 arg mem_device1_locall_addr ,rega -0071 1a622400 copy regc ,regb -0072 20206b33 branch otp_write +0069 6fe34a40 fetch 6 ,mem_mouse_le_locall_addr1_last +006a 684b4680 fetcht 6 ,mem_device1_locall_addr +006b 98467c00 isub temp ,null +006c 20628000 rtn zero +006d df200006 arg 6 ,loopcnt +006e da204680 arg mem_device1_locall_addr ,rega +006f 1a622400 copy regc ,regb +0070 20206b33 branch otp_write p_mouse_write_otp_le_locall_addr2: -0073 6a414a77 fetchr regb ,2 ,mem_otp_offset_le_locall_addr2 -0074 1a422600 copy regb ,regc +0071 6a414a77 fetchr regb ,2 ,mem_otp_offset_le_locall_addr2 +0072 1a422600 copy regb ,regc p_mouse_write_otp_le_locall_addr2_loop: -0075 2040570e call mouse_read_otp_le_locall_addr2_common -0076 6fe34a5e fetch 6 ,mem_mouse_le_locall_addr2_temp -0077 203a007f branch p_mouse_le_local_addr2_store ,blank -0078 67e34a58 store 6 ,mem_mouse_le_locall_addr2_last -0079 1a60a606 increase 6 ,regc -007a 6fe14a79 fetch 2 ,mem_otp_offset_le_locall_addr2_end -007b 9a667c00 isub regc ,null -007c 24610000 nrtn positive -007d 1a622400 copy regc ,regb -007e 20200075 branch p_mouse_write_otp_le_locall_addr2_loop +0073 2040570e call mouse_read_otp_le_locall_addr2_common +0074 6fe34a5e fetch 6 ,mem_mouse_le_locall_addr2_temp +0075 203a007d branch p_mouse_le_local_addr2_store ,blank +0076 67e34a58 store 6 ,mem_mouse_le_locall_addr2_last +0077 1a60a606 increase 6 ,regc +0078 6fe14a79 fetch 2 ,mem_otp_offset_le_locall_addr2_end +0079 9a667c00 isub regc ,null +007a 24610000 nrtn positive +007b 1a622400 copy regc ,regb +007c 20200073 branch p_mouse_write_otp_le_locall_addr2_loop p_mouse_le_local_addr2_store: -007f 6fe34a58 fetch 6 ,mem_mouse_le_locall_addr2_last -0080 684b468d fetcht 6 ,mem_device2_locall_addr -0081 98467c00 isub temp ,null -0082 20628000 rtn zero -0083 df200006 arg 6 ,loopcnt -0084 da20468d arg mem_device2_locall_addr ,rega -0085 1a622400 copy regc ,regb -0086 20206b33 branch otp_write +007d 6fe34a58 fetch 6 ,mem_mouse_le_locall_addr2_last +007e 684b468d fetcht 6 ,mem_device2_locall_addr +007f 98467c00 isub temp ,null +0080 20628000 rtn zero +0081 df200006 arg 6 ,loopcnt +0082 da20468d arg mem_device2_locall_addr ,rega +0083 1a622400 copy regc ,regb +0084 20206b33 branch otp_write p_otp_read_data: -0087 20406b28 call enable_otp_read -0088 20406b63 call otp_read_data1 -0089 20206b26 branch otp_disable_chgpump +0085 20406b28 call enable_otp_read +0086 20406b63 call otp_read_data1 +0087 20206b26 branch otp_disable_chgpump org 0x2000 start: @@ -991,6 +991,8 @@ 2259 205a711d call wdt_set_disable ,blank 225a 37d98200 until null ,lpo_edge 225b 70813b5f jam 0x5f ,0x813b + +initialize_radio_cont_next: 225c 6fe0c099 fetch 1 ,mem_fcomp_div 225d c0082276 beq xtal_16m ,initialize_radio_16m 225e 6fe0c44f fetch 1 ,mem_ring_ibias_trim Index: program/bt.prog =================================================================== --- /1121s/1121se/branch/mouse/mouse_public_1M/program/bt.prog (revision 3672) +++ /1121s/1121se/branch/mouse/mouse_public_1M/program/bt.prog (working copy) @@ -864,7 +864,8 @@ call wdt_set_disable,blank until null,lpo_edge - jam 0x5f,0x813b + jam 0x5f,0x813b +initialize_radio_cont_next: fetch 1,mem_fcomp_div beq XTAL_16M,initialize_radio_16m fetch 1,mem_ring_ibias_trim Index: program/patch.prog =================================================================== --- /1121s/1121se/branch/mouse/mouse_public_1M/program/patch.prog (revision 3672) +++ /1121s/1121se/branch/mouse/mouse_public_1M/program/patch.prog (working copy) @@ -4,17 +4,19 @@ bbit1 8,pf_patch_ext + // beq patch03_2,p_initialize_radio_cont ifdef TEST + beq patch0e_3,p_mouse_load_device_info_check beq patch0f_1,p_mouse_start_work ifdef AUTO_TEST beq patch10_3,p_mouse_motion beq patch11_2,p_mouse_init_sunt beq patch11_3,p_mouse_init_sensor endif + beq patch12_7,p_mouse_store_device_info endif beq patch11_7,p_mouse_priority_bb_event beq patch12_0,p_mouse_le - beq patch12_7,p_mouse_store_device_info beq patch1d_2,p_otp_read_data branch assert @@ -26,7 +28,33 @@ rtneq patch3f_7 branch assert + +// p_initialize_radio_cont: +// until null,lpo_edge +// jam 0x0d,0x8946 +// jam 0x10,0x896f + +// jam 0xcd,0x8a13 +// jam 0x10,0x8a06 +// jam 0x4a,0x8a84 +// jam 0x40,0x8a85 +// jam 0xfe,0x8a16 +// // call set_otp_config +// fetch 1,mem_wdt_always_work +// call wdt_set_disable,blank + +// until null,lpo_edge +// jam 0x5f,0x813b +// until null,lpo_edge +// jam 0x58,0x813c +// until null,lpo_edge +// branch initialize_radio_cont_next + + ifdef TEST +p_mouse_load_device_info_check: + rtn + p_mouse_start_work: call app_param_init branch mouse_start_work+1 @@ -82,6 +110,8 @@ branch p_ms_y_down+2 endif +p_mouse_store_device_info: + rtn endif p_mouse_priority_bb_event: copy regc,pdata @@ -172,12 +202,7 @@ branch mouse_g24_retransmit_100ms_timer_next endif -p_mouse_store_device_info: - fetch MOUSE_FLAG_LEN,mem_mouse_flag - bbit1 MOUSE_ENABLE_EEPROM,mouse_store_eeprom_device_info - bbit1 MOUSE_ENABLE_FLASH,mouse_store_flash_device_info - bbit1 MOUSE_ENABLE_OTP,p_mouse_store_otp_device_info - rtn + p_mouse_store_otp_device_info: call p_mouse_write_otp_app_initflag call p_mouse_write_otp_locall_addr Index: sched/mouse.dat =================================================================== --- /1121s/1121se/branch/mouse/mouse_public_1M/sched/mouse.dat (revision 3672) +++ /1121s/1121se/branch/mouse/mouse_public_1M/sched/mouse.dat (working copy) @@ -155,7 +155,7 @@ mem_device_option:08 mem_device_number:02 #01:only 2.4g 02:2.4g+ble 03:2.4g+ble+ble -mem_lpm_mode:00 +mem_lpm_mode:01 mem_lpm_mult:20 mem_lpm_mult_init:20 @@ -282,7 +282,7 @@ 06 00 #min interval 09 00 #max interval 20 00 #latency -64 00 #timeout +2c 01 #timeout #mem_le_adv_interval:01 00 Index: sched/mouse_sensor.dat =================================================================== --- /1121s/1121se/branch/mouse/mouse_public_1M/sched/mouse_sensor.dat (revision 3672) +++ /1121s/1121se/branch/mouse/mouse_public_1M/sched/mouse_sensor.dat (working copy) @@ -155,7 +155,7 @@ 09 00 ff ff -mem_sensor_ka8g2_poweron_init:: +mem_sensor_ka8g2_poweron_init: 09 a5 0b f3 09 00