Index: format/app_dongle.format =================================================================== --- /YC1308AC/branch/mouse_project/YDN_Project/usb_16M_AutoPair/format/app_dongle.format (revision 660) +++ /YC1308AC/branch/mouse_project/YDN_Project/usb_16M_AutoPair/format/app_dongle.format (working copy) @@ -24,21 +24,6 @@ 9 mem_dg_usb_vid_pid 1 mem_dg_usb_tx_interval 30 mem_dg_usb_device_name - - -5 mem_clkn_bt_temp - -1 mem_usb_queue_each_size -1 mem_usb_queue_length -1 mem_usb_queue_curr_num -1 mem_usb_queue_read_ptr -1 mem_usb_queue_write_ptr -1275 mem_usb_queue_ele0 - -1 mem_package_count -4 mem_first_packet_clkn_bt -4 mem_currenr_packet_clkn_bt -1 mem_tx_enable ) Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/YDN_Project/usb_16M_AutoPair/output/eeprom.dat (revision 660) +++ /YC1308AC/branch/mouse_project/YDN_Project/usb_16M_AutoPair/output/eeprom.dat (working copy) @@ -2,8 +2,8 @@ 02 aa 55 -be -02 +ae +01 c2 84 00 @@ -23,11 +23,11 @@ c0 5d 80 -2e +2d c0 5e 00 -34 +33 20 20 13 @@ -35,11 +35,11 @@ c0 48 00 -55 +54 c0 4a 80 -66 +65 c0 54 80 @@ -47,7 +47,7 @@ c0 73 00 -30 +2f 20 20 13 @@ -172,10 +172,6 @@ 40 36 20 -70 -4e -40 -01 20 40 62 @@ -191,7 +187,7 @@ 20 40 00 -2c +2b 20 20 36 @@ -227,7 +223,7 @@ 20 40 00 -39 +38 20 20 36 @@ -239,11 +235,11 @@ 20 40 00 -3c +3b 20 20 00 -48 +47 6f e0 c9 @@ -359,7 +355,7 @@ c0 00 00 -5a +59 20 20 7a @@ -387,7 +383,7 @@ c0 00 80 -61 +60 20 20 7a @@ -399,7 +395,7 @@ c0 04 80 -64 +63 20 20 7a @@ -432,280 +428,12 @@ 3a 7c a4 -6f -e0 -8b -fa -20 -3a -7c -7a -6f -e0 -8b -ec -c0 -01 -fc -b4 -c0 -81 -7c -7a -6f -e0 -8b -ee -24 -3a -7c -7a -6f -e3 -c8 -94 -20 -7a -00 -00 -20 -40 -00 -7a -20 -40 -00 -80 -6f -e0 -ce -40 -c1 -80 -80 -00 -20 -40 -7c -62 20 20 7c -6d -6f -e0 -ce -37 -1f -e0 -fe -01 -67 -e0 -ce -37 -1f -e6 -7c -1a -24 -41 -00 -86 -20 -60 -00 -00 -6f -e0 -ce -37 -67 -e0 -c9 -32 -1c -42 -7e -00 -67 -e2 -49 -33 -da -20 -49 -32 -20 -20 -00 -9c -d8 -40 -00 -01 -d8 -c0 -49 -3c -ef -e0 -80 -06 -98 -46 -7c -00 -20 -22 -80 -8e -df -e0 -00 -04 -98 -c0 -8c -00 -20 -20 -00 -88 -e8 -42 -00 -06 -60 -4a -4e -38 -1c -42 -7e -00 -67 -e2 -4e -3c -98 -46 -04 -00 -df -e0 -01 -40 -98 -46 -7c -00 -20 -21 -00 -9a -70 -4e -40 -01 -70 -4e -37 -01 -70 -49 -39 -00 -20 -60 -00 -00 -70 -4e -40 -00 -20 -60 -00 -00 -20 -40 -7e -56 -20 -40 -79 -89 -20 -7a -00 -00 -6f -e1 -44 -8a -1f -e0 -a4 -02 -e8 -40 -80 -12 -18 -40 -84 -01 -e0 -40 -80 -12 -e8 -40 -80 -3f -18 -42 -72 -00 -1f -e0 -a4 -02 -ef -e0 -80 -12 -1f -e0 -ff -ff -98 -4f -fe -00 -d8 -c0 -49 -3c -98 -c0 -8a -00 -1a -22 -0c -00 -20 -40 -7d -5f -20 -20 -7e -54 -c9 -b7 +59 +91 +8b aa 55 40 @@ -871,27 +599,11 @@ ee 41 00 -aa -55 -02 -00 -8a -44 -37 -49 -aa -55 -02 -00 -37 -49 -05 -ff 55 aa aa 55 -e0 -20 -4f -ed +0c +1c +e8 +7d Index: output/memmap.format =================================================================== --- /YC1308AC/branch/mouse_project/YDN_Project/usb_16M_AutoPair/output/memmap.format (revision 660) +++ /YC1308AC/branch/mouse_project/YDN_Project/usb_16M_AutoPair/output/memmap.format (working copy) @@ -1903,17 +1903,6 @@ 0x490a mem_dg_usb_vid_pid 0x4913 mem_dg_usb_tx_interval 0x4914 mem_dg_usb_device_name -0x4932 mem_clkn_bt_temp -0x4937 mem_usb_queue_each_size -0x4938 mem_usb_queue_length -0x4939 mem_usb_queue_curr_num -0x493a mem_usb_queue_read_ptr -0x493b mem_usb_queue_write_ptr -0x493c mem_usb_queue_ele0 -0x4e37 mem_package_count -0x4e38 mem_first_packet_clkn_bt -0x4e3c mem_currenr_packet_clkn_bt -0x4e40 mem_tx_enable 0x487e mem_rssi_hex_received 0x487f mem_24g_pair_sm 0x4880 mem_24g_pair_no_ack Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/YDN_Project/usb_16M_AutoPair/output/program.lis (revision 660) +++ /YC1308AC/branch/mouse_project/YDN_Project/usb_16M_AutoPair/output/program.lis (working copy) @@ -4,15 +4,15 @@ 0001 c041801c beq patch10_3 ,p_set_sync_on 0002 c0458012 beq patch11_3 ,p_initialize_radio_cont 0003 c0570025 beq patch15_6 ,p_app_init -0004 c05d802e beq patch17_3 ,p_dongle_usb_dispatch -0005 c05e0034 beq patch17_4 ,p_dongle_work_mode_auto +0004 c05d802d beq patch17_3 ,p_dongle_usb_dispatch +0005 c05e0033 beq patch17_4 ,p_dongle_work_mode_auto 0006 2020137c branch loop pf_patch_ext: -0007 c0480055 beq patch32_0 ,p_usb_class_type -0008 c04a8066 beq patch32_5 ,p_usb_tx +0007 c0480054 beq patch32_0 ,p_usb_class_type +0008 c04a8065 beq patch32_5 ,p_usb_tx 0009 c054800c beq patch35_1 ,p_le_enable -000a c0730030 beq patch3c_6 ,p_g24_bind_mode_auto +000a c073002f beq patch3c_6 ,p_g24_bind_mode_auto 000b 2020137c branch loop p_le_enable: @@ -54,181 +54,95 @@ 0027 70486402 jam 0x02 ,mem_24g_rx_phy 0028 70486502 jam 0x02 ,mem_24g_tx_phy 0029 20403620 call dongle_init -002a 704e4001 jam on ,mem_tx_enable -002b 2040623c call wdt_set_enable +002a 2040623c call wdt_set_enable p_wdt_kick: -002c 5800007d setarg 125 -002d 2020622d branch wdt_init_config +002b 5800007d setarg 125 +002c 2020622d branch wdt_init_config p_dongle_usb_dispatch: -002e 2040002c call p_wdt_kick -002f 202036b5 branch dongle_usb_dispatch + 1 +002d 2040002b call p_wdt_kick +002e 202036b5 branch dongle_usb_dispatch + 1 p_g24_bind_mode_auto: -0030 6fe0c8bf fetch 1 ,mem_24g_work_mode -0031 c1808000 rtnne dongle_bind -0032 7041e885 jam tx_power_f5db ,mem_tx_power -0033 20202499 branch g24_bind_mode_auto + 3 +002f 6fe0c8bf fetch 1 ,mem_24g_work_mode +0030 c1808000 rtnne dongle_bind +0031 7041e885 jam tx_power_f5db ,mem_tx_power +0032 20202499 branch g24_bind_mode_auto + 3 p_dongle_work_mode_auto: -0034 6fe0c8bf fetch 1 ,mem_24g_work_mode -0035 c1800000 rtnne dongle_work -0036 20402491 call g24_work_mode_start -0037 20400039 call p_dongle_g24_blank_data_process -0038 202036f2 branch dongle_work_mode_auto + 5 +0033 6fe0c8bf fetch 1 ,mem_24g_work_mode +0034 c1800000 rtnne dongle_work +0035 20402491 call g24_work_mode_start +0036 20400038 call p_dongle_g24_blank_data_process +0037 202036f2 branch dongle_work_mode_auto + 5 p_dongle_g24_blank_data_process: -0039 2040368a call dongle_g24_ms_blank_data -003a 2040003c call p_dongle_g24_kb_blank_data -003b 20200048 branch p_dongle_g24_kb_mul_blank_data +0038 2040368a call dongle_g24_ms_blank_data +0039 2040003b call p_dongle_g24_kb_blank_data +003a 20200047 branch p_dongle_g24_kb_mul_blank_data p_dongle_g24_kb_blank_data: -003c 6fe0c906 fetch 1 ,mem_dg_kb_blank_data_enable -003d 207a0000 rtn blank -003e d8e0000e arg timer_kb_blank ,queue -003f 20407d74 call timer_check -0040 247a0000 nrtn blank -0041 70490600 jam 0 ,mem_dg_kb_blank_data_enable -0042 d8a00c0f arg mem_usb_kb_data ,contw -0043 df200002 arg 2 ,loopcnt -0044 20407d17 call memset0 -0045 6fe40c0f fetch 8 ,mem_usb_kb_data -0046 67e448f2 store 8 ,mem_dg_kb_data_last_data -0047 202036a2 branch dongle_usb_tx_kb_data +003b 6fe0c906 fetch 1 ,mem_dg_kb_blank_data_enable +003c 207a0000 rtn blank +003d d8e0000e arg timer_kb_blank ,queue +003e 20407d74 call timer_check +003f 247a0000 nrtn blank +0040 70490600 jam 0 ,mem_dg_kb_blank_data_enable +0041 d8a00c0f arg mem_usb_kb_data ,contw +0042 df200002 arg 2 ,loopcnt +0043 20407d17 call memset0 +0044 6fe40c0f fetch 8 ,mem_usb_kb_data +0045 67e448f2 store 8 ,mem_dg_kb_data_last_data +0046 202036a2 branch dongle_usb_tx_kb_data p_dongle_g24_kb_mul_blank_data: -0048 6fe0c907 fetch 1 ,mem_dg_kb_mul_blank_data_enable -0049 207a0000 rtn blank -004a d8e0000c arg timer_kb_mul_blank ,queue -004b 20407d74 call timer_check -004c 247a0000 nrtn blank -004d 70490700 jam 0 ,mem_dg_kb_mul_blank_data_enable -004e d8a00c1f arg mem_usb_kb_multikey ,contw -004f df200002 arg 2 ,loopcnt -0050 20407d17 call memset0 -0051 700c1f03 jam kb_multikey_report_id ,mem_usb_kb_multikey -0052 6fe18c1f fetch 3 ,mem_usb_kb_multikey -0053 67e1c8fd store 3 ,mem_dg_kb_multikey_last_data -0054 202036b2 branch dongle_usb_tx_multikey_data +0047 6fe0c907 fetch 1 ,mem_dg_kb_mul_blank_data_enable +0048 207a0000 rtn blank +0049 d8e0000c arg timer_kb_mul_blank ,queue +004a 20407d74 call timer_check +004b 247a0000 nrtn blank +004c 70490700 jam 0 ,mem_dg_kb_mul_blank_data_enable +004d d8a00c1f arg mem_usb_kb_multikey ,contw +004e df200002 arg 2 ,loopcnt +004f 20407d17 call memset0 +0050 700c1f03 jam kb_multikey_report_id ,mem_usb_kb_multikey +0051 6fe18c1f fetch 3 ,mem_usb_kb_multikey +0052 67e1c8fd store 3 ,mem_dg_kb_multikey_last_data +0053 202036b2 branch dongle_usb_tx_multikey_data p_usb_class_type: -0055 793f8023 set0 mark_isstr ,mark -0056 6fe08b59 fetch 1 ,mem_usb_setup_bmrequesttype -0057 1fe17e80 and_into 0x80 ,pdata -0058 c000005a beq out_device ,p_usb_out_device -0059 20207a34 branch usb_class_type + 4 +0054 793f8023 set0 mark_isstr ,mark +0055 6fe08b59 fetch 1 ,mem_usb_setup_bmrequesttype +0056 1fe17e80 and_into 0x80 ,pdata +0057 c0000059 beq out_device ,p_usb_out_device +0058 20207a34 branch usb_class_type + 4 p_usb_out_device: -005a 6fe08b59 fetch 1 ,mem_usb_setup_bmrequesttype -005b 1ff1fe00 rshift4 pdata ,pdata -005c 1fe37e00 rshift pdata ,pdata -005d 1fe17e03 and_into 0x03 ,pdata -005e c0007a53 beq standard_req ,usb_out_standard_req -005f c0008061 beq class_req ,p_usb_out_class_req -0060 20207a43 branch usb_out_device + 4 +0059 6fe08b59 fetch 1 ,mem_usb_setup_bmrequesttype +005a 1ff1fe00 rshift4 pdata ,pdata +005b 1fe37e00 rshift pdata ,pdata +005c 1fe17e03 and_into 0x03 ,pdata +005d c0007a53 beq standard_req ,usb_out_standard_req +005e c0008060 beq class_req ,p_usb_out_class_req +005f 20207a43 branch usb_out_device + 4 p_usb_out_class_req: -0061 6fe08b5a fetch 1 ,mem_usb_setup_brequest -0062 c0048064 beq set_report ,p_usb_set_report -0063 20207a5c branch usb_out_class_req + 1 +0060 6fe08b5a fetch 1 ,mem_usb_setup_brequest +0061 c0048063 beq set_report ,p_usb_set_report +0062 20207a5c branch usb_out_class_req + 1 p_usb_set_report: -0064 20003a98 nop 15000 -0065 20207bd8 branch usb_set_report +0063 20003a98 nop 15000 +0064 20207bd8 branch usb_set_report p_usb_tx: -0066 6fe08bf9 fetch 1 ,mem_usb_tx_enable -0067 207a0000 rtn blank -0068 6ff08c24 fetch 1 ,core_usb_txbusy -0069 1fe17e0f and_into 0x0f ,pdata -006a 243a7ca4 nbranch usb_inwake_state_tx_dispose ,blank -006b 6fe08bfa fetch 1 ,mem_usb_device_enumeration_endflag -006c 203a7c7a branch usb_tx_fifo_release ,blank -006d 6fe08bec fetch 1 ,mem_usb_state -006e c001fcb4 beq usb_sleep ,usb_windows_wakeup -006f c0817c7a bne usb_connected ,usb_tx_fifo_release -0070 6fe08bee fetch 1 ,mem_usb_clear_remote_wakeup -0071 243a7c7a nbranch usb_tx_fifo_release ,blank -0072 6fe3c894 fetch 7 ,mem_24g_rxdata_temp + 3 -0073 207a0000 rtn blank -0074 2040007a call p_packet_num_increase -0075 20400080 call p_packet_timer_store -0076 6fe0ce40 fetch 1 ,mem_tx_enable -0077 c1808000 rtnne on -0078 20407c62 call usb_tx_data_ep1 -0079 20207c6d branch usb_tx_data_ep2 - -p_packet_num_increase: -007a 6fe0ce37 fetch 1 ,mem_package_count -007b 1fe0fe01 increase 1 ,pdata -007c 67e0ce37 store 1 ,mem_package_count -007d 1fe67c1a sub pdata ,26 ,null -007e 24410086 ncall p_packet_1s_timer_check ,positive -007f 20600000 rtn - -p_packet_timer_store: -0080 6fe0ce37 fetch 1 ,mem_package_count -0081 67e0c932 store 1 ,mem_clkn_bt_temp -0082 1c427e00 copy clkn_bt ,pdata -0083 67e24933 store 4 ,mem_clkn_bt_temp + 1 -0084 da204932 arg mem_clkn_bt_temp ,rega -0085 2020009c branch p_queue_push - -p_packet_1s_timer_check: -0086 d8400001 arg 1 ,temp -0087 d8c0493c arg mem_usb_queue_ele0 ,contr - -p_first_packet_timer_get_loop: -0088 efe08006 ifetch 1 ,contr -0089 98467c00 isub temp ,null -008a 2022808e branch p_get_first_packet_info ,zero -008b dfe00004 arg 4 ,pdata -008c 98c08c00 iadd contr ,contr -008d 20200088 branch p_first_packet_timer_get_loop - -p_get_first_packet_info: -008e e8420006 ifetcht 4 ,contr -008f 604a4e38 storet 4 ,mem_first_packet_clkn_bt -0090 1c427e00 copy clkn_bt ,pdata -0091 67e24e3c store 4 ,mem_currenr_packet_clkn_bt -0092 98460400 isub temp ,temp -0093 dfe00140 arg 0x0140 ,pdata -0094 98467c00 isub temp ,null -0095 2021009a branch p_time_less_than_1s ,positive - -p_timer_more_than_1s: -0096 704e4001 jam on ,mem_tx_enable -0097 704e3701 jam 1 ,mem_package_count -0098 70493900 jam 0 ,mem_usb_queue_curr_num -0099 20600000 rtn - -p_time_less_than_1s: -009a 704e4000 jam off ,mem_tx_enable -009b 20600000 rtn - -p_queue_push: -009c 20407e56 call disable_user -009d 20407989 call queue_full -009e 207a0000 rtn blank -009f 6fe1448a fetch 2 ,mem_queue_ptr -00a0 1fe0a402 add pdata ,queue_offset_curr_num ,regb -00a1 e8408012 ifetcht 1 ,regb -00a2 18408401 increase 1 ,temp -00a3 e0408012 istoret 1 ,regb -00a4 e840803f ifetcht 1 ,pdata -00a5 18427200 copy temp ,loopcnt -00a6 1fe0a402 add pdata ,queue_offset_curr_num ,regb -00a7 efe08012 ifetch 1 ,regb -00a8 1fe0ffff increase -1 ,pdata -00a9 984ffe00 imul32 temp ,pdata -00aa d8c0493c arg mem_usb_queue_ele0 ,contr -00ab 98c08a00 iadd contr ,contw -00ac 1a220c00 copy rega ,contr - -p_calc_queue_next_ptr: -00ad 20407d5f call memcpy -00ae 20207e54 branch enable_user +0065 6fe08bf9 fetch 1 ,mem_usb_tx_enable +0066 207a0000 rtn blank +0067 6ff08c24 fetch 1 ,core_usb_txbusy +0068 1fe17e0f and_into 0x0f ,pdata +0069 243a7ca4 nbranch usb_inwake_state_tx_dispose ,blank +006a 20207c59 branch usb_tx + 3 org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/YDN_Project/usb_16M_AutoPair/program/patch.prog (revision 660) +++ /YC1308AC/branch/mouse_project/YDN_Project/usb_16M_AutoPair/program/patch.prog (working copy) @@ -62,7 +62,6 @@ jam 0x02,mem_24g_tx_phy call dongle_init - jam ON,mem_tx_enable //watch dog enable call wdt_set_enable @@ -162,98 +161,8 @@ fetch 1,core_usb_txbusy and_into 0x0f,pdata nbranch usb_inwake_state_tx_dispose,blank + branch usb_tx+3 - fetch 1,mem_usb_device_enumeration_endflag - branch usb_tx_fifo_release,blank - fetch 1,mem_usb_state - beq USB_SLEEP,usb_windows_wakeup - bne USB_CONNECTED,usb_tx_fifo_release - fetch 1,mem_usb_clear_remote_wakeup - nbranch usb_tx_fifo_release,blank - - fetch 7,mem_24g_rxdata_temp+3 - rtn blank - - call p_packet_num_increase - call p_packet_timer_store - fetch 1,mem_tx_enable - rtnne ON - - call usb_tx_data_ep1 - branch usb_tx_data_ep2 - - -/************************report rate patch**********/ - -p_packet_num_increase: - fetch 1,mem_package_count - increase 1,pdata - store 1,mem_package_count - sub pdata,26,null - ncall p_packet_1s_timer_check,positive - rtn - -p_packet_timer_store: - fetch 1,mem_package_count - store 1,mem_clkn_bt_temp - copy clkn_bt,pdata - store 4,mem_clkn_bt_temp+1 - arg mem_clkn_bt_temp,rega - branch p_queue_push - -p_packet_1s_timer_check: - arg 1,temp - arg mem_usb_queue_ele0,contr -p_first_packet_timer_get_loop: - ifetch 1,contr - isub temp,null - branch p_get_first_packet_info,zero - arg 4,pdata //length - iadd contr,contr - branch p_first_packet_timer_get_loop - -p_get_first_packet_info: - ifetcht 4,contr - storet 4,mem_first_packet_clkn_bt - copy clkn_bt,pdata - store 4,mem_currenr_packet_clkn_bt - isub temp,temp - arg 0x0140,pdata //100ms - isub temp,null - branch p_time_less_than_1s,positive -p_timer_more_than_1s: - jam ON,mem_tx_enable - jam 1,mem_package_count - jam 0,mem_usb_queue_curr_num - rtn - -p_time_less_than_1s: - jam OFF,mem_tx_enable - rtn - -//input:rega:the address of the data to which you want to input queue -//output:if user is disable,mean queue no have space -p_queue_push: - call disable_user - call queue_full - rtn blank - fetch 2,mem_queue_ptr - add pdata,QUEUE_OFFSET_CURR_NUM,regb - ifetcht 1,regb - increase 1,temp - istoret 1,regb //number add - - ifetcht 1,pdata //temp:each length - copy temp,loopcnt - add pdata,QUEUE_OFFSET_CURR_NUM,regb - ifetch 1,regb - increase -1,pdata - imul32 temp,pdata //offset - arg mem_usb_queue_ele0,contr - iadd contr,contw - copy rega,contr -p_calc_queue_next_ptr: - call memcpy - branch enable_user + Index: sched/dongle.dat =================================================================== --- /YC1308AC/branch/mouse_project/YDN_Project/usb_16M_AutoPair/sched/dongle.dat (revision 660) +++ /YC1308AC/branch/mouse_project/YDN_Project/usb_16M_AutoPair/sched/dongle.dat (working copy) @@ -62,13 +62,6 @@ mem_gain_fix:ff mem_gain_second_agc_en:00 - -mem_queue_ptr:mem_usb_queue_each_size -mem_usb_queue_each_size: -05 #buf length -ff #buf number - - #mem_rf_debug_rx_gpio:92 #mem_rf_debug_tx_gpio:92