Index: d.bat =================================================================== --- /YC1308AC/branch/mouse_project/YDN_Project/usb_16M/d.bat (revision 570) +++ /YC1308AC/branch/mouse_project/YDN_Project/usb_16M/d.bat (working copy) @@ -3,6 +3,11 @@ e 8070 00000000000000000000 e 807a 00000000000000000000 e 8070 3e6c6d +e ew 0 ffff +e er 0 10 +e ku +e pu +e 8070 3e6c6d e ep output/eeprom.dat e er 0 10 e ku Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/YDN_Project/usb_16M/output/eeprom.dat (revision 570) +++ /YC1308AC/branch/mouse_project/YDN_Project/usb_16M/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -46 +4e 01 c2 84 @@ -19,11 +19,11 @@ c0 5d 80 -17 +19 c0 5e 00 -19 +1b 20 20 13 @@ -31,11 +31,11 @@ c0 48 00 -3a +3c c0 4a 80 -4b +4d 20 20 13 @@ -80,6 +80,14 @@ 40 23 20 +70 +48 +64 +02 +70 +48 +65 +02 20 40 36 @@ -99,7 +107,7 @@ 20 40 00 -15 +17 20 20 36 @@ -119,7 +127,7 @@ 20 40 00 -1e +20 20 20 36 @@ -131,11 +139,11 @@ 20 40 00 -21 +23 20 20 00 -2d +2f 6f e0 c9 @@ -251,7 +259,7 @@ c0 00 00 -3f +41 20 20 7a @@ -279,7 +287,7 @@ c0 00 80 -46 +48 20 20 7a @@ -291,7 +299,7 @@ c0 04 80 -49 +4b 20 20 7a @@ -328,8 +336,8 @@ 20 7c 59 -50 -0f +78 +5e aa 55 40 @@ -441,7 +449,7 @@ 00 a8 40 -37 +39 26 10 30 @@ -518,7 +526,7 @@ aa aa 55 -bd +bf 22 -fe -b2 +94 +9e Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/YDN_Project/usb_16M/output/program.lis (revision 570) +++ /YC1308AC/branch/mouse_project/YDN_Project/usb_16M/output/program.lis (working copy) @@ -3,13 +3,13 @@ 0000 c2840006 bbit1 8 ,pf_patch_ext 0001 c0458009 beq patch11_3 ,p_initialize_radio_cont 0002 c0570011 beq patch15_6 ,p_app_init -0003 c05d8017 beq patch17_3 ,p_dongle_usb_dispatch -0004 c05e0019 beq patch17_4 ,p_dongle_work_mode_auto +0003 c05d8019 beq patch17_3 ,p_dongle_usb_dispatch +0004 c05e001b beq patch17_4 ,p_dongle_work_mode_auto 0005 2020137c branch loop pf_patch_ext: -0006 c048003a beq patch32_0 ,p_usb_class_type -0007 c04a804b beq patch32_5 ,p_usb_tx +0006 c048003c beq patch32_0 ,p_usb_class_type +0007 c04a804d beq patch32_5 ,p_usb_tx 0008 2020137c branch loop p_initialize_radio_cont: @@ -25,90 +25,92 @@ p_app_init: 0011 d8406978 arg 0x6978 ,temp 0012 20402320 call g24_rx_window_store -0013 20403620 call dongle_init -0014 2040623c call wdt_set_enable +0013 70486402 jam 0x02 ,mem_24g_rx_phy +0014 70486502 jam 0x02 ,mem_24g_tx_phy +0015 20403620 call dongle_init +0016 2040623c call wdt_set_enable p_wdt_kick: -0015 5800007d setarg 125 -0016 2020622d branch wdt_init_config +0017 5800007d setarg 125 +0018 2020622d branch wdt_init_config p_dongle_usb_dispatch: -0017 20400015 call p_wdt_kick -0018 202036b5 branch dongle_usb_dispatch + 1 +0019 20400017 call p_wdt_kick +001a 202036b5 branch dongle_usb_dispatch + 1 p_dongle_work_mode_auto: -0019 6fe0c8bf fetch 1 ,mem_24g_work_mode -001a c1800000 rtnne dongle_work -001b 20402491 call g24_work_mode_start -001c 2040001e call p_dongle_g24_blank_data_process -001d 202036f2 branch dongle_work_mode_auto + 5 +001b 6fe0c8bf fetch 1 ,mem_24g_work_mode +001c c1800000 rtnne dongle_work +001d 20402491 call g24_work_mode_start +001e 20400020 call p_dongle_g24_blank_data_process +001f 202036f2 branch dongle_work_mode_auto + 5 p_dongle_g24_blank_data_process: -001e 2040368a call dongle_g24_ms_blank_data -001f 20400021 call p_dongle_g24_kb_blank_data -0020 2020002d branch p_dongle_g24_kb_mul_blank_data +0020 2040368a call dongle_g24_ms_blank_data +0021 20400023 call p_dongle_g24_kb_blank_data +0022 2020002f branch p_dongle_g24_kb_mul_blank_data p_dongle_g24_kb_blank_data: -0021 6fe0c906 fetch 1 ,mem_dg_kb_blank_data_enable -0022 207a0000 rtn blank -0023 d8e0000e arg timer_kb_blank ,queue -0024 20407d74 call timer_check -0025 247a0000 nrtn blank -0026 70490600 jam 0 ,mem_dg_kb_blank_data_enable -0027 d8a00c0f arg mem_usb_kb_data ,contw -0028 df200002 arg 2 ,loopcnt -0029 20407d17 call memset0 -002a 6fe40c0f fetch 8 ,mem_usb_kb_data -002b 67e448f2 store 8 ,mem_dg_kb_data_last_data -002c 202036a2 branch dongle_usb_tx_kb_data +0023 6fe0c906 fetch 1 ,mem_dg_kb_blank_data_enable +0024 207a0000 rtn blank +0025 d8e0000e arg timer_kb_blank ,queue +0026 20407d74 call timer_check +0027 247a0000 nrtn blank +0028 70490600 jam 0 ,mem_dg_kb_blank_data_enable +0029 d8a00c0f arg mem_usb_kb_data ,contw +002a df200002 arg 2 ,loopcnt +002b 20407d17 call memset0 +002c 6fe40c0f fetch 8 ,mem_usb_kb_data +002d 67e448f2 store 8 ,mem_dg_kb_data_last_data +002e 202036a2 branch dongle_usb_tx_kb_data p_dongle_g24_kb_mul_blank_data: -002d 6fe0c907 fetch 1 ,mem_dg_kb_mul_blank_data_enable -002e 207a0000 rtn blank -002f d8e0000c arg timer_kb_mul_blank ,queue -0030 20407d74 call timer_check -0031 247a0000 nrtn blank -0032 70490700 jam 0 ,mem_dg_kb_mul_blank_data_enable -0033 d8a00c1f arg mem_usb_kb_multikey ,contw -0034 df200002 arg 2 ,loopcnt -0035 20407d17 call memset0 -0036 700c1f03 jam kb_multikey_report_id ,mem_usb_kb_multikey -0037 6fe18c1f fetch 3 ,mem_usb_kb_multikey -0038 67e1c8fd store 3 ,mem_dg_kb_multikey_last_data -0039 202036b2 branch dongle_usb_tx_multikey_data +002f 6fe0c907 fetch 1 ,mem_dg_kb_mul_blank_data_enable +0030 207a0000 rtn blank +0031 d8e0000c arg timer_kb_mul_blank ,queue +0032 20407d74 call timer_check +0033 247a0000 nrtn blank +0034 70490700 jam 0 ,mem_dg_kb_mul_blank_data_enable +0035 d8a00c1f arg mem_usb_kb_multikey ,contw +0036 df200002 arg 2 ,loopcnt +0037 20407d17 call memset0 +0038 700c1f03 jam kb_multikey_report_id ,mem_usb_kb_multikey +0039 6fe18c1f fetch 3 ,mem_usb_kb_multikey +003a 67e1c8fd store 3 ,mem_dg_kb_multikey_last_data +003b 202036b2 branch dongle_usb_tx_multikey_data p_usb_class_type: -003a 793f8023 set0 mark_isstr ,mark -003b 6fe08b59 fetch 1 ,mem_usb_setup_bmrequesttype -003c 1fe17e80 and_into 0x80 ,pdata -003d c000003f beq out_device ,p_usb_out_device -003e 20207a34 branch usb_class_type + 4 +003c 793f8023 set0 mark_isstr ,mark +003d 6fe08b59 fetch 1 ,mem_usb_setup_bmrequesttype +003e 1fe17e80 and_into 0x80 ,pdata +003f c0000041 beq out_device ,p_usb_out_device +0040 20207a34 branch usb_class_type + 4 p_usb_out_device: -003f 6fe08b59 fetch 1 ,mem_usb_setup_bmrequesttype -0040 1ff1fe00 rshift4 pdata ,pdata -0041 1fe37e00 rshift pdata ,pdata -0042 1fe17e03 and_into 0x03 ,pdata -0043 c0007a53 beq standard_req ,usb_out_standard_req -0044 c0008046 beq class_req ,p_usb_out_class_req -0045 20207a43 branch usb_out_device + 4 +0041 6fe08b59 fetch 1 ,mem_usb_setup_bmrequesttype +0042 1ff1fe00 rshift4 pdata ,pdata +0043 1fe37e00 rshift pdata ,pdata +0044 1fe17e03 and_into 0x03 ,pdata +0045 c0007a53 beq standard_req ,usb_out_standard_req +0046 c0008048 beq class_req ,p_usb_out_class_req +0047 20207a43 branch usb_out_device + 4 p_usb_out_class_req: -0046 6fe08b5a fetch 1 ,mem_usb_setup_brequest -0047 c0048049 beq set_report ,p_usb_set_report -0048 20207a5c branch usb_out_class_req + 1 +0048 6fe08b5a fetch 1 ,mem_usb_setup_brequest +0049 c004804b beq set_report ,p_usb_set_report +004a 20207a5c branch usb_out_class_req + 1 p_usb_set_report: -0049 20003a98 nop 15000 -004a 20207bd8 branch usb_set_report +004b 20003a98 nop 15000 +004c 20207bd8 branch usb_set_report p_usb_tx: -004b 6fe08bf9 fetch 1 ,mem_usb_tx_enable -004c 207a0000 rtn blank -004d 6ff08c24 fetch 1 ,core_usb_txbusy -004e 1fe17e0f and_into 0x0f ,pdata -004f 243a7ca4 nbranch usb_inwake_state_tx_dispose ,blank -0050 20207c59 branch usb_tx + 3 +004d 6fe08bf9 fetch 1 ,mem_usb_tx_enable +004e 207a0000 rtn blank +004f 6ff08c24 fetch 1 ,core_usb_txbusy +0050 1fe17e0f and_into 0x0f ,pdata +0051 243a7ca4 nbranch usb_inwake_state_tx_dispose ,blank +0052 20207c59 branch usb_tx + 3 org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/YDN_Project/usb_16M/program/patch.prog (revision 570) +++ /YC1308AC/branch/mouse_project/YDN_Project/usb_16M/program/patch.prog (working copy) @@ -12,6 +12,7 @@ branch loop + /********************rx fail patch************************/ p_initialize_radio_cont: //config osc_xtal_ctrim @@ -34,6 +35,8 @@ /********************dongle rx window patch************************/ arg 0x6978,temp call g24_rx_window_store + jam 0x02,mem_24g_rx_phy + jam 0x02,mem_24g_tx_phy call dongle_init Index: sched/dongle.dat =================================================================== --- /YC1308AC/branch/mouse_project/YDN_Project/usb_16M/sched/dongle.dat (revision 570) +++ /YC1308AC/branch/mouse_project/YDN_Project/usb_16M/sched/dongle.dat (working copy) @@ -24,7 +24,7 @@ #rf config -mem_lap:37 26 10 30 11 12#low 4B used for 24g rxaddr +mem_lap:39 26 10 30 11 12#low 4B used for 24g rxaddr #mem_24g_tx_phy:01#0x01:1M/0x02:2M/0x04:S2/0x84:S8 #mem_24g_rx_phy:01#0x01:1M/0x02:2M/0x04:S2/0x84:S8 #mem_24g_no_ack:00#no ack @@ -62,4 +62,6 @@ mem_gain_fix:ff mem_gain_second_agc_en:00 +#mem_rf_debug_rx_gpio:92 +#mem_rf_debug_tx_gpio:92