Index: output/eeprom.dat =================================================================== --- /YC1308AF/branch/mouse/mouse_public/output/eeprom.dat (revision 1508) +++ /YC1308AF/branch/mouse/mouse_public/output/eeprom.dat (working copy) @@ -99,7 +99,7 @@ c0 0f 80 -84 +86 c0 42 85 @@ -502,8 +502,16 @@ 5e 20 40 +01 00 -fe +24 +55 +80 +88 +24 +55 +bf +60 20 40 41 @@ -563,7 +571,7 @@ 20 40 00 -a6 +a8 20 40 3f @@ -587,15 +595,15 @@ c0 18 00 -9b +9d c0 18 80 -9b +9d c0 2c 00 -9b +9d 20 40 41 @@ -619,11 +627,11 @@ c0 02 80 -9c +9e 20 20 00 -8e +90 20 60 00 @@ -651,19 +659,19 @@ c0 00 00 -a9 +ab c0 00 80 -b0 +b2 c0 01 00 -b5 +b7 c0 01 80 -ba +bc 20 60 00 @@ -703,11 +711,11 @@ 20 40 00 -a6 +a8 20 20 00 -8c +8e 70 49 2d @@ -727,7 +735,7 @@ 20 20 00 -ad +af 70 49 2d @@ -747,7 +755,7 @@ 20 20 00 -ad +af 70 49 2d @@ -767,7 +775,7 @@ 20 20 00 -ad +af 6f e4 4c @@ -791,7 +799,7 @@ 24 21 00 -d1 +d3 d8 c0 4c @@ -843,7 +851,7 @@ 20 40 00 -e7 +e9 6f e0 cb @@ -947,7 +955,7 @@ c3 0c 00 -f3 +f5 58 00 bb @@ -1043,15 +1051,7 @@ 20 40 00 -fa -20 -40 -00 -86 -20 -40 -3f -60 +fc 20 40 3d @@ -1059,7 +1059,7 @@ 20 40 00 -ea +ec 20 40 03 @@ -1835,7 +1835,7 @@ 20 21 00 -fa +fc 68 4a cc @@ -4571,7 +4571,7 @@ 20 40 00 -fa +fc 6f e0 cb @@ -5576,8 +5576,8 @@ 20 61 2c -01 -00 +e4 +91 aa 55 40 @@ -6123,9 +6123,9 @@ a8 40 18 -a0 +a1 c8 -13 +14 08 53 aa @@ -6905,10 +6905,10 @@ aa aa 55 -38 +3a 89 -55 -f6 +ec +24 ff ff ff Index: output/program.lis =================================================================== --- /YC1308AF/branch/mouse/mouse_public/output/program.lis (revision 1508) +++ /YC1308AF/branch/mouse/mouse_public/output/program.lis (working copy) @@ -25,7 +25,7 @@ 0016 2020137e branch loop pf_patch_ext: -0017 c00f8084 beq patch23_7 ,p_twspi_reset +0017 c00f8086 beq patch23_7 ,p_twspi_reset 0018 c042851b beq patch30_5 ,p_ui_timer_check 0019 c053051f beq patch34_6 ,p_le_enable_phy_by_pdata 001a c06e84b1 beq patch3b_5 ,p_g24_dispatch @@ -158,186 +158,186 @@ p_mouse_init: 007b 20406e5e call enable_authrom -007c 204000fe call p_mouse_setting_config -007d 204041e7 call mouse_init_sunt -007e 20758000 rtn wake -007f 204040ce call mouse_dpi_config -0080 20404766 call mouse_drawing_optima_init -0081 20400114 call p_mouse_cb_fuction -0082 2040034e call p_mouse_sensor_powerdown -0083 20203c7d branch mouse_init + 8 +007c 20400100 call p_mouse_setting_config +007d 24558088 ncall p_mouse_sensor_init_param_check ,wake +007e 2455bf60 ncall mouse_gpio_init ,wake +007f 204041e7 call mouse_init_sunt +0080 20758000 rtn wake +0081 204040ce call mouse_dpi_config +0082 20404766 call mouse_drawing_optima_init +0083 20400114 call p_mouse_cb_fuction +0084 2040034e call p_mouse_sensor_powerdown +0085 20203c7d branch mouse_init + 8 p_twspi_reset: -0084 6fe0c923 fetch 1 ,mem_mouse_sensor_sclk_gpio -0085 20205b56 branch twspi_reset + 1 +0086 6fe0c923 fetch 1 ,mem_mouse_sensor_sclk_gpio +0087 20205b56 branch twspi_reset + 1 p_mouse_sensor_init_param_check: -0086 70492d02 jam mouse_12clk_angle ,mem_config_sensor_angle -0087 58000605 setarg 0x0605 -0088 67e14923 store 2 ,mem_mouse_sensor_sclk_gpio -0089 58000704 setarg 0x0704 -008a 67e14917 store 2 ,mem_whee_a_data_gpio -008b 204000a6 call p_sensor_reg_reset +0088 70492d02 jam mouse_12clk_angle ,mem_config_sensor_angle +0089 58000605 setarg 0x0605 +008a 67e14923 store 2 ,mem_mouse_sensor_sclk_gpio +008b 58000704 setarg 0x0704 +008c 67e14917 store 2 ,mem_whee_a_data_gpio +008d 204000a8 call p_sensor_reg_reset p_mouse_sensor_init_param_check_next: -008c 20403fa5 call mouse_sensor_spi_init -008d 20002ee0 nop 12000 +008e 20403fa5 call mouse_sensor_spi_init +008f 20002ee0 nop 12000 p_mouse_read_sensor_id: -008e 58000000 setarg pan_reg_pid_l -008f 20405d65 call twspi_read -0090 67e0c9c6 store 1 ,mem_sensor_id1 -0091 c018009b beq p32xx_id1 ,p_mouse_sensor_id_read_success -0092 c018809b beq p3065_id1 ,p_mouse_sensor_id_read_success -0093 c02c009b beq pka8g2_id1 ,p_mouse_sensor_id_read_success -0094 204041f2 call mouse_twspi_reset -0095 20001af4 nop 6900 -0096 6fe0ccb7 fetch 1 ,mem_sensor_read_count -0097 1fe0fe01 increase 1 ,pdata -0098 67e0ccb7 store 1 ,mem_sensor_read_count -0099 c002809c beq 5 ,p_mouse_sensor_spi_init_param_change -009a 2020008e branch p_mouse_read_sensor_id +0090 58000000 setarg pan_reg_pid_l +0091 20405d65 call twspi_read +0092 67e0c9c6 store 1 ,mem_sensor_id1 +0093 c018009d beq p32xx_id1 ,p_mouse_sensor_id_read_success +0094 c018809d beq p3065_id1 ,p_mouse_sensor_id_read_success +0095 c02c009d beq pka8g2_id1 ,p_mouse_sensor_id_read_success +0096 204041f2 call mouse_twspi_reset +0097 20001af4 nop 6900 +0098 6fe0ccb7 fetch 1 ,mem_sensor_read_count +0099 1fe0fe01 increase 1 ,pdata +009a 67e0ccb7 store 1 ,mem_sensor_read_count +009b c002809e beq 5 ,p_mouse_sensor_spi_init_param_change +009c 20200090 branch p_mouse_read_sensor_id p_mouse_sensor_id_read_success: -009b 20600000 rtn +009d 20600000 rtn p_mouse_sensor_spi_init_param_change: -009c 704cb700 jam 0 ,mem_sensor_read_count -009d 6fe0ccb8 fetch 1 ,mem_sensor_param_change_count -009e 1fe0fe01 increase 1 ,pdata -009f 1fe17e03 and pdata ,0x03 ,pdata -00a0 67e0ccb8 store 1 ,mem_sensor_param_change_count -00a1 c00000a9 beq 0 ,p_mouse_sensor_angle_12clk -00a2 c00080b0 beq 1 ,p_mouse_sensor_angle_9clk -00a3 c00100b5 beq 2 ,p_mouse_sensor_angle_6clk -00a4 c00180ba beq 3 ,p_mouse_sensor_angle_3clk -00a5 20600000 rtn +009e 704cb700 jam 0 ,mem_sensor_read_count +009f 6fe0ccb8 fetch 1 ,mem_sensor_param_change_count +00a0 1fe0fe01 increase 1 ,pdata +00a1 1fe17e03 and pdata ,0x03 ,pdata +00a2 67e0ccb8 store 1 ,mem_sensor_param_change_count +00a3 c00000ab beq 0 ,p_mouse_sensor_angle_12clk +00a4 c00080b2 beq 1 ,p_mouse_sensor_angle_9clk +00a5 c00100b7 beq 2 ,p_mouse_sensor_angle_6clk +00a6 c00180bc beq 3 ,p_mouse_sensor_angle_3clk +00a7 20600000 rtn p_sensor_reg_reset: -00a6 58000000 setarg 0 -00a7 67f20074 store 4 ,0x8074 -00a8 20600000 rtn +00a8 58000000 setarg 0 +00a9 67f20074 store 4 ,0x8074 +00aa 20600000 rtn p_mouse_sensor_angle_12clk: -00a9 70492d02 jam mouse_12clk_angle ,mem_config_sensor_angle -00aa 58000605 setarg 0x0605 -00ab 67e14923 store 2 ,mem_mouse_sensor_sclk_gpio -00ac 58000704 setarg 0x0704 +00ab 70492d02 jam mouse_12clk_angle ,mem_config_sensor_angle +00ac 58000605 setarg 0x0605 +00ad 67e14923 store 2 ,mem_mouse_sensor_sclk_gpio +00ae 58000704 setarg 0x0704 p_mouse_sensor_param_store: -00ad 67e14917 store 2 ,mem_whee_a_data_gpio -00ae 204000a6 call p_sensor_reg_reset -00af 2020008c branch p_mouse_sensor_init_param_check_next +00af 67e14917 store 2 ,mem_whee_a_data_gpio +00b0 204000a8 call p_sensor_reg_reset +00b1 2020008e branch p_mouse_sensor_init_param_check_next p_mouse_sensor_angle_9clk: -00b0 70492d01 jam mouse_9clk_angle ,mem_config_sensor_angle -00b1 58000705 setarg 0x0705 -00b2 67e14923 store 2 ,mem_mouse_sensor_sclk_gpio -00b3 58000604 setarg 0x0604 -00b4 202000ad branch p_mouse_sensor_param_store +00b2 70492d01 jam mouse_9clk_angle ,mem_config_sensor_angle +00b3 58000705 setarg 0x0705 +00b4 67e14923 store 2 ,mem_mouse_sensor_sclk_gpio +00b5 58000604 setarg 0x0604 +00b6 202000af branch p_mouse_sensor_param_store p_mouse_sensor_angle_6clk: -00b5 70492d00 jam mouse_6clk_angle ,mem_config_sensor_angle -00b6 58000405 setarg 0x0405 -00b7 67e14923 store 2 ,mem_mouse_sensor_sclk_gpio -00b8 58000706 setarg 0x0706 -00b9 202000ad branch p_mouse_sensor_param_store +00b7 70492d00 jam mouse_6clk_angle ,mem_config_sensor_angle +00b8 58000405 setarg 0x0405 +00b9 67e14923 store 2 ,mem_mouse_sensor_sclk_gpio +00ba 58000706 setarg 0x0706 +00bb 202000af branch p_mouse_sensor_param_store p_mouse_sensor_angle_3clk: -00ba 70492d03 jam mouse_3clk_angle ,mem_config_sensor_angle -00bb 58000706 setarg 0x0706 -00bc 67e14923 store 2 ,mem_mouse_sensor_sclk_gpio -00bd 58000504 setarg 0x0504 -00be 202000ad branch p_mouse_sensor_param_store +00bc 70492d03 jam mouse_3clk_angle ,mem_config_sensor_angle +00bd 58000706 setarg 0x0706 +00be 67e14923 store 2 ,mem_mouse_sensor_sclk_gpio +00bf 58000504 setarg 0x0504 +00c0 202000af branch p_mouse_sensor_param_store p_mouse_le_name_load: -00bf 6fe44c00 fetch 8 ,mem_le_name_patch -00c0 207a0000 rtn blank -00c1 6fe0cbff fetch 1 ,mem_le_name_patch_len -00c2 1fe22200 copy pdata ,rega -00c3 1fe67c0b sub pdata ,11 ,null -00c4 242100d1 nbranch p_mouse_le_name_patch_len_overflow ,positive -00c5 d8c04c00 arg mem_le_name_patch ,contr -00c6 d8a04aec arg mem_le_adv_swift_pair + 9 ,contw -00c7 1a227200 copy rega ,loopcnt -00c8 20407dd4 call memcpy -00c9 d8c04c00 arg mem_le_name_patch ,contr -00ca d8a0440a arg mem_le_scan_data + 2 ,contw -00cb 1a227200 copy rega ,loopcnt -00cc 20407dd4 call memcpy -00cd d8c04c00 arg mem_le_name_patch ,contr -00ce d8a042f8 arg mem_le_name ,contw -00cf 1a227200 copy rega ,loopcnt -00d0 20207dd4 branch memcpy +00c1 6fe44c00 fetch 8 ,mem_le_name_patch +00c2 207a0000 rtn blank +00c3 6fe0cbff fetch 1 ,mem_le_name_patch_len +00c4 1fe22200 copy pdata ,rega +00c5 1fe67c0b sub pdata ,11 ,null +00c6 242100d3 nbranch p_mouse_le_name_patch_len_overflow ,positive +00c7 d8c04c00 arg mem_le_name_patch ,contr +00c8 d8a04aec arg mem_le_adv_swift_pair + 9 ,contw +00c9 1a227200 copy rega ,loopcnt +00ca 20407dd4 call memcpy +00cb d8c04c00 arg mem_le_name_patch ,contr +00cc d8a0440a arg mem_le_scan_data + 2 ,contw +00cd 1a227200 copy rega ,loopcnt +00ce 20407dd4 call memcpy +00cf d8c04c00 arg mem_le_name_patch ,contr +00d0 d8a042f8 arg mem_le_name ,contw +00d1 1a227200 copy rega ,loopcnt +00d2 20207dd4 branch memcpy p_mouse_le_name_patch_len_overflow: -00d1 204000e7 call p_mouse_le_swift_pair_disable -00d2 6fe0cbff fetch 1 ,mem_le_name_patch_len -00d3 1fe0fe01 increase 1 ,pdata -00d4 67e0cae3 store 1 ,mem_le_adv_swift_pair -00d5 704ae409 jam 9 ,mem_le_adv_swift_pair + 1 -00d6 d8c04c00 arg mem_le_name_patch ,contr -00d7 d8a04ae5 arg mem_le_adv_swift_pair + 2 ,contw -00d8 1a227200 copy rega ,loopcnt -00d9 20407dd4 call memcpy -00da 6fe0cbff fetch 1 ,mem_le_name_patch_len -00db 1fe0fe01 increase 1 ,pdata -00dc 67e0c408 store 1 ,mem_le_scan_data -00dd 70440909 jam 9 ,mem_le_scan_data + 1 -00de d8c04c00 arg mem_le_name_patch ,contr -00df d8a0440a arg mem_le_scan_data + 2 ,contw -00e0 1a227200 copy rega ,loopcnt -00e1 20407dd4 call memcpy -00e2 d8c04bff arg mem_le_name_patch_len ,contr -00e3 d8a042f7 arg mem_le_name_len ,contw -00e4 1a227200 copy rega ,loopcnt -00e5 1f20f201 increase 1 ,loopcnt -00e6 20207dd4 branch memcpy +00d3 204000e9 call p_mouse_le_swift_pair_disable +00d4 6fe0cbff fetch 1 ,mem_le_name_patch_len +00d5 1fe0fe01 increase 1 ,pdata +00d6 67e0cae3 store 1 ,mem_le_adv_swift_pair +00d7 704ae409 jam 9 ,mem_le_adv_swift_pair + 1 +00d8 d8c04c00 arg mem_le_name_patch ,contr +00d9 d8a04ae5 arg mem_le_adv_swift_pair + 2 ,contw +00da 1a227200 copy rega ,loopcnt +00db 20407dd4 call memcpy +00dc 6fe0cbff fetch 1 ,mem_le_name_patch_len +00dd 1fe0fe01 increase 1 ,pdata +00de 67e0c408 store 1 ,mem_le_scan_data +00df 70440909 jam 9 ,mem_le_scan_data + 1 +00e0 d8c04c00 arg mem_le_name_patch ,contr +00e1 d8a0440a arg mem_le_scan_data + 2 ,contw +00e2 1a227200 copy rega ,loopcnt +00e3 20407dd4 call memcpy +00e4 d8c04bff arg mem_le_name_patch_len ,contr +00e5 d8a042f7 arg mem_le_name_len ,contw +00e6 1a227200 copy rega ,loopcnt +00e7 1f20f201 increase 1 ,loopcnt +00e8 20207dd4 branch memcpy p_mouse_le_swift_pair_disable: -00e7 d8a04ae3 arg mem_le_adv_swift_pair ,contw -00e8 df200014 arg 20 ,loopcnt -00e9 20207d9b branch clear_mem +00e9 d8a04ae3 arg mem_le_adv_swift_pair ,contw +00ea df200014 arg 20 ,loopcnt +00eb 20207d9b branch clear_mem p_mouse_g24_report_setting: -00ea 6fe44bbc fetch mouse_flag_len ,mem_mouse_flag -00eb c30c00f3 bbit0 mouse_enable_24g_250hz ,p_mouse_g24_report_125hz +00ec 6fe44bbc fetch mouse_flag_len ,mem_mouse_flag +00ed c30c00f5 bbit0 mouse_enable_24g_250hz ,p_mouse_g24_report_125hz p_mouse_g24_report_250hz: -00ec 5800bb80 setarg 0xbb80 -00ed 67e1cc32 store 3 ,mem_24g_tsniff -00ee 58006c10 setarg 0x6c10 -00ef 67e1c8b1 store 3 ,mem_24g_short_sleep_set -00f0 67e1cc48 store 3 ,mem_24g_short_sleep_set_init -00f1 7048ca0f jam 15 ,mem_24g_fast_hop_count -00f2 20600000 rtn +00ee 5800bb80 setarg 0xbb80 +00ef 67e1cc32 store 3 ,mem_24g_tsniff +00f0 58006c10 setarg 0x6c10 +00f1 67e1c8b1 store 3 ,mem_24g_short_sleep_set +00f2 67e1cc48 store 3 ,mem_24g_short_sleep_set_init +00f3 7048ca0f jam 15 ,mem_24g_fast_hop_count +00f4 20600000 rtn p_mouse_g24_report_125hz: -00f3 58017700 setarg 0x17700 -00f4 67e1cc32 store 3 ,mem_24g_tsniff -00f5 58010b60 setarg 0x10b60 -00f6 67e1c8b1 store 3 ,mem_24g_short_sleep_set -00f7 67e1cc48 store 3 ,mem_24g_short_sleep_set_init -00f8 7048ca1e jam 30 ,mem_24g_fast_hop_count -00f9 20600000 rtn +00f5 58017700 setarg 0x17700 +00f6 67e1cc32 store 3 ,mem_24g_tsniff +00f7 58010b60 setarg 0x10b60 +00f8 67e1c8b1 store 3 ,mem_24g_short_sleep_set +00f9 67e1cc48 store 3 ,mem_24g_short_sleep_set_init +00fa 7048ca1e jam 30 ,mem_24g_fast_hop_count +00fb 20600000 rtn p_send_time_long_wake: -00fa 58000000 setarg 0 -00fb 67e0cc36 store 1 ,mem_tx_count -00fc 67e2cc41 store 5 ,mem_tx_time_sum -00fd 20600000 rtn +00fc 58000000 setarg 0 +00fd 67e0cc36 store 1 ,mem_tx_count +00fe 67e2cc41 store 5 ,mem_tx_time_sum +00ff 20600000 rtn p_mouse_setting_config: -00fe 20758000 rtn wake -00ff 2040260e call g24_transmit_init -0100 d8400358 arg 0x358 ,temp -0101 6049483b storet 2 ,mem_24g_rx_window -0102 204022b5 call g24_chmap_param_init -0103 204000fa call p_send_time_long_wake -0104 20400086 call p_mouse_sensor_init_param_check -0105 20403f60 call mouse_gpio_init +0100 20758000 rtn wake +0101 2040260e call g24_transmit_init +0102 d8400358 arg 0x358 ,temp +0103 6049483b storet 2 ,mem_24g_rx_window +0104 204022b5 call g24_chmap_param_init +0105 204000fc call p_send_time_long_wake 0106 20403dd6 call mouse_param_init -0107 204000ea call p_mouse_g24_report_setting +0107 204000ec call p_mouse_g24_report_setting 0108 20400341 call p_mouse_logo_led_off 0109 20400326 call p_mouse_1io2led_all_off 010a 204002e7 call p_mouse_device_multi_led_poweron2s_init @@ -587,7 +587,7 @@ 01c6 684a4c32 fetcht 4 ,mem_24g_tsniff 01c7 18438400 lshift temp ,temp 01c8 98467c00 isub temp ,null -01c9 202100fa branch p_send_time_long_wake ,positive +01c9 202100fc branch p_send_time_long_wake ,positive 01ca 684acc41 fetcht 5 ,mem_tx_time_sum 01cb 9840fe00 iadd temp ,pdata 01cc 67e2cc41 store 5 ,mem_tx_time_sum @@ -1525,7 +1525,7 @@ 0472 204026cb call g24_setgpio_lpm_before 0473 704c4d00 jam 0 ,mem_sleep_miss 0474 704c4e01 jam 1 ,mem_long_sleep_flag -0475 204000fa call p_send_time_long_wake +0475 204000fc call p_send_time_long_wake 0476 6fe0cbf2 fetch 1 ,mem_sensor_shutdown_flag 0477 245a3e6a ncall mouse_setgpio_hibernate ,blank 0478 6fe2485f fetch 4 ,mem_24g_enter_hibernate Index: program/patch.prog =================================================================== --- /YC1308AF/branch/mouse/mouse_public/program/patch.prog (revision 1508) +++ /YC1308AF/branch/mouse/mouse_public/program/patch.prog (working copy) @@ -226,6 +226,8 @@ endif call enable_authrom call p_mouse_setting_config + ncall p_mouse_sensor_init_param_check,wake //select sensor angle + ncall mouse_gpio_init,wake call mouse_init_sunt rtn wake call mouse_dpi_config @@ -411,9 +413,6 @@ ifdef BLE call p_mouse_le_name_load endif - call p_mouse_sensor_init_param_check //select sensor angle - call mouse_gpio_init - call mouse_param_init call p_mouse_g24_report_setting call p_mouse_logo_led_off Index: sched/mouse.dat =================================================================== --- /YC1308AF/branch/mouse/mouse_public/sched/mouse.dat (revision 1508) +++ /YC1308AF/branch/mouse/mouse_public/sched/mouse.dat (working copy) @@ -232,7 +232,7 @@ mem_lpm_mult_init:20 mem_app_connection_options:06 -mem_lap:18 a0 c8 13 08 53 +mem_lap:18 a1 c8 14 08 53 mem_local_name_length: 'BT3.0 Mouse mem_sniff_param_interval: