Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/Standard_XJQ/output/flash.dat (revision 3353) +++ /branch/mouse_project/YJX_Project/YJX_1059/Standard_XJQ/output/flash.dat (working copy) @@ -47,11 +47,11 @@ 20 40 00 -1c +19 20 40 00 -2f +2c 68 02 40 @@ -98,24 +98,12 @@ 54 20 40 -03 -19 68 -11 -00 -50 -79 +a2 20 -7e -02 -60 -11 -00 -50 20 -60 -00 -00 +03 +19 58 00 03 @@ -203,7 +191,7 @@ 24 55 80 -3c +39 20 40 02 @@ -260,6 +248,18 @@ 00 00 01 +20 +00 +00 +01 +20 +00 +00 +01 +20 +00 +00 +01 c2 84 00 @@ -8160,8 +8160,8 @@ 20 07 f2 -cb -a2 +c8 +0a aa 55 08 @@ -9126,8 +9126,8 @@ 00 cc 4b -0f 00 +01 aa 55 08 @@ -10036,7 +10036,7 @@ 20 40 00 -16 +18 20 40 63 @@ -10044,7 +10044,7 @@ 20 40 00 -31 +33 d8 40 00 @@ -10065,10 +10065,18 @@ 40 68 06 +68 +11 +00 +50 +79 20 -40 -3e -54 +7e +02 +60 +11 +00 +50 20 40 03 @@ -10265,14 +10273,6 @@ 60 00 00 -00 -00 -00 -00 -00 -00 -00 -00 20 20 00 @@ -12325,5 +12325,5 @@ 55 00 00 -94 -26 +e2 +2c Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/Standard_XJQ/output/program.lis (revision 3353) +++ /branch/mouse_project/YJX_Project/YJX_1059/Standard_XJQ/output/program.lis (working copy) @@ -16,8 +16,8 @@ 0007 204004dc call p_mouse_bt_discovery_button_up_init 0008 20400344 call p_mouse_spi_init 0009 20400790 call p_drawing_optima_init -000a 2040001c call p_mouse_cb_fuction -000b 2040002f call p_mouse_wakeup_from_power +000a 20400019 call p_mouse_cb_fuction +000b 2040002c call p_mouse_wakeup_from_power 000c 680240a0 fetch 4 ,mem_lap 000d 60024c8e store 4 ,mem_24g_device_addr 000e 20405810 call le_set_config_fixed_ltk @@ -29,54 +29,54 @@ 0014 600140bd store 2 ,mem_fcomp_mul 0015 58000000 setarg 0 0016 60014154 store 2 ,mem_lpm_interval -0017 20400319 call p_mouse_setting_config -0018 68110050 hfetch 2 ,core_clkoff -0019 79207e02 set1 2 ,pdata -001a 60110050 hstore 2 ,core_clkoff -001b 20600000 rtn +0017 204068a2 call load_adc_init +0018 20200319 branch p_mouse_setting_config p_mouse_cb_fuction: -001c 5800038c setarg p_mouse_g24_package_data -001d 60014d88 store 2 ,mem_cb_24g_data -001e 580003af setarg p_mouse_le -001f 600141ef store 2 ,mem_cb_le_process -0020 5800063b setarg p_le_mouse_bb_event_connect_complete -0021 600141f9 store 2 ,mem_cb_att_write -0022 580003d9 setarg p_mouse_bt -0023 600141f1 store 2 ,mem_cb_bt_process -0024 5800029c setarg p_mouse_before_lpm -0025 600141ed store 2 ,mem_cb_before_lpm -0026 58000413 setarg p_mouse_priority_bb_event -0027 600141f5 store 2 ,mem_cb_bb_event_process -0028 580003fe setarg p_mouse_idle -0029 600141f3 store 2 ,mem_cb_idle_process -002a 58000460 setarg p_mouse_before_hibernate -002b 600141eb store 2 ,mem_cb_before_hibernate -002c 5800046c setarg p_mouse_bb_event_timer -002d 600141fd store 2 ,mem_cb_event_timer -002e 20600000 rtn +0019 5800038c setarg p_mouse_g24_package_data +001a 60014d88 store 2 ,mem_cb_24g_data +001b 580003af setarg p_mouse_le +001c 600141ef store 2 ,mem_cb_le_process +001d 5800063b setarg p_le_mouse_bb_event_connect_complete +001e 600141f9 store 2 ,mem_cb_att_write +001f 580003d9 setarg p_mouse_bt +0020 600141f1 store 2 ,mem_cb_bt_process +0021 5800029c setarg p_mouse_before_lpm +0022 600141ed store 2 ,mem_cb_before_lpm +0023 58000413 setarg p_mouse_priority_bb_event +0024 600141f5 store 2 ,mem_cb_bb_event_process +0025 580003fe setarg p_mouse_idle +0026 600141f3 store 2 ,mem_cb_idle_process +0027 58000460 setarg p_mouse_before_hibernate +0028 600141eb store 2 ,mem_cb_before_hibernate +0029 5800046c setarg p_mouse_bb_event_timer +002a 600141fd store 2 ,mem_cb_event_timer +002b 20600000 rtn p_mouse_wakeup_from_power: -002f 58000019 setarg 25 -0030 60014d9a store 2 ,mem_24g_transmit_by_interrupt_exit_count_init -0031 2455803c ncall p_mouse_24g_transmit_by_interrupt_exit_count_max ,wake -0032 204002d2 call p_mouse_init_sunt -0033 20400465 call p_mouse_sensor_powerdown +002c 58000019 setarg 25 +002d 60014d9a store 2 ,mem_24g_transmit_by_interrupt_exit_count_init +002e 24558039 ncall p_mouse_24g_transmit_by_interrupt_exit_count_max ,wake +002f 204002d2 call p_mouse_init_sunt +0030 20400465 call p_mouse_sensor_powerdown p_mouse_wakeup_no_from_power: -0034 6800c71f fetch 1 ,mem_reconn_times_init -0035 6000c71e store 1 ,mem_reconn_times -0036 680344a0 fetch 6 ,mem_le_lap -0037 60034b62 store 6 ,mem_le_normal_lap -0038 6800c241 fetch 1 ,mem_power_on_flag -0039 c3810000 rtnbit1 2 -003a 704b770a jam ble_poweron_reconn_timer ,mem_mouse_poweron_bt_start_reconn_timer -003b 2020050a branch p_mouse_dpi_config_default +0031 6800c71f fetch 1 ,mem_reconn_times_init +0032 6000c71e store 1 ,mem_reconn_times +0033 680344a0 fetch 6 ,mem_le_lap +0034 60034b62 store 6 ,mem_le_normal_lap +0035 6800c241 fetch 1 ,mem_power_on_flag +0036 c3810000 rtnbit1 2 +0037 704b770a jam ble_poweron_reconn_timer ,mem_mouse_poweron_bt_start_reconn_timer +0038 2020050a branch p_mouse_dpi_config_default p_mouse_24g_transmit_by_interrupt_exit_count_max: -003c 58000177 setarg 375 -003d 60014d9a store 2 ,mem_24g_transmit_by_interrupt_exit_count_init -003e 20600000 rtn +0039 58000177 setarg 375 +003a 60014d9a store 2 ,mem_24g_transmit_by_interrupt_exit_count_init +003b 20600000 rtn +003c 20000001 nop 1 +003d 20000001 nop 1 +003e 20000001 nop 1 003f 20000001 nop 1 p_patch_array: @@ -35997,68 +35997,70 @@ 90001 20403e6e call mouse_gpio_init 90002 6808cb45 fetcht 1 ,mem_flash_ncs_gpio 90003 2040680e call gpio_config_output -90004 20400016 call z_mouse_bt_sdp_update +90004 20400018 call z_mouse_bt_sdp_update 90005 204063ee call twspi_disable -90006 20400031 call z_mouse_set_gpio_control_sensor +90006 20400033 call z_mouse_set_gpio_control_sensor 90007 d840001a arg mouse_spi1_sdio_gpio ,temp 90008 204067fb call gpio_config_input 90009 6808c6f7 fetcht 1 ,mem_select_sensor_angle_gpio 9000a 793f8407 set0 gpio_active_bit ,temp 9000b 20406806 call gpio_set_high_impedance -9000c 20403e54 call mouse_adc_init -9000d 20400329 call p_mouse_load_flash_info_check -9000e 6800c720 fetch 1 ,mem_device_flag -9000f c1010000 rtneq mode_24g_device -90010 68034b4c fetch 6 ,mem_mouse_24g_addr_init -90011 680b4722 fetcht 6 ,mem_device1_addr -90012 98467c00 isub temp ,null -90013 24228376 nbranch p_mouse_fast_conn_disable ,zero -90014 20200378 branch p_mouse_fast_conn_le_switch_adv -90015 20600000 rtn +9000c 68110050 hfetch 2 ,core_clkoff +9000d 79207e02 set1 2 ,pdata +9000e 60110050 hstore 2 ,core_clkoff +9000f 20400329 call p_mouse_load_flash_info_check +90010 6800c720 fetch 1 ,mem_device_flag +90011 c1010000 rtneq mode_24g_device +90012 68034b4c fetch 6 ,mem_mouse_24g_addr_init +90013 680b4722 fetcht 6 ,mem_device1_addr +90014 98467c00 isub temp ,null +90015 24228376 nbranch p_mouse_fast_conn_disable ,zero +90016 20200378 branch p_mouse_fast_conn_le_switch_adv +90017 20600000 rtn z_mouse_bt_sdp_update: -90016 204074b9 call enable_authrom -90017 d8c08c00 arg 0x8c00 ,contr -90018 d8a04876 arg mem_mouse_uuid_list ,contw -90019 df200171 arg 369 ,loopcnt -9001a 20407f01 call memcpy -9001b 580f0209 setarg 0x0f0209 -9001c e0a18000 istore 3 ,contw -9001d 58120009 setarg 0x120009 +90018 204074b9 call enable_authrom +90019 d8c08c00 arg 0x8c00 ,contr +9001a d8a04876 arg mem_mouse_uuid_list ,contw +9001b df200171 arg 369 ,loopcnt +9001c 20407f01 call memcpy +9001d 580f0209 setarg 0x0f0209 9001e e0a18000 istore 3 ,contw -9001f 58100209 setarg 0x100209 +9001f 58120009 setarg 0x120009 90020 e0a18000 istore 3 ,contw -90021 58000009 setarg 0x000009 +90021 58100209 setarg 0x100209 90022 e0a18000 istore 3 ,contw -90023 d8c08d71 arg 0x8d71 ,contr -90024 df200109 arg 265 ,loopcnt -90025 20407f01 call memcpy -90026 70488d00 jam 0 ,mem_mouse_uuid_list + 23 -90027 7048856d jam 0x6d ,mem_mouse_uuid_list + 15 -90028 5800401f setarg 0x401f -90029 600149db store 2 ,mem_mouse_uuid_list + 357 -9002a 58006d04 setarg 0x6d04 -9002b 60014a44 store 2 ,mem_mouse_uuid_list + 462 -9002c 580016b0 setarg 0x16b0 -9002d 60014a4a store 2 ,mem_mouse_uuid_list + 468 -9002e 58004876 setarg mem_mouse_uuid_list -9002f 60014575 store 2 ,mem_ui_uuid_table -90030 20600000 rtn +90023 58000009 setarg 0x000009 +90024 e0a18000 istore 3 ,contw +90025 d8c08d71 arg 0x8d71 ,contr +90026 df200109 arg 265 ,loopcnt +90027 20407f01 call memcpy +90028 70488d00 jam 0 ,mem_mouse_uuid_list + 23 +90029 7048856d jam 0x6d ,mem_mouse_uuid_list + 15 +9002a 5800401f setarg 0x401f +9002b 600149db store 2 ,mem_mouse_uuid_list + 357 +9002c 58006d04 setarg 0x6d04 +9002d 60014a44 store 2 ,mem_mouse_uuid_list + 462 +9002e 580016b0 setarg 0x16b0 +9002f 60014a4a store 2 ,mem_mouse_uuid_list + 468 +90030 58004876 setarg mem_mouse_uuid_list +90031 60014575 store 2 ,mem_ui_uuid_table +90032 20600000 rtn z_mouse_set_gpio_control_sensor: -90031 20400070 call p_ice_gpio_disable_pu -90032 6808c6f7 fetcht 1 ,mem_select_sensor_angle_gpio -90033 2040680e call gpio_config_output +90033 20400070 call p_ice_gpio_disable_pu 90034 6808c6f7 fetcht 1 ,mem_select_sensor_angle_gpio -90035 20406829 call gpio_out_active -90036 d840001a arg mouse_spi1_sdio_gpio ,temp -90037 20400563 call p_gpio_set_input_pu +90035 2040680e call gpio_config_output +90036 6808c6f7 fetcht 1 ,mem_select_sensor_angle_gpio +90037 20406829 call gpio_out_active 90038 d840001a arg mouse_spi1_sdio_gpio ,temp -90039 2040681d call gpio_get_bit -9003a 7046f602 jam mouse_12clk_angle ,mem_config_sensor_angle -9003b 20608000 rtn true -9003c 7046f601 jam mouse_9clk_angle ,mem_config_sensor_angle -9003d 20600000 rtn +90039 20400563 call p_gpio_set_input_pu +9003a d840001a arg mouse_spi1_sdio_gpio ,temp +9003b 2040681d call gpio_get_bit +9003c 7046f602 jam mouse_12clk_angle ,mem_config_sensor_angle +9003d 20608000 rtn true +9003e 7046f601 jam mouse_9clk_angle ,mem_config_sensor_angle +9003f 20600000 rtn org 0xa0001 z_entrance9: Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/Standard_XJQ/output/romcode.rom (revision 3350) +++ /branch/mouse_project/YJX_Project/YJX_1059/Standard_XJQ/output/romcode.rom (working copy) @@ -24974,15 +24974,17 @@ 20403e6e 6808cb45 2040680e -20400016 +20400018 204063ee -20400031 +20400033 d840001a 204067fb 6808c6f7 793f8407 20406806 -20403e54 +68110050 +79207e02 +60110050 20400329 6800c720 c1010000 @@ -25169,4 +25171,4 @@ 704b0a00 20400336 202041d9 -0000445f +0000ed18 Index: program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/Standard_XJQ/program/patch.prog (revision 3353) +++ /branch/mouse_project/YJX_Project/YJX_1059/Standard_XJQ/program/patch.prog (working copy) @@ -59,12 +59,8 @@ store 2,mem_fcomp_mul setarg 0 store 2,mem_lpm_interval - //call load_adc_init - call p_mouse_setting_config - hfetch 2,core_clkoff - set1 2,pdata - hstore 2,core_clkoff - rtn + call load_adc_init + branch p_mouse_setting_config p_mouse_cb_fuction: ifdef G24 @@ -116,8 +112,11 @@ rtn nop 1 + nop 1 + nop 1 + nop 1 + - p_patch_array: bbit1 8,pf_patch_ext //patch00_0 is unuseful because of otp Index: program/z.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/Standard_XJQ/program/z.prog (revision 3350) +++ /branch/mouse_project/YJX_Project/YJX_1059/Standard_XJQ/program/z.prog (working copy) @@ -579,7 +579,11 @@ set0 gpio_active_bit,temp call gpio_set_high_impedance - call mouse_adc_init + hfetch 2,core_clkoff + set1 2,pdata + hstore 2,core_clkoff + + //call mouse_adc_init call p_mouse_load_flash_info_check fetch 1,mem_device_flag rtneq MODE_24G_DEVICE Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/Standard_XJQ/sched/mouse.dat (revision 3353) +++ /branch/mouse_project/YJX_Project/YJX_1059/Standard_XJQ/sched/mouse.dat (working copy) @@ -309,7 +309,7 @@ mem_24g_allpowerful_addr:0f 0f 0f 0f 0f 0f mem_24g_common_temp:00 00 00 00 00 00 00 00 00 00 mem_24g_enter_hibernate:80 4f 12 -mem_firmware_version:0f 00 +mem_firmware_version:00 01 mem_device_flag: 01