Index: format/g24_protocol_stack/24g_reconn.format =================================================================== --- /1306ac/branch/mouse/YJX_Project/Only_24G_Logo_1600/format/g24_protocol_stack/24g_reconn.format (revision 917) +++ /1306ac/branch/mouse/YJX_Project/Only_24G_Logo_1600/format/g24_protocol_stack/24g_reconn.format (working copy) @@ -25,5 +25,6 @@ 2 FAST_CONN_AND_3_0_ADDR 3 RECEIVER_AND_3_0_ADDR 4 PAIR_AND_3_0_ADDR +5 PAIR_AND_RECEIVER ) Index: output/eeprom.dat =================================================================== --- /1306ac/branch/mouse/YJX_Project/Only_24G_Logo_1600/output/eeprom.dat (revision 917) +++ /1306ac/branch/mouse/YJX_Project/Only_24G_Logo_1600/output/eeprom.dat (working copy) @@ -2,72 +2,84 @@ 02 aa 55 -ae -03 +a2 +04 c2 84 00 -0f +10 c0 1b 80 -40 +43 +c0 +1c +00 +92 c0 0c 00 -12 +15 c0 10 00 -15 +18 c0 1e 80 -72 +75 c0 23 00 -84 +87 c0 26 00 -8f +a3 c0 27 00 -b0 +ed c0 29 +01 00 -c3 c0 2d 00 -67 +6a c0 2f 00 -38 +3b c0 2f 80 -3c +3f c0 38 00 -17 +1a c0 71 80 -6d +70 20 20 3a 8a c0 +2a +00 +c4 +c0 +2a +80 +ce +c0 30 80 -7b +7e c1 7f 80 @@ -107,7 +119,7 @@ 20 40 00 -21 +24 20 40 57 @@ -131,7 +143,7 @@ 20 40 00 -5a +5d 20 20 52 @@ -150,8 +162,8 @@ 00 20 40 -00 -d9 +01 +16 d8 40 00 @@ -183,7 +195,7 @@ 20 22 80 -32 +35 20 40 5b @@ -207,7 +219,7 @@ 20 40 00 -35 +38 70 45 e5 @@ -375,7 +387,7 @@ 58 00 00 -5f +62 67 e1 45 @@ -435,7 +447,7 @@ 24 5a 00 -65 +68 20 20 5e @@ -447,7 +459,7 @@ c2 80 80 -70 +73 20 20 3c @@ -471,7 +483,7 @@ c0 00 80 -76 +79 70 80 70 @@ -576,6 +588,74 @@ 20 57 3f +6f +e0 +c5 +e5 +c0 +00 +00 +95 +20 +20 +52 +f0 +6f +e4 +48 +64 +c3 +08 +dd +b7 +20 +40 +52 +ff +20 +34 +5d +fc +6f +e4 +48 +64 +c2 +98 +00 +9c +20 +20 +5d +b0 +6f +e0 +c8 +bd +24 +5a +5a +b8 +70 +45 +e5 +00 +6f +e1 +48 +72 +67 +e1 +45 +29 +70 +45 +2d +01 +20 +20 +4b +a8 1a 62 7e @@ -583,11 +663,11 @@ c0 1e 00 -93 +a7 c0 1d 00 -9f +b3 20 20 59 @@ -657,13 +737,17 @@ 5d f4 c0 +00 +80 +bb +c0 02 00 -a6 +e3 c0 01 80 -ab +e8 20 20 5d @@ -672,6 +756,166 @@ e4 48 64 +c2 +97 +dd +c3 +c2 +98 +00 +bf +20 +20 +5d +f7 +20 +40 +5e +1e +6f +e1 +45 +21 +67 +e1 +45 +29 +70 +45 +2d +05 +20 +20 +4b +a8 +79 +20 +00 +26 +6f +e0 +c5 +47 +79 +3f +fe +01 +79 +20 +7e +02 +67 +e0 +c5 +47 +6f +e0 +c5 +2e +20 +3a +4b +bd +6f +e0 +c5 +2d +c0 +02 +cb +bd +20 +20 +4b +b1 +6f +e1 +45 +2b +d8 +40 +01 +f8 +98 +41 +7e +00 +20 +3a +00 +d3 +20 +20 +4b +d5 +20 +40 +4b +f3 +20 +40 +4c +b0 +24 +2c +4b +fa +24 +37 +cb +fa +20 +20 +4b +dd +6f +e0 +c5 +2e +20 +3a +48 +9b +6f +e1 +45 +2b +1f +e0 +fe +01 +67 +e1 +45 +2b +2f +ef +fe +09 +6f +e0 +c5 +2d +c0 +02 +80 +e1 +20 +20 +4c +01 +20 +20 +cb +bd +20 +20 +49 +15 +6f +e4 +48 +64 c3 17 dd @@ -763,7 +1007,7 @@ 20 40 00 -bf +fc 20 20 5a @@ -802,16 +1046,16 @@ 00 20 40 -00 -e5 +01 +22 6f e2 49 0d 20 3a -00 -d1 +01 +0e 67 e2 49 @@ -838,8 +1082,8 @@ 00 20 20 -00 -c7 +01 +04 6f e2 49 @@ -882,16 +1126,16 @@ 00 20 40 -00 -e5 +01 +22 6f e2 49 0d 20 3a -00 -e8 +01 +25 67 e2 49 @@ -910,16 +1154,16 @@ 00 24 21 -00 -e8 +01 +25 1a 42 7e 00 20 20 -00 -db +01 +18 d8 40 00 @@ -944,8 +1188,8 @@ 60 00 00 -a4 -b5 +1f +af aa 55 06 @@ -1186,7 +1430,7 @@ 01 ff ff -07 +ff ff ff ff @@ -1489,7 +1733,7 @@ aa aa 55 +d7 +a0 +31 df -9f -9e -b1 Index: output/program.lis =================================================================== --- /1306ac/branch/mouse/YJX_Project/Only_24G_Logo_1600/output/program.lis (revision 917) +++ /1306ac/branch/mouse/YJX_Project/Only_24G_Logo_1600/output/program.lis (working copy) @@ -1,322 +1,403 @@ include "bt_format " org 0x0000 -0000 c284000f bbit1 8 ,pf_patch_ext -0001 c01b8040 beq patch06_7 ,p_mouse_sensor_set_angle -0002 c00c0012 beq patch03_0 ,p_initialize_radio_cont -0003 c0100015 beq patch04_0 ,p_lpm_sleep -0004 c01e8072 beq patch07_5 ,p_mouse_setgpio_hibernate -0005 c0230084 beq patch08_6 ,p_mouse_3io6key_check -0006 c026008f beq patch09_4 ,p_mouse_priority_bb_event -0007 c02700b0 beq patch09_6 ,p_mouse_bb_event_timer -0008 c02900c3 beq patch0a_2 ,p_mouse_store_device_info -0009 c02d0067 beq patch0b_2 ,p_mouse_24g_package_data -000a c02f0038 beq patch0b_6 ,p_mouse_ui_led_off_static -000b c02f803c beq patch0b_7 ,p_mouse_ui_led_on_static -000c c0380017 beq patch0e_0 ,p_app_init -000d c071806d beq patch1c_3 ,p_le_enable_phy_by_pdata -000e 20203a8a branch assert +0000 c2840010 bbit1 8 ,pf_patch_ext +0001 c01b8043 beq patch06_7 ,p_mouse_sensor_set_angle +0002 c01c0092 beq patch07_0 ,p_mouse_start_work +0003 c00c0015 beq patch03_0 ,p_initialize_radio_cont +0004 c0100018 beq patch04_0 ,p_lpm_sleep +0005 c01e8075 beq patch07_5 ,p_mouse_setgpio_hibernate +0006 c0230087 beq patch08_6 ,p_mouse_3io6key_check +0007 c02600a3 beq patch09_4 ,p_mouse_priority_bb_event +0008 c02700ed beq patch09_6 ,p_mouse_bb_event_timer +0009 c0290100 beq patch0a_2 ,p_mouse_store_device_info +000a c02d006a beq patch0b_2 ,p_mouse_24g_package_data +000b c02f003b beq patch0b_6 ,p_mouse_ui_led_off_static +000c c02f803f beq patch0b_7 ,p_mouse_ui_led_on_static +000d c038001a beq patch0e_0 ,p_app_init +000e c0718070 beq patch1c_3 ,p_le_enable_phy_by_pdata +000f 20203a8a branch assert pf_patch_ext: -000f c030807b beq patch2c_1 ,p_g24_lpm_wait -0010 c17f8000 rtneq patch3f_7 -0011 20203a8a branch assert +0010 c02a00c4 beq patch2a_4 ,p_g24_reconn_start +0011 c02a80ce beq patch2a_5 ,p_g24_reconn_dispatch +0012 c030807e beq patch2c_1 ,p_g24_lpm_wait +0013 c17f8000 rtneq patch3f_7 +0014 20203a8a branch assert p_initialize_radio_cont: -0012 708a7503 jam 0x03 ,core_rx_lna_cfg3 -0013 708a8500 jam 0 ,core_syn_loopdiv_dsm_cfg -0014 20203a1e branch initialize_radio_cont + 1 +0015 708a7503 jam 0x03 ,core_rx_lna_cfg3 +0016 708a8500 jam 0 ,core_syn_loopdiv_dsm_cfg +0017 20203a1e branch initialize_radio_cont + 1 p_lpm_sleep: -0015 20403c18 call lpm_write_gpio_wakeup -0016 20203b48 branch lpm_sleep + 1 +0018 20403c18 call lpm_write_gpio_wakeup +0019 20203b48 branch lpm_sleep + 1 p_app_init: p_mouse_init: -0017 70808073 jam 0x73 ,core_spid_ctrl -0018 20406eb3 call enable_authrom -0019 20400021 call p_mouse_setting_config -001a 204057a0 call mouse_init_sunt -001b 20758000 rtn wake -001c 204059bd call mouse_le_name_load -001d 2040562e call mouse_dpi_config -001e 20405cc5 call mouse_drawing_optima_init -001f 2040005a call p_mouse_cb_fuction -0020 20205234 branch mouse_init + 8 +001a 70808073 jam 0x73 ,core_spid_ctrl +001b 20406eb3 call enable_authrom +001c 20400024 call p_mouse_setting_config +001d 204057a0 call mouse_init_sunt +001e 20758000 rtn wake +001f 204059bd call mouse_le_name_load +0020 2040562e call mouse_dpi_config +0021 20405cc5 call mouse_drawing_optima_init +0022 2040005d call p_mouse_cb_fuction +0023 20205234 branch mouse_init + 8 p_mouse_setting_config: -0021 20758000 rtn wake -0022 2040525e call mouse_setting_config -0023 c40b8000 rtnbit0 mouse_enable_otp +0024 20758000 rtn wake +0025 2040525e call mouse_setting_config +0026 c40b8000 rtnbit0 mouse_enable_otp p_mouse_load_otp_info_check: -0024 204000d9 call p_mouse_read_otp_24g_addr +0027 20400116 call p_mouse_read_otp_24g_addr p_mouse_otp_load_app_initflag: -0025 d8400002 arg 2 ,temp -0026 dfe007ee arg otp_offset_app_initlag ,pdata -0027 da20463d arg mem_store_flag ,rega -0028 204068c5 call otpd_read_data_with_pwr_operation -0029 6fe1463d fetch 2 ,mem_store_flag -002a d840aa55 arg eeprom_init_flag ,temp -002b 98467c00 isub temp ,null -002c 20228032 branch p_mouse_load_device_info ,zero -002d 20405b76 call mouse_app_initflag_check + 4 +0028 d8400002 arg 2 ,temp +0029 dfe007ee arg otp_offset_app_initlag ,pdata +002a da20463d arg mem_store_flag ,rega +002b 204068c5 call otpd_read_data_with_pwr_operation +002c 6fe1463d fetch 2 ,mem_store_flag +002d d840aa55 arg eeprom_init_flag ,temp +002e 98467c00 isub temp ,null +002f 20228035 branch p_mouse_load_device_info ,zero +0030 20405b76 call mouse_app_initflag_check + 4 p_mouse_otp_store_app_initflag: -002e df200002 arg 2 ,loopcnt -002f da20463d arg mem_store_flag ,rega -0030 dfe007ee arg otp_offset_app_initlag ,pdata -0031 20206883 branch otp_write +0031 df200002 arg 2 ,loopcnt +0032 da20463d arg mem_store_flag ,rega +0033 dfe007ee arg otp_offset_app_initlag ,pdata +0034 20206883 branch otp_write p_mouse_load_device_info: -0032 20400035 call p_mouse_load_default_dpi -0033 7045e500 jam mode_24g_device ,mem_device_flag -0034 20205b81 branch mouse_load_device_info + 1 +0035 20400038 call p_mouse_load_default_dpi +0036 7045e500 jam mode_24g_device ,mem_device_flag +0037 20205b81 branch mouse_load_device_info + 1 p_mouse_load_default_dpi: -0035 6fe0c5c0 fetch 1 ,mem_config_sensor_dpi -0036 67e0c63f store 1 ,mem_mouse_dpi -0037 20600000 rtn +0038 6fe0c5c0 fetch 1 ,mem_config_sensor_dpi +0039 67e0c63f store 1 ,mem_mouse_dpi +003a 20600000 rtn p_mouse_ui_led_off_static: -0038 18427e00 copy temp ,pdata -0039 207a0000 rtn blank -003a c17f8000 rtneq gpio_disable -003b 20205f23 branch mouse_ui_led_off_static + 1 +003b 18427e00 copy temp ,pdata +003c 207a0000 rtn blank +003d c17f8000 rtneq gpio_disable +003e 20205f23 branch mouse_ui_led_off_static + 1 p_mouse_ui_led_on_static: -003c 18427e00 copy temp ,pdata -003d 207a0000 rtn blank -003e c17f8000 rtneq gpio_disable -003f 20205f30 branch mouse_ui_led_on_static + 1 +003f 18427e00 copy temp ,pdata +0040 207a0000 rtn blank +0041 c17f8000 rtneq gpio_disable +0042 20205f30 branch mouse_ui_led_on_static + 1 p_mouse_sensor_set_angle: -0040 6fe0c911 fetch 1 ,mem_mouse_ice_sdio_for_sensor_angle -0041 203a52c8 branch mouse_sensor_set_angle + 1 ,blank -0042 6fe0c5be fetch 1 ,mem_sensor_angle_default -0043 67e0c5d5 store 1 ,mem_config_sensor_angle -0044 6fe0c5bd fetch 1 ,mem_select_sensor_angle_gpio -0045 c17f8000 rtneq gpio_disable -0046 2040692d call lpm_write_ice_disable +0043 6fe0c911 fetch 1 ,mem_mouse_ice_sdio_for_sensor_angle +0044 203a52c8 branch mouse_sensor_set_angle + 1 ,blank +0045 6fe0c5be fetch 1 ,mem_sensor_angle_default +0046 67e0c5d5 store 1 ,mem_config_sensor_angle 0047 6fe0c5bd fetch 1 ,mem_select_sensor_angle_gpio -0048 d840003e arg gpcfg_output_low ,temp -0049 20406bbd call gpio_config_function_int -004a 6fe0c5c8 fetch 1 ,mem_mouse_reuse_2ice_gpio +0048 c17f8000 rtneq gpio_disable +0049 2040692d call lpm_write_ice_disable +004a 6fe0c5bd fetch 1 ,mem_select_sensor_angle_gpio 004b d840003e arg gpcfg_output_low ,temp 004c 20406bbd call gpio_config_function_int -004d 6848c5bc fetcht 1 ,mem_mouse_sensor_sdio_gpio -004e 2040547f call mouse_gpio_config_input_pu -004f 6848c5bc fetcht 1 ,mem_mouse_sensor_sdio_gpio -0050 20406b85 call gpio_get_bit -0051 2040d2d2 call mouse_sensor_switch_angle ,true -0052 2040547b call mouse_gpio_config_input_pd -0053 6848c5bc fetcht 1 ,mem_mouse_sensor_sdio_gpio -0054 20406b7c call gpio_config_input -0055 20406931 call lpm_write_ice_enable +004d 6fe0c5c8 fetch 1 ,mem_mouse_reuse_2ice_gpio +004e d840003e arg gpcfg_output_low ,temp +004f 20406bbd call gpio_config_function_int +0050 6848c5bc fetcht 1 ,mem_mouse_sensor_sdio_gpio +0051 2040547f call mouse_gpio_config_input_pu +0052 6848c5bc fetcht 1 ,mem_mouse_sensor_sdio_gpio +0053 20406b85 call gpio_get_bit +0054 2040d2d2 call mouse_sensor_switch_angle ,true +0055 2040547b call mouse_gpio_config_input_pd +0056 6848c5bc fetcht 1 ,mem_mouse_sensor_sdio_gpio +0057 20406b7c call gpio_config_input +0058 20406931 call lpm_write_ice_enable p_ice_gpio_set_float: -0056 6848c5bd fetcht 1 ,mem_select_sensor_angle_gpio -0057 20406bae call gpio_set_high_impedance -0058 6848c5c8 fetcht 1 ,mem_mouse_reuse_2ice_gpio -0059 20206bae branch gpio_set_high_impedance +0059 6848c5bd fetcht 1 ,mem_select_sensor_angle_gpio +005a 20406bae call gpio_set_high_impedance +005b 6848c5c8 fetcht 1 ,mem_mouse_reuse_2ice_gpio +005c 20206bae branch gpio_set_high_impedance p_mouse_cb_fuction: -005a 58005fad setarg mouse_24g_short_sleep -005b 67e14543 store 2 ,mem_cb_24g_transmit_short_sleep -005c 5800005f setarg p_mouse_24g_long_sleep -005d 67e14545 store 2 ,mem_cb_24g_transmit_long_sleep -005e 2020523d branch mouse_cb_fuction + 4 +005d 58005fad setarg mouse_24g_short_sleep +005e 67e14543 store 2 ,mem_cb_24g_transmit_short_sleep +005f 58000062 setarg p_mouse_24g_long_sleep +0060 67e14545 store 2 ,mem_cb_24g_transmit_long_sleep +0061 2020523d branch mouse_cb_fuction + 4 p_mouse_24g_long_sleep: -005f 20404d15 call g24_lpm_wait -0060 24740000 nrtn user -0061 6fe0c863 fetch 1 ,mem_24g_device_led_status -0062 247a0000 nrtn blank -0063 70490501 jam 1 ,mem_mouse_24g_long_sleep_flag -0064 20205fa6 branch mouse_24g_long_sleep + 4 +0062 20404d15 call g24_lpm_wait +0063 24740000 nrtn user +0064 6fe0c863 fetch 1 ,mem_24g_device_led_status +0065 247a0000 nrtn blank +0066 70490501 jam 1 ,mem_mouse_24g_long_sleep_flag +0067 20205fa6 branch mouse_24g_long_sleep + 4 p_mouse_24g_short_sleep_clear_wake: -0065 204074e0 call clear_wake -0066 20203c18 branch lpm_write_gpio_wakeup +0068 204074e0 call clear_wake +0069 20203c18 branch lpm_write_gpio_wakeup p_mouse_24g_package_data: -0067 2040549b call mouse_motion -0068 24740000 nrtn user -0069 6fe0c905 fetch 1 ,mem_mouse_24g_long_sleep_flag -006a 70490500 jam 0 ,mem_mouse_24g_long_sleep_flag -006b 245a0065 ncall p_mouse_24g_short_sleep_clear_wake ,blank -006c 20205e35 branch mouse_24g_package_data + 4 +006a 2040549b call mouse_motion +006b 24740000 nrtn user +006c 6fe0c905 fetch 1 ,mem_mouse_24g_long_sleep_flag +006d 70490500 jam 0 ,mem_mouse_24g_long_sleep_flag +006e 245a0068 ncall p_mouse_24g_short_sleep_clear_wake ,blank +006f 20205e35 branch mouse_24g_package_data + 4 p_le_enable_phy_by_pdata: -006d 18427e00 copy temp ,pdata -006e c2808070 bbit1 bit_le_2m_phy ,p_le_enable_2m -006f 20203ce3 branch le_enable_phy_by_pdata + 3 +0070 18427e00 copy temp ,pdata +0071 c2808073 bbit1 bit_le_2m_phy ,p_le_enable_2m +0072 20203ce3 branch le_enable_phy_by_pdata + 3 p_le_enable_2m: -0070 708a6d89 jam 0x89 ,core_rx_bq_cfg0 -0071 20203ce9 branch le_enable_2m +0073 708a6d89 jam 0x89 ,core_rx_bq_cfg0 +0074 20203ce9 branch le_enable_2m p_mouse_setgpio_hibernate: -0072 20405339 call mouse_setgpio_hibernate + 1 -0073 6fe0c912 fetch 1 ,mem_mouse_logo_enable_gpio0 -0074 c0008076 beq 1 ,p_mouse_setgpio_hibernate_next -0075 70807080 jam 0x80 ,0x8070 +0075 20405339 call mouse_setgpio_hibernate + 1 +0076 6fe0c912 fetch 1 ,mem_mouse_logo_enable_gpio0 +0077 c0008079 beq 1 ,p_mouse_setgpio_hibernate_next +0078 70807080 jam 0x80 ,0x8070 p_mouse_setgpio_hibernate_next: -0076 6fe08017 fetch 1 ,mem_gpio_wakeup_low + 1 -0077 79207e05 set1 5 ,pdata -0078 67e08017 store 1 ,mem_gpio_wakeup_low + 1 -0079 20403c18 call lpm_write_gpio_wakeup -007a 20205af0 branch mouse_1io2led_all_off +0079 6fe08017 fetch 1 ,mem_gpio_wakeup_low + 1 +007a 79207e05 set1 5 ,pdata +007b 67e08017 store 1 ,mem_gpio_wakeup_low + 1 +007c 20403c18 call lpm_write_gpio_wakeup +007d 20205af0 branch mouse_1io2led_all_off p_g24_lpm_wait: -007b 78347c00 enable user -007c 20403b1b call lpo_calibration -007d 6fe1c0be fetch 3 ,mem_clks_per_lpo -007e 203a74ca branch disable_user ,blank -007f 6fe0c094 fetch 1 ,mem_lpm_mode -0080 203a74ca branch disable_user ,blank -0081 6fe0c899 fetch 1 ,mem_sensor_shutdown_flag -0082 247a0000 nrtn blank -0083 20204d1c branch g24_lpm_wait_next +007e 78347c00 enable user +007f 20403b1b call lpo_calibration +0080 6fe1c0be fetch 3 ,mem_clks_per_lpo +0081 203a74ca branch disable_user ,blank +0082 6fe0c094 fetch 1 ,mem_lpm_mode +0083 203a74ca branch disable_user ,blank +0084 6fe0c899 fetch 1 ,mem_sensor_shutdown_flag +0085 247a0000 nrtn blank +0086 20204d1c branch g24_lpm_wait_next p_mouse_3io6key_check: -0084 1a627e00 copy regc ,pdata -0085 67e0c850 store 1 ,mem_mouse_key_status -0086 1fe3fe00 lshift pdata ,pdata -0087 1fe22400 copy pdata ,regb -0088 18422600 copy temp ,regc -0089 2040547b call mouse_gpio_config_input_pd -008a 1a620400 copy regc ,temp -008b 20406b85 call gpio_get_bit -008c 7d20a400 nsetflag true ,0 ,regb -008d 20405753 call mouse_check_press -008e 2020573f branch mouse_check_key_connect_gnd_1 +0087 1a627e00 copy regc ,pdata +0088 67e0c850 store 1 ,mem_mouse_key_status +0089 1fe3fe00 lshift pdata ,pdata +008a 1fe22400 copy pdata ,regb +008b 18422600 copy temp ,regc +008c 2040547b call mouse_gpio_config_input_pd +008d 1a620400 copy regc ,temp +008e 20406b85 call gpio_get_bit +008f 7d20a400 nsetflag true ,0 ,regb +0090 20405753 call mouse_check_press +0091 2020573f branch mouse_check_key_connect_gnd_1 + +p_mouse_start_work: +0092 6fe0c5e5 fetch 1 ,mem_device_flag +0093 c0000095 beq mode_24g_device ,p_mouse_24g_start_mode +0094 202052f0 branch mouse_start_work + 5 + +p_mouse_24g_start_mode: +0095 6fe44864 fetch mouse_flag_len ,mem_mouse_flag +0096 c308ddb7 bbit0 mouse_enable_24g ,mouse_24g_mode_setup_error +0097 204052ff call mouse_wakeup_from_power_check +0098 20345dfc branch mouse_24g_reconn_dongle_start ,user +0099 6fe44864 fetch mouse_flag_len ,mem_mouse_flag +009a c298009c bbit1 mouse_enable_auto_24g_paring ,p_mouse_24g_reconn_general_dongle +009b 20205db0 branch mouse_24g_start_mode + 6 + +p_mouse_24g_reconn_general_dongle: +009c 6fe0c8bd fetch 1 ,mem_mouse_1io2led_led_enable +009d 245a5ab8 ncall mouse_multi_led_blink_enable ,blank +009e 7045e500 jam mode_24g_device ,mem_device_flag +009f 6fe14872 fetch 2 ,mem_mouse_24g_power_on_fast_conn_timer +00a0 67e14529 store 2 ,mem_24g_reconn_timeout +00a1 70452d01 jam fast_conn_and_receiver ,mem_24g_reconn_type +00a2 20204ba8 branch g24_reconn_start p_mouse_priority_bb_event: -008f 1a627e00 copy regc ,pdata -0090 c01e0093 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success -0091 c01d009f beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail -0092 20205914 branch mouse_priority_bb_event + 2 +00a3 1a627e00 copy regc ,pdata +00a4 c01e00a7 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success +00a5 c01d00b3 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail +00a6 20205914 branch mouse_priority_bb_event + 2 p_mouse_24g_attempt_success: -0093 6fe244da fetch 4 ,mem_24g_addr -0094 67e24533 store 4 ,mem_24g_receiver_addr -0095 67e24640 store 4 ,mem_mouse_24g_addr -0096 20404bce call g24_ch_syncword_crc8_init -0097 20405e1b call mouse_device_poweron_led_config -0098 20405aa9 call mouse_no_data_timer_init -0099 204058c4 call mouse_init_sensor_reset -009a 70476800 jam 0 ,mem_mouse_long_mult_flag -009b 70454700 jam 0 ,mem_24g_conn_sm -009c 70452d00 jam 0 ,mem_24g_reconn_type -009d 684a4533 fetcht 4 ,mem_24g_receiver_addr -009e 20205e17 branch mouse_24g_attempt_success + 11 +00a7 6fe244da fetch 4 ,mem_24g_addr +00a8 67e24533 store 4 ,mem_24g_receiver_addr +00a9 67e24640 store 4 ,mem_mouse_24g_addr +00aa 20404bce call g24_ch_syncword_crc8_init +00ab 20405e1b call mouse_device_poweron_led_config +00ac 20405aa9 call mouse_no_data_timer_init +00ad 204058c4 call mouse_init_sensor_reset +00ae 70476800 jam 0 ,mem_mouse_long_mult_flag +00af 70454700 jam 0 ,mem_24g_conn_sm +00b0 70452d00 jam 0 ,mem_24g_reconn_type +00b1 684a4533 fetcht 4 ,mem_24g_receiver_addr +00b2 20205e17 branch mouse_24g_attempt_success + 11 p_mouse_24g_attempt_fail: -009f 6fe0c54b fetch 1 ,mem_24g_attempt_fail_flag -00a0 243a5d80 nbranch mouse_24g_hibernate_set ,blank -00a1 6fe0c52d fetch 1 ,mem_24g_reconn_type -00a2 c0015df4 beq fast_conn_and_3_0_addr ,mouse_24g_fast_conn_attempt_fail -00a3 c00200a6 beq pair_and_3_0_addr ,p_mouse_24g_auto_pair_attempt_fail -00a4 c00180ab beq receiver_and_3_0_addr ,p_mouse_reconn_dongle_attempt_fail -00a5 20205ded branch mouse_24g_attempt_fail_enter_hibernate_next +00b3 6fe0c54b fetch 1 ,mem_24g_attempt_fail_flag +00b4 243a5d80 nbranch mouse_24g_hibernate_set ,blank +00b5 6fe0c52d fetch 1 ,mem_24g_reconn_type +00b6 c0015df4 beq fast_conn_and_3_0_addr ,mouse_24g_fast_conn_attempt_fail +00b7 c00080bb beq fast_conn_and_receiver ,p_mouse_24g_fast_conn_attempt_fail +00b8 c00200e3 beq pair_and_3_0_addr ,p_mouse_24g_auto_pair_attempt_fail +00b9 c00180e8 beq receiver_and_3_0_addr ,p_mouse_reconn_dongle_attempt_fail +00ba 20205ded branch mouse_24g_attempt_fail_enter_hibernate_next + +p_mouse_24g_fast_conn_attempt_fail: +00bb 6fe44864 fetch mouse_flag_len ,mem_mouse_flag +00bc c297ddc3 bbit1 mouse_enable_24g_first_auto_pairing ,mouse_24g_start_auto_pair +00bd c29800bf bbit1 mouse_enable_auto_24g_paring ,p_mouse_24g_start_auto_pair +00be 20205df7 branch mouse_24g_fast_conn_attempt_fail + 3 + +p_mouse_24g_start_auto_pair: +00bf 20405e1e call mouse_device_discover_led_config +00c0 6fe14521 fetch 2 ,mem_24g_pair_timeout_init +00c1 67e14529 store 2 ,mem_24g_reconn_timeout +00c2 70452d05 jam pair_and_receiver ,mem_24g_reconn_type +00c3 20204ba8 branch g24_reconn_start + +p_g24_reconn_start: +00c4 79200026 set1 mark_24g ,mark +00c5 6fe0c547 fetch 1 ,mem_24g_conn_sm +00c6 793ffe01 set0 state_24g_pair ,pdata +00c7 79207e02 set1 state_24g_reconn ,pdata +00c8 67e0c547 store 1 ,mem_24g_conn_sm +00c9 6fe0c52e fetch 1 ,mem_24g_fast_conn_enable +00ca 203a4bbd branch g24_reconn_receiver_addr ,blank +00cb 6fe0c52d fetch 1 ,mem_24g_reconn_type +00cc c002cbbd beq pair_and_receiver ,g24_reconn_receiver_addr +00cd 20204bb1 branch g24_reconn_start + 9 + +p_g24_reconn_dispatch: +00ce 6fe1452b fetch 2 ,mem_24g_reconn_count +00cf d84001f8 arg 0x01f8 ,temp +00d0 98417e00 iand temp ,pdata +00d1 203a00d3 branch p_g24_reconn_dispatch_next ,blank +00d2 20204bd5 branch g24_reconn_dispatch + 5 + +p_g24_reconn_dispatch_next: +00d3 20404bf3 call g24_reconn_data_prep +00d4 20404cb0 call g24_transmit_receive_ack +00d5 242c4bfa nbranch g24_reconn_device_fail ,sync +00d6 2437cbfa nbranch g24_reconn_device_fail ,user3 +00d7 20204bdd branch g24_reconn_dispatch_next + 4 + +p_g24_reconn_device_fail: +00d8 6fe0c52e fetch 1 ,mem_24g_fast_conn_enable +00d9 203a489b branch g24_ch ,blank +00da 6fe1452b fetch 2 ,mem_24g_reconn_count +00db 1fe0fe01 increase 1 ,pdata +00dc 67e1452b store 2 ,mem_24g_reconn_count +00dd 2feffe09 isolate1 9 ,pdata +00de 6fe0c52d fetch 1 ,mem_24g_reconn_type +00df c00280e1 beq pair_and_receiver ,p_g24_reconn_pair_and_reveiver +00e0 20204c01 branch g24_reconn_device_fail + 7 + +p_g24_reconn_pair_and_reveiver: +00e1 2020cbbd branch g24_reconn_receiver_addr ,true +00e2 20204915 branch g24_pair_init_param p_mouse_24g_auto_pair_attempt_fail: -00a6 6fe44864 fetch mouse_flag_len ,mem_mouse_flag -00a7 c317dded bbit0 mouse_enable_24g_first_auto_pairing ,mouse_24g_attempt_fail_enter_hibernate_next -00a8 6fe0c86c fetch 1 ,mem_device_number -00a9 c000dded beq 1 ,mouse_24g_attempt_fail_enter_hibernate_next -00aa 20205dcb branch mouse_24g_first_bluetooth_reconnect +00e3 6fe44864 fetch mouse_flag_len ,mem_mouse_flag +00e4 c317dded bbit0 mouse_enable_24g_first_auto_pairing ,mouse_24g_attempt_fail_enter_hibernate_next +00e5 6fe0c86c fetch 1 ,mem_device_number +00e6 c000dded beq 1 ,mouse_24g_attempt_fail_enter_hibernate_next +00e7 20205dcb branch mouse_24g_first_bluetooth_reconnect p_mouse_reconn_dongle_attempt_fail: -00ab 6fe44864 fetch mouse_flag_len ,mem_mouse_flag -00ac c317dded bbit0 mouse_enable_24g_first_auto_pairing ,mouse_24g_attempt_fail_enter_hibernate_next -00ad c289dded bbit1 mouse_enable_eeprom ,mouse_24g_attempt_fail_enter_hibernate_next -00ae c2895ded bbit1 mouse_enable_flash ,mouse_24g_attempt_fail_enter_hibernate_next -00af 20205dc4 branch mouse_24g_start_auto_pair + 1 +00e8 6fe44864 fetch mouse_flag_len ,mem_mouse_flag +00e9 c317dded bbit0 mouse_enable_24g_first_auto_pairing ,mouse_24g_attempt_fail_enter_hibernate_next +00ea c289dded bbit1 mouse_enable_eeprom ,mouse_24g_attempt_fail_enter_hibernate_next +00eb c2895ded bbit1 mouse_enable_flash ,mouse_24g_attempt_fail_enter_hibernate_next +00ec 20205dc4 branch mouse_24g_start_auto_pair + 1 p_mouse_bb_event_timer: -00b0 204053c6 call mouse_adc_read -00b1 20405f47 call mouse_low_voltage_led_timer -00b2 20404907 call g24_pair_timeout_timer -00b3 20404ba5 call g24_reconn_timeout_timer -00b4 20405d6b call mouse_24g_long_sleep_param_update_timer -00b5 20405e9a call mouse_device_poweron_timer -00b6 20405ecb call mouse_dpi_led_blink_delay_timer -00b7 20405ac1 call mouse_led_multi_timer -00b8 20405af3 call mouse_logo_led_on_timer -00b9 2040561c call mouse_dpi_key_check_long_press -00ba 20405a36 call mouse_bt_discovery_check -00bb 20405a46 call mouse_commbination_key_process -00bc 20405a69 call mouse_check_discovery_timeout_timer -00bd 204000bf call p_mouse_check_direct_timeout_timer -00be 20205a2d branch mouse_bb_event_timer + 15 +00ed 204053c6 call mouse_adc_read +00ee 20405f47 call mouse_low_voltage_led_timer +00ef 20404907 call g24_pair_timeout_timer +00f0 20404ba5 call g24_reconn_timeout_timer +00f1 20405d6b call mouse_24g_long_sleep_param_update_timer +00f2 20405e9a call mouse_device_poweron_timer +00f3 20405ecb call mouse_dpi_led_blink_delay_timer +00f4 20405ac1 call mouse_led_multi_timer +00f5 20405af3 call mouse_logo_led_on_timer +00f6 2040561c call mouse_dpi_key_check_long_press +00f7 20405a36 call mouse_bt_discovery_check +00f8 20405a46 call mouse_commbination_key_process +00f9 20405a69 call mouse_check_discovery_timeout_timer +00fa 204000fc call p_mouse_check_direct_timeout_timer +00fb 20205a2d branch mouse_bb_event_timer + 15 p_mouse_check_direct_timeout_timer: -00bf da604831 arg mem_mouse_direct_timer ,regc -00c0 da405a74 arg mouse_check_direct_timeout ,regb -00c1 20404dcc call timer_single_step -00c2 20205a71 branch mouse_check_direct_timeout_timer + 3 +00fc da604831 arg mem_mouse_direct_timer ,regc +00fd da405a74 arg mouse_check_direct_timeout ,regb +00fe 20404dcc call timer_single_step +00ff 20205a71 branch mouse_check_direct_timeout_timer + 3 p_mouse_store_device_info: -00c3 20405b90 call mouse_store_device_info + 1 -00c4 c40b8000 rtnbit0 mouse_enable_otp +0100 20405b90 call mouse_store_device_info + 1 +0101 c40b8000 rtnbit0 mouse_enable_otp p_mouse_store_otp_device_info: p_mouse_otp_store_24g_addr: -00c5 dfe00790 arg otp_offset_24g_addr ,pdata -00c6 1fe22400 copy pdata ,regb +0102 dfe00790 arg otp_offset_24g_addr ,pdata +0103 1fe22400 copy pdata ,regb p_mouse_otp_store_24g_addr_loop: -00c7 204000e5 call p_mouse_read_otp_24g_addr_common -00c8 6fe2490d fetch 4 ,mem_mouse_24g_addr_temp -00c9 203a00d1 branch p_mouse_24g_addr_store ,blank -00ca 67e24909 store 4 ,mem_mouse_24g_addr_last -00cb 1a40a404 increase 4 ,regb -00cc dfe007cf arg otp_offset_24g_addr_end ,pdata -00cd 9a467c00 isub regb ,null -00ce 24610000 nrtn positive -00cf 1a427e00 copy regb ,pdata -00d0 202000c7 branch p_mouse_otp_store_24g_addr_loop +0104 20400122 call p_mouse_read_otp_24g_addr_common +0105 6fe2490d fetch 4 ,mem_mouse_24g_addr_temp +0106 203a010e branch p_mouse_24g_addr_store ,blank +0107 67e24909 store 4 ,mem_mouse_24g_addr_last +0108 1a40a404 increase 4 ,regb +0109 dfe007cf arg otp_offset_24g_addr_end ,pdata +010a 9a467c00 isub regb ,null +010b 24610000 nrtn positive +010c 1a427e00 copy regb ,pdata +010d 20200104 branch p_mouse_otp_store_24g_addr_loop p_mouse_24g_addr_store: -00d1 6fe24909 fetch 4 ,mem_mouse_24g_addr_last -00d2 684a4640 fetcht 4 ,mem_mouse_24g_addr -00d3 98467c00 isub temp ,null -00d4 20628000 rtn zero -00d5 df200004 arg 4 ,loopcnt -00d6 da204640 arg mem_mouse_24g_addr ,rega -00d7 1a427e00 copy regb ,pdata -00d8 20206883 branch otp_write +010e 6fe24909 fetch 4 ,mem_mouse_24g_addr_last +010f 684a4640 fetcht 4 ,mem_mouse_24g_addr +0110 98467c00 isub temp ,null +0111 20628000 rtn zero +0112 df200004 arg 4 ,loopcnt +0113 da204640 arg mem_mouse_24g_addr ,rega +0114 1a427e00 copy regb ,pdata +0115 20206883 branch otp_write p_mouse_read_otp_24g_addr: -00d9 dfe00790 arg otp_offset_24g_addr ,pdata -00da 1fe22400 copy pdata ,regb +0116 dfe00790 arg otp_offset_24g_addr ,pdata +0117 1fe22400 copy pdata ,regb p_mouse_read_otp_24g_addr_loop: -00db 204000e5 call p_mouse_read_otp_24g_addr_common -00dc 6fe2490d fetch 4 ,mem_mouse_24g_addr_temp -00dd 203a00e8 branch p_mouse_24g_addr_load ,blank -00de 67e24909 store 4 ,mem_mouse_24g_addr_last -00df 1a40a404 increase 4 ,regb -00e0 dfe007cf arg otp_offset_24g_addr_end ,pdata -00e1 9a467c00 isub regb ,null -00e2 242100e8 nbranch p_mouse_24g_addr_load ,positive -00e3 1a427e00 copy regb ,pdata -00e4 202000db branch p_mouse_read_otp_24g_addr_loop +0118 20400122 call p_mouse_read_otp_24g_addr_common +0119 6fe2490d fetch 4 ,mem_mouse_24g_addr_temp +011a 203a0125 branch p_mouse_24g_addr_load ,blank +011b 67e24909 store 4 ,mem_mouse_24g_addr_last +011c 1a40a404 increase 4 ,regb +011d dfe007cf arg otp_offset_24g_addr_end ,pdata +011e 9a467c00 isub regb ,null +011f 24210125 nbranch p_mouse_24g_addr_load ,positive +0120 1a427e00 copy regb ,pdata +0121 20200118 branch p_mouse_read_otp_24g_addr_loop p_mouse_read_otp_24g_addr_common: -00e5 d8400004 arg 4 ,temp -00e6 da20490d arg mem_mouse_24g_addr_temp ,rega -00e7 202068c5 branch otpd_read_data_with_pwr_operation +0122 d8400004 arg 4 ,temp +0123 da20490d arg mem_mouse_24g_addr_temp ,rega +0124 202068c5 branch otpd_read_data_with_pwr_operation p_mouse_24g_addr_load: -00e8 6fe24909 fetch 4 ,mem_mouse_24g_addr_last -00e9 67e24640 store 4 ,mem_mouse_24g_addr -00ea 20600000 rtn +0125 6fe24909 fetch 4 ,mem_mouse_24g_addr_last +0126 67e24640 store 4 ,mem_mouse_24g_addr +0127 20600000 rtn org 0x3800 start: Index: program/patch.prog =================================================================== --- /1306ac/branch/mouse/YJX_Project/Only_24G_Logo_1600/program/patch.prog (revision 917) +++ /1306ac/branch/mouse/YJX_Project/Only_24G_Logo_1600/program/patch.prog (working copy) @@ -7,6 +7,7 @@ ifdef SENSOR_ANGLE_ICE_SDIO beq patch06_7,p_mouse_sensor_set_angle endif + beq patch07_0,p_mouse_start_work beq patch03_0,p_initialize_radio_cont beq patch04_0,p_lpm_sleep beq patch07_5,p_mouse_setgpio_hibernate @@ -25,6 +26,8 @@ ifdef G24_NEW_REVISION beq patch2b_1,p_g24_transmit_no_interrupt endif + beq patch2a_4,p_g24_reconn_start + beq patch2a_5,p_g24_reconn_dispatch beq patch2c_1,p_g24_lpm_wait rtneq patch3f_7 branch assert @@ -379,6 +382,29 @@ nsetflag true,0,regb call mouse_check_press branch mouse_check_key_connect_gnd_1 + +p_mouse_start_work: + fetch 1,mem_device_flag + beq MODE_24G_DEVICE,p_mouse_24g_start_mode + branch mouse_start_work+5 + +p_mouse_24g_start_mode: + fetch MOUSE_FLAG_LEN,mem_mouse_flag + bbit0 MOUSE_ENABLE_24G,mouse_24g_mode_setup_error + call mouse_wakeup_from_power_check // wake from hibernate :enble user + branch mouse_24g_reconn_dongle_start,user + fetch MOUSE_FLAG_LEN,mem_mouse_flag + bbit1 MOUSE_ENABLE_AUTO_24G_PARING,p_mouse_24g_reconn_general_dongle + branch mouse_24g_start_mode+6 + +p_mouse_24g_reconn_general_dongle: + fetch 1,mem_mouse_1io2led_led_enable + ncall mouse_multi_led_blink_enable,blank + jam MODE_24G_DEVICE,mem_device_flag + fetch 2,mem_mouse_24g_power_on_fast_conn_timer + store 2,mem_24g_reconn_timeout + jam FAST_CONN_AND_RECEIVER,mem_24g_reconn_type + branch g24_reconn_start p_mouse_priority_bb_event: copy regc,pdata @@ -405,9 +431,64 @@ nbranch mouse_24g_hibernate_set,blank fetch 1,mem_24g_reconn_type beq FAST_CONN_AND_3_0_ADDR,mouse_24g_fast_conn_attempt_fail + beq FAST_CONN_AND_RECEIVER,p_mouse_24g_fast_conn_attempt_fail beq PAIR_AND_3_0_ADDR,p_mouse_24g_auto_pair_attempt_fail beq RECEIVER_AND_3_0_ADDR,p_mouse_reconn_dongle_attempt_fail branch mouse_24g_attempt_fail_enter_hibernate_next + +p_mouse_24g_fast_conn_attempt_fail: + fetch MOUSE_FLAG_LEN,mem_mouse_flag + bbit1 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,mouse_24g_start_auto_pair + bbit1 MOUSE_ENABLE_AUTO_24G_PARING,p_mouse_24g_start_auto_pair + branch mouse_24g_fast_conn_attempt_fail+3 + +p_mouse_24g_start_auto_pair: + call mouse_device_discover_led_config + fetch 2,mem_24g_pair_timeout_init + store 2,mem_24g_reconn_timeout + jam PAIR_AND_RECEIVER,mem_24g_reconn_type + branch g24_reconn_start + +p_g24_reconn_start: + set1 mark_24g,mark + fetch 1,mem_24g_conn_sm + set0 STATE_24G_PAIR,pdata + set1 STATE_24G_RECONN,pdata + store 1,mem_24g_conn_sm + fetch 1,mem_24g_fast_conn_enable + branch g24_reconn_receiver_addr,blank + fetch 1,mem_24g_reconn_type + beq PAIR_AND_RECEIVER,g24_reconn_receiver_addr + branch g24_reconn_start+9 + +p_g24_reconn_dispatch: + fetch 2,mem_24g_reconn_count + arg 0x01f8,temp + iand temp,pdata + branch p_g24_reconn_dispatch_next,blank + branch g24_reconn_dispatch+5 + +p_g24_reconn_dispatch_next: + call g24_reconn_data_prep + call g24_transmit_receive_ack + nbranch g24_reconn_device_fail,sync + nbranch g24_reconn_device_fail,user3 + branch g24_reconn_dispatch_next+4 + +p_g24_reconn_device_fail: + fetch 1,mem_24g_fast_conn_enable + branch g24_ch,blank + fetch 2,mem_24g_reconn_count + increase 1,pdata + store 2,mem_24g_reconn_count + isolate1 9,pdata + fetch 1,mem_24g_reconn_type + beq PAIR_AND_RECEIVER,p_g24_reconn_pair_and_reveiver + branch g24_reconn_device_fail+7 + +p_g24_reconn_pair_and_reveiver: + branch g24_reconn_receiver_addr,true + branch g24_pair_init_param p_mouse_24g_auto_pair_attempt_fail: fetch MOUSE_FLAG_LEN,mem_mouse_flag Index: sched/mouse_basic.dat =================================================================== --- /1306ac/branch/mouse/YJX_Project/Only_24G_Logo_1600/sched/mouse_basic.dat (revision 917) +++ /1306ac/branch/mouse/YJX_Project/Only_24G_Logo_1600/sched/mouse_basic.dat (working copy) @@ -84,7 +84,7 @@ #bit5 MOUSE_ENABLE_COMMBINATION_KEY_BY_BT_DISCOVERY #bit6 MOUSE_ENABLE_DPI_KEY_LONG_PRESS_DISCONVERY #bit7 MOUSE_ENABLE_PB_BUTTON_LONG_PRESS_DISCONVERY -03 +04 #mouse flag byte8 #bit0 MOUSE_ENABLE_SMOOTHER @@ -95,7 +95,7 @@ #bit5 MOUSE_ENABLE_24G_2M_PHY #bit6 MOUSE_ENABLE_DOUBLE_DPI_KEY #bit7 MOUSE_ENABLE_24G_NEW_REVISION -1b +1f mem_mouse_param_config: @@ -115,7 +115,7 @@ 01 #mem_config_sensor_dpi #power on default dpi 00--1200 01--1600 ff #mem_whee_ta_data_gpio ff #mem_whee_tb_data_gpio -07 #mem_matrix_public_gpio +ff #mem_matrix_public_gpio ff #mem_config_select_device_button_gpio ff #mem_customer_key_gpio ff #mem_sensor_motion_gpio @@ -204,7 +204,7 @@ mem_24g_data_type:01 #01--mouse 02--keyboard mem_24g_fast_conn_enable:01 mem_24g_fast_conn_addr:0f 0f 0f 0f -mem_mouse_commbination_key_24g:03 #03--LR 05--LM 06--RM 07---LMR +mem_mouse_commbination_key_24g:07 #03--LR 05--LM 06--RM 07---LMR mem_24g_ch_map_update:00 #00--disable 01--enable mem_24g_long_sleep_set_level:02 #00--30ms 01--50ms 02--80ms 03--100ms mem_24g_disable_fec1:00 #00--default mode 01--new process