Index: format/app_mouse.format =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-C_Multimode/Standard_2.4G&BLE/format/app_mouse.format (revision 408) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-C_Multimode/Standard_2.4G&BLE/format/app_mouse.format (working copy) @@ -323,10 +323,9 @@ 1 mem_sensor_shutdown_flag - 2 mem_mouse_bt_reconn_led_blink_time 6 mem_mouse_factory_addr - +1 mem_mouse_reuse_2ice_gpio ) Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-C_Multimode/Standard_2.4G&BLE/output/eeprom.dat (revision 408) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-C_Multimode/Standard_2.4G&BLE/output/eeprom.dat (working copy) @@ -2,8 +2,8 @@ 02 aa 55 -ba -03 +4e +04 c2 84 00 @@ -15,11 +15,11 @@ c0 45 80 -15 +36 c0 4f 80 -20 +41 c0 57 00 @@ -27,27 +27,27 @@ c0 61 80 -ca +ef c0 64 80 -22 +43 c0 65 00 -2d +52 c0 68 00 -6c +91 c0 6b 00 -36 +5b c0 6c 80 -7d +a2 20 20 13 @@ -55,11 +55,11 @@ c0 50 80 -c0 +e5 c0 60 00 -cf +f4 20 20 13 @@ -85,9 +85,141 @@ 6d f3 20 +40 +00 +16 +20 20 3b -c1 +c2 +20 +75 +80 +00 +20 +40 +26 +07 +20 +40 +22 +ff +20 +40 +3f +1e +20 +40 +3d +13 +20 +40 +1b +16 +20 +40 +1b +3f +20 +40 +1b +32 +20 +40 +1b +1e +6f +e4 +4b +ab +c2 +89 +80 +23 +c2 +89 +45 +f6 +20 +60 +00 +00 +20 +40 +5d +d8 +20 +40 +5d +9f +6f +e4 +4b +ab +2f +ef +fe +09 +24 +40 +dd +bf +20 +40 +46 +3b +20 +20 +00 +2a +6f +e1 +49 +90 +d8 +40 +aa +55 +98 +46 +7c +00 +20 +22 +c5 +e2 +60 +49 +49 +90 +20 +40 +45 +e7 +6f +e0 +c9 +26 +67 +e0 +c9 +92 +6f +e2 +48 +8d +67 +e2 +48 +91 +67 +e2 +48 +3c +20 +60 +00 +00 70 8a 8b @@ -152,6 +284,14 @@ 40 40 15 +6f +e0 +c9 +10 +c0 +7f +80 +4c 68 48 c9 @@ -168,6 +308,14 @@ 40 60 42 +68 +48 +cb +ea +20 +40 +3f +56 6f e0 c9 @@ -227,23 +375,23 @@ c0 1d 00 -50 +75 c0 1e 00 -4b +70 c0 02 00 -44 +69 c0 09 80 -44 +69 c0 19 00 -3d +62 20 20 43 @@ -255,7 +403,7 @@ c0 00 80 -41 +66 70 4b 76 @@ -343,19 +491,19 @@ c0 02 00 -57 +7c c0 01 80 -5a +7f 20 20 00 -5f +84 20 40 00 -bb +e0 20 40 47 @@ -371,11 +519,11 @@ c3 17 80 -5f +84 c2 89 80 -5f +84 c2 89 48 @@ -415,7 +563,7 @@ 20 22 80 -6a +8f 6f e0 c9 @@ -443,7 +591,7 @@ 20 40 00 -6f +94 20 20 40 @@ -495,7 +643,7 @@ 20 3a 00 -95 +ba 67 e0 cb @@ -527,11 +675,11 @@ 20 40 00 -aa +cf 20 40 00 -92 +b7 20 40 40 @@ -595,7 +743,7 @@ da 40 00 -95 +ba 20 20 31 @@ -651,11 +799,11 @@ 20 41 00 -a4 +c9 24 41 00 -a8 +cd 20 20 48 @@ -711,7 +859,7 @@ 20 3a 00 -b2 +d7 20 20 49 @@ -747,7 +895,7 @@ c0 ff 80 -bb +e0 20 20 48 @@ -839,7 +987,7 @@ c0 02 00 -d2 +f7 20 20 19 @@ -850,8 +998,8 @@ eb 20 40 -00 -e7 +01 +0c 20 40 7c @@ -867,7 +1015,7 @@ c0 05 00 -d9 +fe 20 20 1c @@ -886,8 +1034,8 @@ c0 c2 81 -80 -e1 +81 +06 6f e1 44 @@ -914,16 +1062,16 @@ 00 24 22 -80 -dd +81 +02 20 40 1e 8d 24 34 -00 -dd +01 +02 20 20 1e @@ -957,7 +1105,7 @@ 00 00 eb -9e +0b aa 55 40 @@ -1042,7 +1190,7 @@ 7a 41 88 -13 +16 ce aa 55 @@ -1116,10 +1264,10 @@ 48 08 07 -03 +06 00 50 -03 +06 94 85 90 @@ -1167,6 +1315,13 @@ ff aa 55 +01 +00 +ea +4b +03 +aa +55 12 00 cc @@ -1202,7 +1357,7 @@ 00 b3 4b -02 +03 02 aa 55 @@ -1271,7 +1426,7 @@ 0a 60 06 -03 +0a 00 64 00 @@ -1414,8 +1569,8 @@ 00 a8 40 -16 -a1 +11 +11 c8 12 23 @@ -1645,8 +1800,8 @@ 00 7a 43 -19 -09 +11 +11 3a 0e 8e @@ -2137,163 +2292,8 @@ ff ff ff -40 -30 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +70 +11 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -bd -8b +cf +44 Index: output/memmap.format =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-C_Multimode/Standard_2.4G&BLE/output/memmap.format (revision 408) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-C_Multimode/Standard_2.4G&BLE/output/memmap.format (working copy) @@ -2205,6 +2205,7 @@ 0x4be1 mem_sensor_shutdown_flag 0x4be2 mem_mouse_bt_reconn_led_blink_time 0x4be4 mem_mouse_factory_addr +0x4bea mem_mouse_reuse_2ice_gpio 0x48d0 mem_remote_car_hard_soft_switch 0x48d1 mem_remote_car_queue_each_size 0x48d2 mem_remote_car_queue_length Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-C_Multimode/Standard_2.4G&BLE/output/program.lis (revision 408) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-C_Multimode/Standard_2.4G&BLE/output/program.lis (working copy) @@ -2,20 +2,20 @@ org 0x0000 0000 c284000c bbit1 8 ,pf_patch_ext 0001 c000000f beq patch00_0 ,p_soft_reset -0002 c0458015 beq patch11_3 ,p_initialize_radio_cont -0003 c04f8020 beq patch13_7 ,p_init_param +0002 c0458036 beq patch11_3 ,p_initialize_radio_cont +0003 c04f8041 beq patch13_7 ,p_init_param 0004 c0570013 beq patch15_6 ,p_app_init -0005 c06180ca beq patch18_3 ,p_mouse_start_work -0006 c0648022 beq patch19_1 ,p_mouse_setgpio_hibernate -0007 c065002d beq patch19_2 ,p_mouse_lpm_before_common -0008 c068006c beq patch1a_0 ,p_mouse_seting_dpi -0009 c06b0036 beq patch1a_6 ,p_mouse_priority_bb_event -000a c06c807d beq patch1b_1 ,p_mouse_bb_event_timer +0005 c06180ef beq patch18_3 ,p_mouse_start_work +0006 c0648043 beq patch19_1 ,p_mouse_setgpio_hibernate +0007 c0650052 beq patch19_2 ,p_mouse_lpm_before_common +0008 c0680091 beq patch1a_0 ,p_mouse_seting_dpi +0009 c06b005b beq patch1a_6 ,p_mouse_priority_bb_event +000a c06c80a2 beq patch1b_1 ,p_mouse_bb_event_timer 000b 2020137c branch loop pf_patch_ext: -000c c05080c0 beq patch34_1 ,p_le_slave_match -000d c06000cf beq patch38_0 ,p_le_parse_l2cap +000c c05080e5 beq patch34_1 ,p_le_slave_match +000d c06000f4 beq patch38_0 ,p_le_parse_l2cap 000e 2020137c branch loop p_soft_reset: @@ -28,288 +28,333 @@ p_mouse_init: 0013 20406df3 call enable_authrom -0014 20203bc1 branch mouse_init +0014 20400016 call p_mouse_setting_config +0015 20203bc2 branch mouse_init + 1 + +p_mouse_setting_config: +0016 20758000 rtn wake +0017 20402607 call g24_transmit_init +0018 204022ff call g24_chmap_param_init +0019 20403f1e call mouse_gpio_init +001a 20403d13 call mouse_param_init +001b 20401b16 call le_set_config_fixed_ltk +001c 20401b3f call le_set_justwork +001d 20401b32 call le_set_fixed_ltk +001e 20401b1e call le_set_config_read_authentication +001f 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0020 c2898023 bbit1 mouse_enable_eeprom ,p_mouse_load_eeprom_info_check +0021 c28945f6 bbit1 mouse_enable_flash ,mouse_load_flash_info_check +0022 20600000 rtn + +p_mouse_load_eeprom_info_check: +0023 20405dd8 call iicd_wp_gpio_output_low +0024 20405d9f call iicd_init_pin_scl_sda +0025 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0026 2feffe09 isolate1 mouse_enable_2k_eeprom ,pdata +0027 2440ddbf ncall clear_eeprom_size_2k ,true +0028 2040463b call mouse_eeprom_load_recon_info +0029 2020002a branch p_mouse_app_initflag_check + +p_mouse_app_initflag_check: +002a 6fe14990 fetch 2 ,mem_store_flag +002b d840aa55 arg eeprom_init_flag ,temp +002c 98467c00 isub temp ,null +002d 2022c5e2 branch mouse_load_device_info ,zero +002e 60494990 storet 2 ,mem_store_flag +002f 204045e7 call mouse_ble_init_address +0030 6fe0c926 fetch 1 ,mem_config_sensor_dpi +0031 67e0c992 store 1 ,mem_mouse_dpi +0032 6fe2488d fetch 4 ,mem_24g_fast_conn_addr +0033 67e24891 store 4 ,mem_24g_receiver_addr +0034 67e2483c store 4 ,mem_24g_addr +0035 20600000 rtn p_initialize_radio_cont: -0015 708a8be6 jam 0xe6 ,core_syn_aac_cfg1 -0016 2040126a call initialize_syn_afc_cfg1 -0017 20401271 call initialize_rf_ldo_cfg1 -0018 20401277 call initialize_rc_cal -0019 708a6d09 jam 0x09 ,core_rx_bq_cfg0 -001a 708a0305 jam 5 ,core_clkpll_cfg0 -001b 708a7a94 jam 0x94 ,core_rx_iqadc_cfg -001c 708a0e0b jam 0x0b ,core_rf_ldo_cfg2 -001d 708a0f05 jam 0x05 ,core_rf_ldo_cfg3 -001e 708a8390 jam 0x90 ,core_syn_pfd_lkd_cfg -001f 2020125d branch initialize_radio_cont + 8 +0036 708a8be6 jam 0xe6 ,core_syn_aac_cfg1 +0037 2040126a call initialize_syn_afc_cfg1 +0038 20401271 call initialize_rf_ldo_cfg1 +0039 20401277 call initialize_rc_cal +003a 708a6d09 jam 0x09 ,core_rx_bq_cfg0 +003b 708a0305 jam 5 ,core_clkpll_cfg0 +003c 708a7a94 jam 0x94 ,core_rx_iqadc_cfg +003d 708a0e0b jam 0x0b ,core_rf_ldo_cfg2 +003e 708a0f05 jam 0x05 ,core_rf_ldo_cfg3 +003f 708a8390 jam 0x90 ,core_syn_pfd_lkd_cfg +0040 2020125d branch initialize_radio_cont + 8 p_init_param: -0020 70008000 jam 0 ,mem_lmo_tid2 -0021 202013b7 branch init_param_next + 1 +0041 70008000 jam 0 ,mem_lmo_tid2 +0042 202013b7 branch init_param_next + 1 p_mouse_setgpio_hibernate: -0022 204042e9 call mouse_set_sdio_high -0023 20407fdc call clear_wake -0024 20404015 call mouse_before_hibernate_wheel_gpio_set -0025 6848c910 fetcht 1 ,mem_matrix_public_gpio -0026 20406069 call gpio_out_active -0027 6848c910 fetcht 1 ,mem_matrix_public_gpio -0028 20406042 call gpio_clr_wake -0029 6fe0c920 fetch 1 ,mem_mouse_sensor_sdio_gpio -002a d840003f arg gpcfg_output_high ,temp -002b 20406093 call gpio_config_function_int -002c 20203e36 branch mouse_setgpio_hibernate + 3 +0043 204042e9 call mouse_set_sdio_high +0044 20407fdc call clear_wake +0045 20404015 call mouse_before_hibernate_wheel_gpio_set +0046 6fe0c910 fetch 1 ,mem_matrix_public_gpio +0047 c07f804c beq gpio_disable ,p_mouse_setgpio_hibernate_skip_public_gpio +0048 6848c910 fetcht 1 ,mem_matrix_public_gpio +0049 20406069 call gpio_out_active +004a 6848c910 fetcht 1 ,mem_matrix_public_gpio +004b 20406042 call gpio_clr_wake + +p_mouse_setgpio_hibernate_skip_public_gpio: +004c 6848cbea fetcht 1 ,mem_mouse_reuse_2ice_gpio +004d 20403f56 call mouse_gpio_config_input_pu +004e 6fe0c920 fetch 1 ,mem_mouse_sensor_sdio_gpio +004f d840003f arg gpcfg_output_high ,temp +0050 20406093 call gpio_config_function_int +0051 20203e36 branch mouse_setgpio_hibernate + 3 p_mouse_lpm_before_common: -002d 6848c913 fetcht 1 ,mem_whee_a_data_gpio -002e 20406050 call gpio_config_input -002f 6848c914 fetcht 1 ,mem_whee_b_data_gpio -0030 20406050 call gpio_config_input -0031 20403f88 call mouse_wheel_check -0032 6fe0c91f fetch 1 ,mem_mouse_sensor_sclk_gpio -0033 d840003f arg gpcfg_output_high ,temp -0034 20406093 call gpio_config_function_int -0035 20203e44 branch mouse_lpm_before_common_next +0052 6848c913 fetcht 1 ,mem_whee_a_data_gpio +0053 20406050 call gpio_config_input +0054 6848c914 fetcht 1 ,mem_whee_b_data_gpio +0055 20406050 call gpio_config_input +0056 20403f88 call mouse_wheel_check +0057 6fe0c91f fetch 1 ,mem_mouse_sensor_sclk_gpio +0058 d840003f arg gpcfg_output_high ,temp +0059 20406093 call gpio_config_function_int +005a 20203e44 branch mouse_lpm_before_common_next p_mouse_priority_bb_event: -0036 1a627e00 copy regc ,pdata -0037 c01d0050 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail -0038 c01e004b beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success -0039 c0020044 beq bt_evt_reconn_failed ,p_mouse_bb_event_reconn_failed -003a c0098044 beq bt_evt_reconn_page_timeout ,p_mouse_bb_event_reconn_failed -003b c019003d beq bt_evt_le_start_enc ,p_mouse_le_ll_start_encryt -003c 20204336 branch mouse_priority_bb_event + 2 +005b 1a627e00 copy regc ,pdata +005c c01d0075 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail +005d c01e0070 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success +005e c0020069 beq bt_evt_reconn_failed ,p_mouse_bb_event_reconn_failed +005f c0098069 beq bt_evt_reconn_page_timeout ,p_mouse_bb_event_reconn_failed +0060 c0190062 beq bt_evt_le_start_enc ,p_mouse_le_ll_start_encryt +0061 20204336 branch mouse_priority_bb_event + 2 p_mouse_le_ll_start_encryt: -003d 6fe0cac7 fetch 1 ,mem_mouse_le_reconnect_flag -003e c0008041 beq 1 ,p_mouse_le_ll_reconn_start_encryt -003f 704b7614 jam 20 ,mem_le_start_encrypt_timer -0040 20204373 branch mouse_le_ll_enable_start_enc_flag +0062 6fe0cac7 fetch 1 ,mem_mouse_le_reconnect_flag +0063 c0008066 beq 1 ,p_mouse_le_ll_reconn_start_encryt +0064 704b7614 jam 20 ,mem_le_start_encrypt_timer +0065 20204373 branch mouse_le_ll_enable_start_enc_flag p_mouse_le_ll_reconn_start_encryt: -0041 2040436c call mouse_updata_le_param -0042 704b7605 jam 5 ,mem_le_start_encrypt_timer -0043 20204373 branch mouse_le_ll_enable_start_enc_flag +0066 2040436c call mouse_updata_le_param +0067 704b7605 jam 5 ,mem_le_start_encrypt_timer +0068 20204373 branch mouse_le_ll_enable_start_enc_flag p_mouse_bb_event_reconn_failed: -0044 6fe0cac1 fetch 1 ,mem_mouse_bluetooth_fast_conn_flag -0045 c07fc2f8 beq 0xff ,mouse_buletooth_fast_conn_end -0046 6fe1478c fetch 2 ,mem_ui_state_map -0047 c3860000 rtnbit1 ui_state_btn_down -0048 c3830000 rtnbit1 ui_state_bt_discovery -0049 c3858000 rtnbit1 ui_state_ble_adv -004a 20203e20 branch mouse_app_enter_hibernate +0069 6fe0cac1 fetch 1 ,mem_mouse_bluetooth_fast_conn_flag +006a c07fc2f8 beq 0xff ,mouse_buletooth_fast_conn_end +006b 6fe1478c fetch 2 ,mem_ui_state_map +006c c3860000 rtnbit1 ui_state_btn_down +006d c3830000 rtnbit1 ui_state_bt_discovery +006e c3858000 rtnbit1 ui_state_ble_adv +006f 20203e20 branch mouse_app_enter_hibernate p_mouse_24g_attempt_success: -004b 6fe2483c fetch 4 ,mem_24g_addr -004c 67e24891 store 4 ,mem_24g_receiver_addr -004d 67e24993 store 4 ,mem_mouse_24g_addr -004e 204048c6 call mouse_device_poweron_timer_init -004f 2020484e branch mouse_24g_attempt_success +0070 6fe2483c fetch 4 ,mem_24g_addr +0071 67e24891 store 4 ,mem_24g_receiver_addr +0072 67e24993 store 4 ,mem_mouse_24g_addr +0073 204048c6 call mouse_device_poweron_timer_init +0074 2020484e branch mouse_24g_attempt_success p_mouse_24g_attempt_fail: -0050 6fe0c8a5 fetch 1 ,mem_24g_attempt_fail_flag -0051 243a47e1 nbranch mouse_24g_hibernate_set ,blank -0052 6fe0c88b fetch 1 ,mem_24g_reconn_type -0053 c0014840 beq fast_conn_and_3_0_addr ,mouse_24g_fast_conn_attempt_fail -0054 c0020057 beq pair_and_3_0_addr ,p_mouse_24g_auto_pair_attempt_fail -0055 c001805a beq receiver_and_3_0_addr ,p_mouse_reconn_dongle_attempt_fail -0056 2020005f branch p_mouse_24g_attempt_fail_enter_hibernate +0075 6fe0c8a5 fetch 1 ,mem_24g_attempt_fail_flag +0076 243a47e1 nbranch mouse_24g_hibernate_set ,blank +0077 6fe0c88b fetch 1 ,mem_24g_reconn_type +0078 c0014840 beq fast_conn_and_3_0_addr ,mouse_24g_fast_conn_attempt_fail +0079 c002007c beq pair_and_3_0_addr ,p_mouse_24g_auto_pair_attempt_fail +007a c001807f beq receiver_and_3_0_addr ,p_mouse_reconn_dongle_attempt_fail +007b 20200084 branch p_mouse_24g_attempt_fail_enter_hibernate p_mouse_24g_auto_pair_attempt_fail: -0057 204000bb call p_mouse_bt_reconn_setting_led_gpio -0058 204047f2 call mouse_24g_stop -0059 2020481c branch mouse_check_bt_reconn_target +007c 204000e0 call p_mouse_bt_reconn_setting_led_gpio +007d 204047f2 call mouse_24g_stop +007e 2020481c branch mouse_check_bt_reconn_target p_mouse_reconn_dongle_attempt_fail: -005a 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -005b c317805f bbit0 mouse_enable_24g_first_auto_pairing ,p_mouse_24g_attempt_fail_enter_hibernate -005c c289805f bbit1 mouse_enable_eeprom ,p_mouse_24g_attempt_fail_enter_hibernate -005d c2894839 bbit1 mouse_enable_flash ,mouse_24g_attempt_fail_enter_hibernate -005e 20204812 branch mouse_24g_start_auto_pair + 1 +007f 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0080 c3178084 bbit0 mouse_enable_24g_first_auto_pairing ,p_mouse_24g_attempt_fail_enter_hibernate +0081 c2898084 bbit1 mouse_enable_eeprom ,p_mouse_24g_attempt_fail_enter_hibernate +0082 c2894839 bbit1 mouse_enable_flash ,mouse_24g_attempt_fail_enter_hibernate +0083 20204812 branch mouse_24g_start_auto_pair + 1 p_mouse_24g_attempt_fail_enter_hibernate: -005f 20404912 call mouse_device_led_off -0060 204047f2 call mouse_24g_stop -0061 6fe0cab0 fetch 1 ,mem_reconn_times -0062 243a470e nbranch mouse_polling_device ,blank -0063 6fe3493a fetch 6 ,mem_device1_addr -0064 684b4be4 fetcht 6 ,mem_mouse_factory_addr -0065 98467c00 isub temp ,null -0066 2022806a branch p_mouse_start_discovery ,zero -0067 6fe0c938 fetch 1 ,mem_device_flag -0068 c0003e20 beq mode_24g_device ,mouse_app_enter_hibernate -0069 20600000 rtn +0084 20404912 call mouse_device_led_off +0085 204047f2 call mouse_24g_stop +0086 6fe0cab0 fetch 1 ,mem_reconn_times +0087 243a470e nbranch mouse_polling_device ,blank +0088 6fe3493a fetch 6 ,mem_device1_addr +0089 684b4be4 fetcht 6 ,mem_mouse_factory_addr +008a 98467c00 isub temp ,null +008b 2022808f branch p_mouse_start_discovery ,zero +008c 6fe0c938 fetch 1 ,mem_device_flag +008d c0003e20 beq mode_24g_device ,mouse_app_enter_hibernate +008e 20600000 rtn p_mouse_start_discovery: -006a 70493801 jam mode_bt_device1 ,mem_device_flag -006b 20204553 branch mouse_start_discovery +008f 70493801 jam mode_bt_device1 ,mem_device_flag +0090 20204553 branch mouse_start_discovery p_mouse_seting_dpi: -006c 2040408f call mouse_setting_dpi_4_level -006d 2040006f call p_mouse_dpi_led_blink_delay -006e 20204098 branch mouse_seting_sensor_type +0091 2040408f call mouse_setting_dpi_4_level +0092 20400094 call p_mouse_dpi_led_blink_delay +0093 20204098 branch mouse_seting_sensor_type p_mouse_dpi_led_blink_delay: -006f 6fe0c923 fetch 1 ,mem_dpi_led_gpio -0070 c17f8000 rtneq gpio_disable -0071 6fe14ac2 fetch 2 ,mem_mouse_discovery_timer -0072 247a0000 nrtn blank -0073 6fe14883 fetch 2 ,mem_24g_pair_timeout -0074 247a0000 nrtn blank -0075 6fe14887 fetch 2 ,mem_24g_reconn_timeout -0076 247a0000 nrtn blank -0077 6fe0cba7 fetch 1 ,mem_mouse_device_poweron_timer_count -0078 247a0000 nrtn blank -0079 6fe0cbc1 fetch 1 ,mem_mouse_dpi_led_delay_count_init -007a 203a0095 branch p_mouse_dpi_led_blink_init ,blank -007b 67e0cba8 store 1 ,mem_mouse_dpi_led_delay_count -007c 20600000 rtn +0094 6fe0c923 fetch 1 ,mem_dpi_led_gpio +0095 c17f8000 rtneq gpio_disable +0096 6fe14ac2 fetch 2 ,mem_mouse_discovery_timer +0097 247a0000 nrtn blank +0098 6fe14883 fetch 2 ,mem_24g_pair_timeout +0099 247a0000 nrtn blank +009a 6fe14887 fetch 2 ,mem_24g_reconn_timeout +009b 247a0000 nrtn blank +009c 6fe0cba7 fetch 1 ,mem_mouse_device_poweron_timer_count +009d 247a0000 nrtn blank +009e 6fe0cbc1 fetch 1 ,mem_mouse_dpi_led_delay_count_init +009f 203a00ba branch p_mouse_dpi_led_blink_init ,blank +00a0 67e0cba8 store 1 ,mem_mouse_dpi_led_delay_count +00a1 20600000 rtn p_mouse_bb_event_timer: -007d 20403e9b call mouse_adc_read -007e 20404956 call mouse_low_voltage_led_timer -007f 2040232b call g24_pair_timeout_timer -0080 20402556 call g24_reconn_timeout_timer -0081 204047cd call mouse_24g_long_sleep_param_update_timer -0082 204000aa call p_mouse_device_poweron_timer -0083 20400092 call p_mouse_dpi_led_blink_delay_timer -0084 2040407c call mouse_dpi_key_check_long_press -0085 204044cc call mouse_bt_discovery_check -0086 204044dc call mouse_commbination_key_process -0087 204044ff call mouse_check_discovery_timeout_timer -0088 20404504 call mouse_check_direct_timeout_timer -0089 20404512 call mouse_le_enable_att_list_timer -008a 20404515 call mouse_le_send_smp_security_request_timer -008b 2040452a call mouse_check_hid_handshake_timer -008c 2040452d call mouse_bt_check_sniff_req_timeout_timer -008d 20404532 call mouse_check_reconnect_delay_long_sleep -008e 20404535 call mouse_current_mult_update_timer -008f 20404022 call mouse_wheel_trigger_timer -0090 20404547 call mouse_store_information_delay_timer -0091 2020453c branch mouse_check_no_data_timeout_timer +00a2 20403e9b call mouse_adc_read +00a3 20404956 call mouse_low_voltage_led_timer +00a4 2040232b call g24_pair_timeout_timer +00a5 20402556 call g24_reconn_timeout_timer +00a6 204047cd call mouse_24g_long_sleep_param_update_timer +00a7 204000cf call p_mouse_device_poweron_timer +00a8 204000b7 call p_mouse_dpi_led_blink_delay_timer +00a9 2040407c call mouse_dpi_key_check_long_press +00aa 204044cc call mouse_bt_discovery_check +00ab 204044dc call mouse_commbination_key_process +00ac 204044ff call mouse_check_discovery_timeout_timer +00ad 20404504 call mouse_check_direct_timeout_timer +00ae 20404512 call mouse_le_enable_att_list_timer +00af 20404515 call mouse_le_send_smp_security_request_timer +00b0 2040452a call mouse_check_hid_handshake_timer +00b1 2040452d call mouse_bt_check_sniff_req_timeout_timer +00b2 20404532 call mouse_check_reconnect_delay_long_sleep +00b3 20404535 call mouse_current_mult_update_timer +00b4 20404022 call mouse_wheel_trigger_timer +00b5 20404547 call mouse_store_information_delay_timer +00b6 2020453c branch mouse_check_no_data_timeout_timer p_mouse_dpi_led_blink_delay_timer: -0092 da604ba8 arg mem_mouse_dpi_led_delay_count ,regc -0093 da400095 arg p_mouse_dpi_led_blink_init ,regb -0094 2020318a branch timer_single_step +00b7 da604ba8 arg mem_mouse_dpi_led_delay_count ,regc +00b8 da4000ba arg p_mouse_dpi_led_blink_init ,regb +00b9 2020318a branch timer_single_step p_mouse_dpi_led_blink_init: -0095 6fe0c927 fetch 1 ,mem_config_sensor_type -0096 c001c8f2 beq p3212 ,mouse_dpi_led_blink_init -0097 c005c8f2 beq ka8g2 ,mouse_dpi_led_blink_init -0098 6fe0c923 fetch 1 ,mem_dpi_led_gpio -0099 67e0c92f store 1 ,mem_mouse_struct_led_gpio -009a 6fe14bc2 fetch 2 ,mem_mouse_dpi_led_blink_time -009b 67e14930 store 2 ,mem_mouse_on_time -009c 67e14932 store 2 ,mem_mouse_off_time -009d da200000 arg 0 ,rega -009e 6848c992 fetcht 1 ,mem_mouse_dpi -009f 18408402 increase 2 ,temp -00a0 18467c03 sub temp ,3 ,null -00a1 204100a4 call p_mouse_dpi_led_blink_init_level_4 ,positive -00a2 244100a8 ncall p_mouse_dpi_led_blink_count_clean ,positive -00a3 202048ff branch mouse_dpi_led_blink_init_end +00ba 6fe0c927 fetch 1 ,mem_config_sensor_type +00bb c001c8f2 beq p3212 ,mouse_dpi_led_blink_init +00bc c005c8f2 beq ka8g2 ,mouse_dpi_led_blink_init +00bd 6fe0c923 fetch 1 ,mem_dpi_led_gpio +00be 67e0c92f store 1 ,mem_mouse_struct_led_gpio +00bf 6fe14bc2 fetch 2 ,mem_mouse_dpi_led_blink_time +00c0 67e14930 store 2 ,mem_mouse_on_time +00c1 67e14932 store 2 ,mem_mouse_off_time +00c2 da200000 arg 0 ,rega +00c3 6848c992 fetcht 1 ,mem_mouse_dpi +00c4 18408402 increase 2 ,temp +00c5 18467c03 sub temp ,3 ,null +00c6 204100c9 call p_mouse_dpi_led_blink_init_level_4 ,positive +00c7 244100cd ncall p_mouse_dpi_led_blink_count_clean ,positive +00c8 202048ff branch mouse_dpi_led_blink_init_end p_mouse_dpi_led_blink_init_level_4: -00a4 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -00a5 c40e0000 rtnbit0 mouse_enable_dpi_level_4 -00a6 18408401 increase 1 ,temp -00a7 20600000 rtn +00c9 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +00ca c40e0000 rtnbit0 mouse_enable_dpi_level_4 +00cb 18408401 increase 1 ,temp +00cc 20600000 rtn p_mouse_dpi_led_blink_count_clean: -00a8 184085fd increase -3 ,temp -00a9 20600000 rtn +00cd 184085fd increase -3 ,temp +00ce 20600000 rtn p_mouse_device_poweron_timer: -00aa 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -00ab c4100000 rtnbit0 mouse_enable_power_on_led -00ac 6fe0cba7 fetch 1 ,mem_mouse_device_poweron_timer_count -00ad 207a0000 rtn blank -00ae 1fe0ffff increase -1 ,pdata -00af 67e0cba7 store 1 ,mem_mouse_device_poweron_timer_count -00b0 203a00b2 branch p_mouse_device_led_off ,blank -00b1 20204920 branch mouse_device_led_on +00cf 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +00d0 c4100000 rtnbit0 mouse_enable_power_on_led +00d1 6fe0cba7 fetch 1 ,mem_mouse_device_poweron_timer_count +00d2 207a0000 rtn blank +00d3 1fe0ffff increase -1 ,pdata +00d4 67e0cba7 store 1 ,mem_mouse_device_poweron_timer_count +00d5 203a00d7 branch p_mouse_device_led_off ,blank +00d6 20204920 branch mouse_device_led_on p_mouse_device_led_off: -00b2 20404912 call mouse_device_led_off -00b3 6fe0c938 fetch 1 ,mem_device_flag -00b4 c1808000 rtnne mode_bt_device1 -00b5 6fe1478c fetch 2 ,mem_ui_state_map -00b6 c3848000 rtnbit1 ui_state_ble_connected -00b7 c3800000 rtnbit1 ui_state_bt_connected -00b8 6fe0cac1 fetch 1 ,mem_mouse_bluetooth_fast_conn_flag -00b9 c0ff80bb bne 0xff ,p_mouse_bt_reconn_setting_led_gpio -00ba 202048cc branch mouse_discover_setting_led_gpio +00d7 20404912 call mouse_device_led_off +00d8 6fe0c938 fetch 1 ,mem_device_flag +00d9 c1808000 rtnne mode_bt_device1 +00da 6fe1478c fetch 2 ,mem_ui_state_map +00db c3848000 rtnbit1 ui_state_ble_connected +00dc c3800000 rtnbit1 ui_state_bt_connected +00dd 6fe0cac1 fetch 1 ,mem_mouse_bluetooth_fast_conn_flag +00de c0ff80e0 bne 0xff ,p_mouse_bt_reconn_setting_led_gpio +00df 202048cc branch mouse_discover_setting_led_gpio p_mouse_bt_reconn_setting_led_gpio: -00bb 704ba700 jam 0 ,mem_mouse_device_poweron_timer_count -00bc 6fe14be2 fetch 2 ,mem_mouse_bt_reconn_led_blink_time -00bd 67e14930 store 2 ,mem_mouse_on_time -00be 67e14932 store 2 ,mem_mouse_off_time -00bf 202048d0 branch mouse_setting_led_gpio_comman +00e0 704ba700 jam 0 ,mem_mouse_device_poweron_timer_count +00e1 6fe14be2 fetch 2 ,mem_mouse_bt_reconn_led_blink_time +00e2 67e14930 store 2 ,mem_mouse_on_time +00e3 67e14932 store 2 ,mem_mouse_off_time +00e4 202048d0 branch mouse_setting_led_gpio_comman p_le_slave_match: -00c0 6fe0c3dd fetch 1 ,mem_le_md_count -00c1 1fe0fe01 pincrease 1 -00c2 67e0c3dd store 1 ,mem_le_md_count -00c3 c006165a beq le_md_max_count ,le_slave_cont -00c4 2040191b call le_acknowledge -00c5 2040196a call le_prepare_tx -00c6 6fe082bd fetch 1 ,mem_le_tx_phy -00c7 2040168b call le_enable_phy_by_pdata -00c8 20401838 call le_transmit -00c9 20201655 branch le_slave_match + 10 +00e5 6fe0c3dd fetch 1 ,mem_le_md_count +00e6 1fe0fe01 pincrease 1 +00e7 67e0c3dd store 1 ,mem_le_md_count +00e8 c006165a beq le_md_max_count ,le_slave_cont +00e9 2040191b call le_acknowledge +00ea 2040196a call le_prepare_tx +00eb 6fe082bd fetch 1 ,mem_le_tx_phy +00ec 2040168b call le_enable_phy_by_pdata +00ed 20401838 call le_transmit +00ee 20201655 branch le_slave_match + 10 p_mouse_start_work: -00ca 6fe08989 fetch 1 ,mem_wakup_from_power_flag -00cb c3013d53 bbit0 bit_power_on ,mouse_start_work + 1 -00cc 6fe0c938 fetch 1 ,mem_device_flag -00cd c000c81c beq mode_bt_device1 ,mouse_check_bt_reconn_target -00ce 20203d53 branch mouse_start_work + 1 +00ef 6fe08989 fetch 1 ,mem_wakup_from_power_flag +00f0 c3013d53 bbit0 bit_power_on ,mouse_start_work + 1 +00f1 6fe0c938 fetch 1 ,mem_device_flag +00f2 c000c81c beq mode_bt_device1 ,mouse_check_bt_reconn_target +00f3 20203d53 branch mouse_start_work + 1 p_le_parse_l2cap: -00cf efe10006 ifetch 2 ,contr -00d0 c00200d2 beq le_l2cap_cid_att ,p_le_parse_att -00d1 202019e4 branch le_parse_l2cap + 10 +00f4 efe10006 ifetch 2 ,contr +00f5 c00200f7 beq le_l2cap_cid_att ,p_le_parse_att +00f6 202019e4 branch le_parse_l2cap + 10 p_le_parse_att: -00d2 20407ceb call store_contr -00d3 204000e7 call p_mouse_le_reconn_write_enable_timer_reinit -00d4 20407ce5 call get_contr -00d5 efe18006 ifetch 3 ,contr -00d6 67e1c436 store 3 ,mem_le_att_opcode -00d7 c00500d9 beq attop_read_request ,p_le_parse_att_read_request -00d8 20201cd3 branch le_parse_att + 2 +00f7 20407ceb call store_contr +00f8 2040010c call p_mouse_le_reconn_write_enable_timer_reinit +00f9 20407ce5 call get_contr +00fa efe18006 ifetch 3 ,contr +00fb 67e1c436 store 3 ,mem_le_att_opcode +00fc c00500fe beq attop_read_request ,p_le_parse_att_read_request +00fd 20201cd3 branch le_parse_att + 2 p_le_parse_att_read_request: -00d9 20401e8d call le_check_encrypt_state -00da 68494437 fetcht 2 ,mem_le_att_handle -00db 6fe0c3c0 fetch 1 ,mem_le_configuration -00dc c28180e1 bbit1 bit_ble_read_auth ,p_le_send_att_read_response_check_auth +00fe 20401e8d call le_check_encrypt_state +00ff 68494437 fetcht 2 ,mem_le_att_handle +0100 6fe0c3c0 fetch 1 ,mem_le_configuration +0101 c2818106 bbit1 bit_ble_read_auth ,p_le_send_att_read_response_check_auth p_le_send_att_read_response: -00dd 6fe14437 fetch 2 ,mem_le_att_handle -00de c0181ec8 beq 0x30 ,le_send_att_error_response_notfound -00df 68494437 fetcht 2 ,mem_le_att_handle -00e0 20201deb branch le_send_att_read_response +0102 6fe14437 fetch 2 ,mem_le_att_handle +0103 c0181ec8 beq 0x30 ,le_send_att_error_response_notfound +0104 68494437 fetcht 2 ,mem_le_att_handle +0105 20201deb branch le_send_att_read_response p_le_send_att_read_response_check_auth: -00e1 6fe143d1 fetch 2 ,mem_le_pairing_handle -00e2 98467c00 isub temp ,null -00e3 242280dd nbranch p_le_send_att_read_response ,zero -00e4 20401e8d call le_check_encrypt_state -00e5 243400dd nbranch p_le_send_att_read_response ,user -00e6 20201e10 branch le_send_att_read_response_error_insufficient_auth +0106 6fe143d1 fetch 2 ,mem_le_pairing_handle +0107 98467c00 isub temp ,null +0108 24228102 nbranch p_le_send_att_read_response ,zero +0109 20401e8d call le_check_encrypt_state +010a 24340102 nbranch p_le_send_att_read_response ,user +010b 20201e10 branch le_send_att_read_response_error_insufficient_auth p_mouse_le_reconn_write_enable_timer_reinit: -00e7 6fe0cac7 fetch 1 ,mem_mouse_le_reconnect_flag -00e8 207a0000 rtn blank -00e9 6fe0cb75 fetch 1 ,mem_le_connect_status_flag -00ea 1fe17e03 and pdata ,0x03 ,pdata -00eb c1018000 rtneq 0x03 -00ec 704b7602 jam 2 ,mem_le_start_encrypt_timer -00ed 20600000 rtn +010c 6fe0cac7 fetch 1 ,mem_mouse_le_reconnect_flag +010d 207a0000 rtn blank +010e 6fe0cb75 fetch 1 ,mem_le_connect_status_flag +010f 1fe17e03 and pdata ,0x03 ,pdata +0110 c1018000 rtneq 0x03 +0111 704b7602 jam 2 ,mem_le_start_encrypt_timer +0112 20600000 rtn org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-C_Multimode/Standard_2.4G&BLE/program/patch.prog (revision 408) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-C_Multimode/Standard_2.4G&BLE/program/patch.prog (working copy) @@ -30,50 +30,87 @@ call mouse_xtal_init // 16M / 24M branch soft_reset+3 - p_app_init: p_mouse_init: call enable_authrom - branch mouse_init - + call p_mouse_setting_config + branch mouse_init+1 + +p_mouse_setting_config: + rtn wake + call g24_transmit_init + call g24_chmap_param_init + call mouse_gpio_init + call mouse_param_init + call le_set_config_fixed_ltk + call le_set_justwork + call le_set_fixed_ltk + call le_set_config_read_authentication + fetch MOUSE_FLAG_LEN,mem_mouse_flag + bbit1 MOUSE_ENABLE_EEPROM,p_mouse_load_eeprom_info_check + bbit1 MOUSE_ENABLE_FLASH,mouse_load_flash_info_check + rtn +p_mouse_load_eeprom_info_check: + call iicd_wp_gpio_output_low + call iicd_init_pin_scl_sda + fetch MOUSE_FLAG_LEN,mem_mouse_flag + isolate1 MOUSE_ENABLE_2K_EEPROM,pdata + ncall clear_eeprom_size_2k,true + call mouse_eeprom_load_recon_info + branch p_mouse_app_initflag_check + +p_mouse_app_initflag_check: + fetch 2,mem_store_flag + arg EEPROM_INIT_FLAG,temp + isub temp,null + branch mouse_load_device_info,zero + storet 2,mem_store_flag + call mouse_ble_init_address +// fetch 1,mem_device_flag_temp +// store 1,mem_device_flag + fetch 1,mem_config_sensor_dpi + store 1,mem_mouse_dpi + fetch 4,mem_24g_fast_conn_addr + store 4,mem_24g_receiver_addr + store 4,mem_24g_addr + rtn + p_initialize_radio_cont: jam 0xe6,core_syn_aac_cfg1 - call initialize_syn_afc_cfg1 call initialize_rf_ldo_cfg1 call initialize_rc_cal - jam 0x09,core_rx_bq_cfg0 - jam 5,core_clkpll_cfg0 jam 0x94,core_rx_iqadc_cfg - jam 0x0b,core_rf_ldo_cfg2 jam 0x05,core_rf_ldo_cfg3 jam 0x90,core_syn_pfd_lkd_cfg - branch initialize_radio_cont+8 p_init_param: jam 0,mem_lmo_tid2 // classic can't reconnect branch init_param_next+1 - p_mouse_setgpio_hibernate: call mouse_set_sdio_high call clear_wake call mouse_before_hibernate_wheel_gpio_set + fetch 1,mem_matrix_public_gpio + beq GPIO_DISABLE,p_mouse_setgpio_hibernate_skip_public_gpio fetcht 1,mem_matrix_public_gpio // enable b4/b5/dpi wakeup call gpio_out_active fetcht 1,mem_matrix_public_gpio call gpio_clr_wake +p_mouse_setgpio_hibernate_skip_public_gpio: + fetcht 1,mem_mouse_reuse_2ice_gpio + call mouse_gpio_config_input_pu fetch 1,mem_mouse_sensor_sdio_gpio arg gpcfg_output_high,temp call gpio_config_function_int branch mouse_setgpio_hibernate+3 - p_mouse_lpm_before_common: fetcht 1,mem_whee_a_data_gpio //reinit gpio pu after disable wheel wakeup call gpio_config_input @@ -86,7 +123,6 @@ call gpio_config_function_int branch mouse_lpm_before_common_next - p_mouse_priority_bb_event: copy regc,pdata beq BT_EVT_24G_ATTEMPT_FAIL,p_mouse_24g_attempt_fail @@ -115,8 +151,6 @@ rtnbit1 UI_STATE_BLE_ADV branch mouse_app_enter_hibernate - - p_mouse_24g_attempt_success: fetch 4,mem_24g_addr store 4,mem_24g_receiver_addr @@ -184,7 +218,6 @@ store 1,mem_mouse_dpi_led_delay_count //delay 1s led blink rtn - p_mouse_bb_event_timer: call mouse_adc_read call mouse_low_voltage_led_timer Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-C_Multimode/Standard_2.4G&BLE/sched/mouse.dat (revision 408) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-C_Multimode/Standard_2.4G&BLE/sched/mouse.dat (working copy) @@ -1,6 +1,6 @@ mem_device_option:08 #08 mouse -mem_lpm_config:88 13 ce #4khz +mem_lpm_config:88 16 ce #4khz mem_fcomp_div:18 mem_rf_init_data:ff @@ -109,9 +109,9 @@ 03 mem_mouse_discovery_timeout:08 07 #3min -mem_mouse_24g_pair_timeout_init:03 00 #300ms 24g reconn timer&pair timer +mem_mouse_24g_pair_timeout_init:06 00 #600ms 24g reconn timer&pair timer mem_mouse_direct_timeout:50 #8s -mem_mouse_24g_reconn_timeout_init:03 #300ms +mem_mouse_24g_reconn_timeout_init:06 #600ms mem_mouse_24g_pair_tx_power:94 #-20dBm mem_rssi_dis_min_24g_init:85 @@ -150,8 +150,8 @@ mem_config_sensor_dpi:00 #00--1200 01--1600 - mem_usb_offline_check_gpio:ff +mem_mouse_reuse_2ice_gpio:03 mem_customer_key_press: @@ -167,7 +167,7 @@ mem_lpm_mode:01 -mem_mouse_bluetooth_type:02 #03 bt3.0+ble #02 ble #01 bt3.0 +mem_mouse_bluetooth_type:03 #03 bt3.0+ble #02 ble #01 bt3.0 mem_device_number:02 #max device number value:01,02,03 mem_device_flag: @@ -186,7 +186,7 @@ mem_mouse_page_to:00 40 # 16384*0.625ms=10s mem_mouse_fast_direct_timeout:0a #1s mem_mouse_fast_page_to:60 06 # 1600*0.625ms = 1s -mem_mouse_24g_power_on_fast_conn_timer:03 00 #300ms +mem_mouse_24g_power_on_fast_conn_timer:0a 00 #1s mem_mouse_24g_search_dongle_time_init: 64 00 mem_mouse_no_data_timeout:70 17 #10min @@ -227,7 +227,7 @@ mem_lpm_mult_init:20 mem_app_connection_options:06 -mem_lap:16 a1 c8 12 23 51 +mem_lap:11 11 c8 12 23 51 mem_local_name_length: 'BT3.0 Mouse mem_sniff_param_interval: @@ -293,7 +293,7 @@ mem_le_adv_channel_map:07 mem_local_rx_max_octets:fb 00 48 08 fb 00 48 08 # 1b -mem_le_lap:19 09 3a 0e 8e ed +mem_le_lap:11 11 3a 0e 8e ed mem_le_keyboard_handle:15 00