Index: output/eeprom.dat =================================================================== --- /branch/usb/usb_public/output/eeprom.dat (revision 262) +++ /branch/usb/usb_public/output/eeprom.dat (working copy) @@ -2,8 +2,8 @@ 02 aa 55 -06 -03 +fe +02 c2 84 00 @@ -39,23 +39,23 @@ c0 14 00 -3c +3b c0 1d 00 -60 +5e c0 1d 80 -74 +72 c0 20 80 -46 +44 c0 22 00 -b6 +b4 c0 40 00 @@ -232,10 +232,6 @@ 40 39 8e -c5 -1a -39 -cf 20 00 03 @@ -268,10 +264,6 @@ e0 c4 3e -79 -20 -00 -34 20 40 4a @@ -407,7 +399,7 @@ 20 40 00 -6c +6a 20 40 4a @@ -475,19 +467,19 @@ c0 55 00 -7a +78 c0 2a 80 -84 +82 c0 11 00 -94 +92 c0 7f 80 -ac +aa 20 60 00 @@ -499,11 +491,11 @@ c0 00 80 -7e +7c c0 01 00 -81 +7f 20 60 00 @@ -539,7 +531,7 @@ 20 3a 00 -8a +88 6f e2 45 @@ -563,11 +555,11 @@ c0 00 80 -8e +8c c0 01 00 -91 +8f 20 60 00 @@ -603,7 +595,7 @@ 20 3a 00 -9a +98 6f e2 45 @@ -627,11 +619,11 @@ c0 00 80 -9e +9c c0 01 00 -a5 +a3 20 60 00 @@ -651,7 +643,7 @@ c0 01 00 -a3 +a1 20 60 00 @@ -679,7 +671,7 @@ c0 80 00 -aa +a8 20 60 00 @@ -699,11 +691,11 @@ c0 00 80 -b0 +ae c0 01 00 -b3 +b1 20 60 00 @@ -743,7 +735,7 @@ 20 40 00 -ba +b8 20 20 4b @@ -776,8 +768,8 @@ 20 4b 0b -29 -7a +7e +0e aa 55 40 @@ -1031,5 +1023,5 @@ 55 36 35 -fd -85 +c9 +5c Index: output/program.lis =================================================================== --- /branch/usb/usb_public/output/program.lis (revision 262) +++ /branch/usb/usb_public/output/program.lis (working copy) @@ -10,11 +10,11 @@ pf_patch_ext: 0007 c17f8000 rtneq patch3f_7 -0008 c014003c beq patch25_0 ,p_g24_receive_skip_end -0009 c01d0060 beq patch27_2 ,p_g24_bind_data_process -000a c01d8074 beq patch27_3 ,p_g24_bind_data_parse_next -000b c0208046 beq patch28_1 ,p_g24_mode_switch_bind_search -000c c02200b6 beq patch28_4 ,p_g24_search_mode_auto +0008 c014003b beq patch25_0 ,p_g24_receive_skip_end +0009 c01d005e beq patch27_2 ,p_g24_bind_data_process +000a c01d8072 beq patch27_3 ,p_g24_bind_data_parse_next +000b c0208044 beq patch28_1 ,p_g24_mode_switch_bind_search +000c c02200b4 beq patch28_4 ,p_g24_search_mode_auto 000d c0400014 beq patch30_0 ,p_dongle_default_init 000e 20203aba branch assert @@ -75,188 +75,186 @@ 0036 60488008 storet 1 ,mem_last_freq 0037 1840a202 add temp ,2 ,rega 0038 2040398e call rf_tx_write_freq -0039 c51a39cf bmark1 mark_pllon ,txon -003a 200003c0 nop 0x3c0 -003b 202039cf branch txon +0039 200003c0 nop 0x3c0 +003a 202039cf branch txon p_g24_receive_skip_end: -003c 6fe0c5ab fetch 1 ,mem_dg_sys_config -003d c300481c bbit0 dg_enable_new_revision ,g24_receive_skip_end -003e 2000012c nop 300 -003f 6fe0c43e fetch 1 ,mem_24g_rxbuf + 1 -0040 79207e00 set1 bit_ack_24g ,pdata -0041 67e0c43e store 1 ,mem_24g_rxbuf + 1 -0042 79200034 set1 mark_pllon ,mark -0043 20404a3b call g24_ackpayload_prep -0044 2040488f call g24_transmit_prep -0045 2020483f branch g24_transmit +003b 6fe0c5ab fetch 1 ,mem_dg_sys_config +003c c300481c bbit0 dg_enable_new_revision ,g24_receive_skip_end +003d 2000012c nop 300 +003e 6fe0c43e fetch 1 ,mem_24g_rxbuf + 1 +003f 79207e00 set1 bit_ack_24g ,pdata +0040 67e0c43e store 1 ,mem_24g_rxbuf + 1 +0041 20404a3b call g24_ackpayload_prep +0042 2040488f call g24_transmit_prep +0043 2020483f branch g24_transmit p_g24_mode_switch_bind_search: -0046 6fe0c559 fetch 1 ,mem_24g_work_mode -0047 c1000000 rtneq dongle_work -0048 6fe0c56d fetch 1 ,mem_24g_b_s_mode_switch_disable +0044 6fe0c559 fetch 1 ,mem_24g_work_mode +0045 c1000000 rtneq dongle_work +0046 6fe0c56d fetch 1 ,mem_24g_b_s_mode_switch_disable +0047 247a0000 nrtn blank +0048 6fe0c56b fetch 1 ,mem_24g_mode_b_s_switch_exit 0049 247a0000 nrtn blank -004a 6fe0c56b fetch 1 ,mem_24g_mode_b_s_switch_exit -004b 247a0000 nrtn blank -004c 6fe0c567 fetch 1 ,mem_24g_mode_b_s_switch -004d 207a0000 rtn blank -004e 6fe0c56e fetch 1 ,mem_24g_bind_device_living -004f 2fe00603 compare 3 ,pdata ,3 -0050 2020cadc branch g24_mode_b_s_switch_exit ,true -0051 204048ef call g24_timer_check -0052 24740000 nrtn user -0053 6fe14569 fetch 2 ,mem_24g_mode_b_s_switch_cnt -0054 1fe0fe01 increase 1 ,pdata -0055 67e14569 store 2 ,mem_24g_mode_b_s_switch_cnt -0056 d84007d0 arg 0x7d0 ,temp -0057 98467c00 isub temp ,null -0058 20214adc branch g24_mode_b_s_switch_exit ,positive -0059 6fe0c56c fetch 1 ,mem_24g_b_s_time_slice -005a 1fe0fe01 increase 1 ,pdata -005b 1fe17e01 and_into 1 ,pdata -005c 67e0c56c store 1 ,mem_24g_b_s_time_slice -005d c0004ba3 beq 0 ,g24_search_mode_enable -005e c000c99f beq 1 ,g24_bind_mode_enable -005f 20600000 rtn +004a 6fe0c567 fetch 1 ,mem_24g_mode_b_s_switch +004b 207a0000 rtn blank +004c 6fe0c56e fetch 1 ,mem_24g_bind_device_living +004d 2fe00603 compare 3 ,pdata ,3 +004e 2020cadc branch g24_mode_b_s_switch_exit ,true +004f 204048ef call g24_timer_check +0050 24740000 nrtn user +0051 6fe14569 fetch 2 ,mem_24g_mode_b_s_switch_cnt +0052 1fe0fe01 increase 1 ,pdata +0053 67e14569 store 2 ,mem_24g_mode_b_s_switch_cnt +0054 d84007d0 arg 0x7d0 ,temp +0055 98467c00 isub temp ,null +0056 20214adc branch g24_mode_b_s_switch_exit ,positive +0057 6fe0c56c fetch 1 ,mem_24g_b_s_time_slice +0058 1fe0fe01 increase 1 ,pdata +0059 1fe17e01 and_into 1 ,pdata +005a 67e0c56c store 1 ,mem_24g_b_s_time_slice +005b c0004ba3 beq 0 ,g24_search_mode_enable +005c c000c99f beq 1 ,g24_bind_mode_enable +005d 20600000 rtn p_g24_bind_data_process: -0060 20404a54 call g24_rx_interrupt_clear -0061 204047ce call g24_receive_packet -0062 2437ca54 nbranch g24_rx_interrupt_clear ,user3 -0063 204049bf call g24_bind_data_parse -0064 2040006c call p_g24_bind_transmit_ack -0065 20404a2e call g24_bind_device_status_check -0066 204053c3 call dongle_kb_bind_soft_reset -0067 6fe0c4f4 fetch 1 ,mem_24g_pair_switch +005e 20404a54 call g24_rx_interrupt_clear +005f 204047ce call g24_receive_packet +0060 2437ca54 nbranch g24_rx_interrupt_clear ,user3 +0061 204049bf call g24_bind_data_parse +0062 2040006a call p_g24_bind_transmit_ack +0063 20404a2e call g24_bind_device_status_check +0064 204053c3 call dongle_kb_bind_soft_reset +0065 6fe0c4f4 fetch 1 ,mem_24g_pair_switch +0066 207a0000 rtn blank +0067 6fe2456f fetch 4 ,mem_24g_transmitter_addr 0068 207a0000 rtn blank -0069 6fe2456f fetch 4 ,mem_24g_transmitter_addr -006a 207a0000 rtn blank -006b 202048e0 branch g24_update_addr_and_synccrc8 +0069 202048e0 branch g24_update_addr_and_synccrc8 p_g24_bind_transmit_ack: -006c 6fe0c43d fetch 1 ,mem_24g_rxbuf -006d 67e0c4cf store 1 ,mem_24g_data_type -006e 204048be call g24_read_len_pid_crc -006f 20404a3b call g24_ackpayload_prep -0070 2437c837 nbranch g24_end_of_packet ,user3 -0071 2040488f call g24_transmit_prep -0072 2040483f call g24_transmit -0073 20204837 branch g24_end_of_packet +006a 6fe0c43d fetch 1 ,mem_24g_rxbuf +006b 67e0c4cf store 1 ,mem_24g_data_type +006c 204048be call g24_read_len_pid_crc +006d 20404a3b call g24_ackpayload_prep +006e 2437c837 nbranch g24_end_of_packet ,user3 +006f 2040488f call g24_transmit_prep +0070 2040483f call g24_transmit +0071 20204837 branch g24_end_of_packet p_g24_bind_data_parse_next: -0074 6fe0c52d fetch 1 ,mem_24g_rxdata_temp + 2 -0075 c055007a beq datatype_bind ,p_g24_bind_first_step -0076 c02a8084 beq datatype_config ,p_g24_bind_second_step -0077 c0110094 beq datatype_ok ,p_g24_bind_third_step -0078 c07f80ac beq datatype_attemp ,p_g24_data_attemp -0079 20600000 rtn +0072 6fe0c52d fetch 1 ,mem_24g_rxdata_temp + 2 +0073 c0550078 beq datatype_bind ,p_g24_bind_first_step +0074 c02a8082 beq datatype_config ,p_g24_bind_second_step +0075 c0110092 beq datatype_ok ,p_g24_bind_third_step +0076 c07f80aa beq datatype_attemp ,p_g24_data_attemp +0077 20600000 rtn p_g24_bind_first_step: -007a 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -007b c000807e beq datatype_device1 ,p_g24_bind_first_step_device1 -007c c0010081 beq datatype_device2 ,p_g24_bind_first_step_device2 -007d 20600000 rtn +0078 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 +0079 c000807c beq datatype_device1 ,p_g24_bind_first_step_device1 +007a c001007f beq datatype_device2 ,p_g24_bind_first_step_device2 +007b 20600000 rtn p_g24_bind_first_step_device1: -007e 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -007f 247a0000 nrtn blank -0080 202049ce branch g24_bind_first_step_device1 +007c 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable +007d 247a0000 nrtn blank +007e 202049ce branch g24_bind_first_step_device1 p_g24_bind_first_step_device2: -0081 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -0082 247a0000 nrtn blank -0083 202049d4 branch g24_bind_first_step_device2 +007f 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable +0080 247a0000 nrtn blank +0081 202049d4 branch g24_bind_first_step_device2 p_g24_bind_second_step: -0084 6fe0c4f4 fetch 1 ,mem_24g_pair_switch -0085 203a008a branch p_g24_bind_second_step_skip ,blank -0086 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 -0087 684a4437 fetcht 4 ,mem_24g_lap -0088 98467c00 isub temp ,null -0089 24628000 nrtn zero +0082 6fe0c4f4 fetch 1 ,mem_24g_pair_switch +0083 203a0088 branch p_g24_bind_second_step_skip ,blank +0084 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 +0085 684a4437 fetcht 4 ,mem_24g_lap +0086 98467c00 isub temp ,null +0087 24628000 nrtn zero p_g24_bind_second_step_skip: -008a 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -008b c000808e beq datatype_device1 ,p_g24_bind_second_step_device1 -008c c0010091 beq datatype_device2 ,p_g24_bind_second_step_device2 -008d 20600000 rtn +0088 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 +0089 c000808c beq datatype_device1 ,p_g24_bind_second_step_device1 +008a c001008f beq datatype_device2 ,p_g24_bind_second_step_device2 +008b 20600000 rtn p_g24_bind_second_step_device1: -008e 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -008f 247a0000 nrtn blank -0090 202049e1 branch g24_bind_second_step_device1 +008c 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable +008d 247a0000 nrtn blank +008e 202049e1 branch g24_bind_second_step_device1 p_g24_bind_second_step_device2: -0091 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -0092 247a0000 nrtn blank -0093 202049ec branch g24_bind_second_step_device2 +008f 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable +0090 247a0000 nrtn blank +0091 202049ec branch g24_bind_second_step_device2 p_g24_bind_third_step: -0094 6fe0c4f4 fetch 1 ,mem_24g_pair_switch -0095 203a009a branch p_g24_bind_third_step_skip ,blank -0096 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 -0097 684a456f fetcht 4 ,mem_24g_transmitter_addr -0098 98467c00 isub temp ,null -0099 24628000 nrtn zero +0092 6fe0c4f4 fetch 1 ,mem_24g_pair_switch +0093 203a0098 branch p_g24_bind_third_step_skip ,blank +0094 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 +0095 684a456f fetcht 4 ,mem_24g_transmitter_addr +0096 98467c00 isub temp ,null +0097 24628000 nrtn zero p_g24_bind_third_step_skip: -009a 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -009b c000809e beq datatype_device1 ,p_g24_bind_third_step_device1 -009c c00100a5 beq datatype_device2 ,p_g24_bind_third_step_device2 -009d 20600000 rtn +0098 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 +0099 c000809c beq datatype_device1 ,p_g24_bind_third_step_device1 +009a c00100a3 beq datatype_device2 ,p_g24_bind_third_step_device2 +009b 20600000 rtn p_g24_bind_third_step_device1: -009e 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -009f 247a0000 nrtn blank -00a0 6fe0c518 fetch 1 ,mem_24g_device1_bind_step -00a1 c00100a3 beq 2 ,p_g24_bind_dvc1_step_success -00a2 20600000 rtn +009c 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable +009d 247a0000 nrtn blank +009e 6fe0c518 fetch 1 ,mem_24g_device1_bind_step +009f c00100a1 beq 2 ,p_g24_bind_dvc1_step_success +00a0 20600000 rtn p_g24_bind_dvc1_step_success: -00a3 7045d701 jam 1 ,mem_24g_device1_bind_disable -00a4 20204a02 branch g24_bind_dvc1_step_success + 1 +00a1 7045d701 jam 1 ,mem_24g_device1_bind_disable +00a2 20204a02 branch g24_bind_dvc1_step_success + 1 p_g24_bind_third_step_device2: -00a5 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -00a6 247a0000 nrtn blank -00a7 6fe0c519 fetch 1 ,mem_24g_device2_bind_step -00a8 c08000aa bne 0 ,p_g24_bind_dvc2_step_success -00a9 20600000 rtn +00a3 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable +00a4 247a0000 nrtn blank +00a5 6fe0c519 fetch 1 ,mem_24g_device2_bind_step +00a6 c08000a8 bne 0 ,p_g24_bind_dvc2_step_success +00a7 20600000 rtn p_g24_bind_dvc2_step_success: -00aa 7045d801 jam 1 ,mem_24g_device2_bind_disable -00ab 20204a0d branch g24_bind_dvc2_step_success + 1 +00a8 7045d801 jam 1 ,mem_24g_device2_bind_disable +00a9 20204a0d branch g24_bind_dvc2_step_success + 1 p_g24_data_attemp: -00ac 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -00ad c00080b0 beq datatype_device1 ,p_g24_data_attemp_device1 -00ae c00100b3 beq datatype_device2 ,p_g24_data_attemp_device2 -00af 20600000 rtn +00aa 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 +00ab c00080ae beq datatype_device1 ,p_g24_data_attemp_device1 +00ac c00100b1 beq datatype_device2 ,p_g24_data_attemp_device2 +00ad 20600000 rtn p_g24_data_attemp_device1: -00b0 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -00b1 247a0000 nrtn blank -00b2 20204c24 branch g24_data_attemp_device1 +00ae 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable +00af 247a0000 nrtn blank +00b0 20204c24 branch g24_data_attemp_device1 p_g24_data_attemp_device2: -00b3 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -00b4 247a0000 nrtn blank -00b5 20204c28 branch g24_data_attemp_device2 +00b1 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable +00b2 247a0000 nrtn blank +00b3 20204c28 branch g24_data_attemp_device2 p_g24_search_mode_auto: -00b6 6fe0c559 fetch 1 ,mem_24g_work_mode -00b7 c1838000 rtnne dongle_search -00b8 204000ba call p_g24_search_mode_init -00b9 20204b1b branch g24_search_mode_auto + 4 +00b4 6fe0c559 fetch 1 ,mem_24g_work_mode +00b5 c1838000 rtnne dongle_search +00b6 204000b8 call p_g24_search_mode_init +00b7 20204b1b branch g24_search_mode_auto + 4 p_g24_search_mode_init: -00ba 6fe0c558 fetch 1 ,mem_24g_mode_init -00bb c3838000 rtnbit1 dongle_search -00bc 79207e07 set1 dongle_search ,pdata -00bd 67e0c558 store 1 ,mem_24g_mode_init -00be 6fe0c566 fetch 1 ,mem_tx_power_temp -00bf 67e0c116 store 1 ,mem_tx_power -00c0 20204b0b branch g24_search_mode_init + 4 +00b8 6fe0c558 fetch 1 ,mem_24g_mode_init +00b9 c3838000 rtnbit1 dongle_search +00ba 79207e07 set1 dongle_search ,pdata +00bb 67e0c558 store 1 ,mem_24g_mode_init +00bc 6fe0c566 fetch 1 ,mem_tx_power_temp +00bd 67e0c116 store 1 ,mem_tx_power +00be 20204b0b branch g24_search_mode_init + 4 org 0x3800 start: Index: program/patch.prog =================================================================== --- /branch/usb/usb_public/program/patch.prog (revision 262) +++ /branch/usb/usb_public/program/patch.prog (working copy) @@ -84,7 +84,7 @@ storet 1,mem_last_freq add temp,2,rega call rf_tx_write_freq - bmark1 mark_pllon,txon + //bmark1 mark_pllon,txon nop 0x3c0 branch txon @@ -96,7 +96,7 @@ fetch 1,mem_24g_rxbuf+1 set1 bit_ack_24g,pdata store 1,mem_24g_rxbuf+1 //sending ack once - set1 mark_pllon,mark //not waiting pll on + //set1 mark_pllon,mark //not waiting pll on call g24_ackpayload_prep call g24_transmit_prep branch g24_transmit