Index: output/eeprom.dat =================================================================== --- /branch/usb/usb_public_base/output/eeprom.dat (revision 203) +++ /branch/usb/usb_public_base/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -aa +ae 02 c2 84 @@ -15,7 +15,7 @@ c0 01 80 -7f +80 c0 0b b9 @@ -27,27 +27,27 @@ c0 4a 80 -9c +9d c0 5c 80 -1a +1b c0 6a 80 -62 +63 c0 6f 00 -67 +68 c0 71 00 -82 +83 c0 74 00 -8c +8d 20 20 3a @@ -59,7 +59,7 @@ c0 1d 80 -2b +2c 20 20 3a @@ -104,6 +104,10 @@ 40 3c 41 +70 +45 +6d +01 20 20 52 @@ -183,15 +187,15 @@ c0 55 00 -30 +31 c0 2a 80 -3a +3b c0 11 00 -4a +4b 20 20 49 @@ -203,11 +207,11 @@ c0 00 80 -34 +35 c0 01 00 -37 +38 20 60 00 @@ -243,7 +247,7 @@ 20 3a 00 -40 +41 6f e2 45 @@ -267,11 +271,11 @@ c0 00 80 -44 +45 c0 01 00 -47 +48 20 60 00 @@ -307,7 +311,7 @@ 20 3a 00 -50 +51 6f e2 45 @@ -331,11 +335,11 @@ c0 00 80 -54 +55 c0 01 00 -5b +5c 20 60 00 @@ -355,7 +359,7 @@ c0 01 00 -59 +5a 20 60 00 @@ -383,7 +387,7 @@ c0 80 00 -60 +61 20 60 00 @@ -403,7 +407,7 @@ c2 80 80 -65 +66 20 20 3d @@ -423,7 +427,7 @@ c5 97 80 -6d +6e 78 3c fc @@ -467,7 +471,7 @@ 20 37 00 -76 +77 1b 42 04 @@ -519,7 +523,7 @@ 24 22 80 -7d +7e 20 20 38 @@ -607,7 +611,7 @@ c5 16 80 -98 +99 20 20 3e @@ -623,7 +627,7 @@ c2 00 00 -99 +9a 20 20 3f @@ -684,8 +688,8 @@ 20 6c a7 -fb -03 +64 +00 aa 55 40 @@ -797,8 +801,8 @@ 00 37 44 -36 -27 +39 +28 13 30 06 @@ -968,7 +972,7 @@ aa aa 55 -4c +50 3a -0e -b4 +d7 +c1 Index: output/program.lis =================================================================== --- /branch/usb/usb_public_base/output/program.lis (revision 203) +++ /branch/usb/usb_public_base/output/program.lis (working copy) @@ -2,20 +2,20 @@ org 0x0000 0000 c284000c bbit1 8 ,pf_patch_ext 0001 c000000f beq patch00_0 ,p_soft_reset -0002 c001807f beq patch00_3 ,p_connection_incontext +0002 c0018080 beq patch00_3 ,p_connection_incontext 0003 c00bb9ff beq patch02_7 ,set_tx_power_10db 0004 c0310014 beq patch0c_2 ,p_app_init -0005 c04a809c beq patch12_5 ,p_enable_adc -0006 c05c801a beq patch17_1 ,p_usb_init -0007 c06a8062 beq patch1a_5 ,p_le_enable_phy_by_pdata -0008 c06f0067 beq patch1b_6 ,p_le_receive_rxon -0009 c0710082 beq patch1c_2 ,p_le_crc_fail_tx -000a c074008c beq patch1d_0 ,p_le_transmit +0005 c04a809d beq patch12_5 ,p_enable_adc +0006 c05c801b beq patch17_1 ,p_usb_init +0007 c06a8063 beq patch1a_5 ,p_le_enable_phy_by_pdata +0008 c06f0068 beq patch1b_6 ,p_le_receive_rxon +0009 c0710083 beq patch1c_2 ,p_le_crc_fail_tx +000a c074008d beq patch1d_0 ,p_le_transmit 000b 20203aba branch assert pf_patch_ext: 000c c17f8000 rtneq patch3f_7 -000d c01d802b beq patch27_3 ,p_g24_bind_data_parse_next +000d c01d802c beq patch27_3 ,p_g24_bind_data_parse_next 000e 20203aba branch assert p_soft_reset: @@ -33,205 +33,206 @@ 0016 20758000 rtn wake 0017 7040cc3a jam hvin_vin_greater_than_4v2 ,mem_lpm_ctrl3 0018 20403c41 call lpm_write_sel_vdd -0019 20205249 branch dongle_init +0019 70456d01 jam 1 ,mem_24g_b_s_mode_switch_disable +001a 20205249 branch dongle_init p_usb_init: -001a 20406fd3 call enable_authrom -001b 204071a1 call usb_init_param -001c 70061003 jam 0x03 ,mem_devicedesc + 17 -001d 708c0000 jam 0x00 ,core_usb_config -001e 20002710 nop 10000 -001f 708c1800 jam 0x00 ,core_usb_trig -0020 6ff10050 fetch 2 ,core_clkoff -0021 793ffe0a set0 clock_off_usb ,pdata -0022 67f10050 store 2 ,core_clkoff -0023 708c1100 jam 0x0 ,core_usb_hmode -0024 708c003c jam 0x3c ,core_usb_config -0025 58000bb3 setarg mem_usb_rxbuf_new -0026 67f10c03 store 2 ,core_usb_rx_saddr -0027 67f10c07 store 2 ,core_usb_rxptr -0028 58000bf7 setarg mem_usb_rxbuf_new_end -0029 67f10c05 store 2 ,core_usb_rx_eaddr -002a 20207192 branch usb_init + 16 +001b 20406fd3 call enable_authrom +001c 204071a1 call usb_init_param +001d 70061003 jam 0x03 ,mem_devicedesc + 17 +001e 708c0000 jam 0x00 ,core_usb_config +001f 20002710 nop 10000 +0020 708c1800 jam 0x00 ,core_usb_trig +0021 6ff10050 fetch 2 ,core_clkoff +0022 793ffe0a set0 clock_off_usb ,pdata +0023 67f10050 store 2 ,core_clkoff +0024 708c1100 jam 0x0 ,core_usb_hmode +0025 708c003c jam 0x3c ,core_usb_config +0026 58000bb3 setarg mem_usb_rxbuf_new +0027 67f10c03 store 2 ,core_usb_rx_saddr +0028 67f10c07 store 2 ,core_usb_rxptr +0029 58000bf7 setarg mem_usb_rxbuf_new_end +002a 67f10c05 store 2 ,core_usb_rx_eaddr +002b 20207192 branch usb_init + 16 p_g24_bind_data_parse_next: -002b 6fe0c52d fetch 1 ,mem_24g_rxdata_temp + 2 -002c c0550030 beq datatype_bind ,p_g24_bind_first_step -002d c02a803a beq datatype_config ,p_g24_bind_second_step -002e c011004a beq datatype_ok ,p_g24_bind_third_step -002f 202049c8 branch g24_bind_data_parse_next + 4 +002c 6fe0c52d fetch 1 ,mem_24g_rxdata_temp + 2 +002d c0550031 beq datatype_bind ,p_g24_bind_first_step +002e c02a803b beq datatype_config ,p_g24_bind_second_step +002f c011004b beq datatype_ok ,p_g24_bind_third_step +0030 202049c8 branch g24_bind_data_parse_next + 4 p_g24_bind_first_step: -0030 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -0031 c0008034 beq datatype_device1 ,p_g24_bind_first_step_device1 -0032 c0010037 beq datatype_device2 ,p_g24_bind_first_step_device2 -0033 20600000 rtn +0031 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 +0032 c0008035 beq datatype_device1 ,p_g24_bind_first_step_device1 +0033 c0010038 beq datatype_device2 ,p_g24_bind_first_step_device2 +0034 20600000 rtn p_g24_bind_first_step_device1: -0034 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -0035 247a0000 nrtn blank -0036 202049ce branch g24_bind_first_step_device1 +0035 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable +0036 247a0000 nrtn blank +0037 202049ce branch g24_bind_first_step_device1 p_g24_bind_first_step_device2: -0037 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -0038 247a0000 nrtn blank -0039 202049d4 branch g24_bind_first_step_device2 +0038 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable +0039 247a0000 nrtn blank +003a 202049d4 branch g24_bind_first_step_device2 p_g24_bind_second_step: -003a 6fe0c4f4 fetch 1 ,mem_24g_pair_switch -003b 203a0040 branch p_g24_bind_second_step_skip ,blank -003c 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 -003d 684a4437 fetcht 4 ,mem_24g_lap -003e 98467c00 isub temp ,null -003f 24628000 nrtn zero +003b 6fe0c4f4 fetch 1 ,mem_24g_pair_switch +003c 203a0041 branch p_g24_bind_second_step_skip ,blank +003d 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 +003e 684a4437 fetcht 4 ,mem_24g_lap +003f 98467c00 isub temp ,null +0040 24628000 nrtn zero p_g24_bind_second_step_skip: -0040 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -0041 c0008044 beq datatype_device1 ,p_g24_bind_second_step_device1 -0042 c0010047 beq datatype_device2 ,p_g24_bind_second_step_device2 -0043 20600000 rtn +0041 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 +0042 c0008045 beq datatype_device1 ,p_g24_bind_second_step_device1 +0043 c0010048 beq datatype_device2 ,p_g24_bind_second_step_device2 +0044 20600000 rtn p_g24_bind_second_step_device1: -0044 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -0045 247a0000 nrtn blank -0046 202049e1 branch g24_bind_second_step_device1 +0045 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable +0046 247a0000 nrtn blank +0047 202049e1 branch g24_bind_second_step_device1 p_g24_bind_second_step_device2: -0047 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -0048 247a0000 nrtn blank -0049 202049ec branch g24_bind_second_step_device2 +0048 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable +0049 247a0000 nrtn blank +004a 202049ec branch g24_bind_second_step_device2 p_g24_bind_third_step: -004a 6fe0c4f4 fetch 1 ,mem_24g_pair_switch -004b 203a0050 branch p_g24_bind_third_step_skip ,blank -004c 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 -004d 684a456f fetcht 4 ,mem_24g_transmitter_addr -004e 98467c00 isub temp ,null -004f 24628000 nrtn zero +004b 6fe0c4f4 fetch 1 ,mem_24g_pair_switch +004c 203a0051 branch p_g24_bind_third_step_skip ,blank +004d 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 +004e 684a456f fetcht 4 ,mem_24g_transmitter_addr +004f 98467c00 isub temp ,null +0050 24628000 nrtn zero p_g24_bind_third_step_skip: -0050 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -0051 c0008054 beq datatype_device1 ,p_g24_bind_third_step_device1 -0052 c001005b beq datatype_device2 ,p_g24_bind_third_step_device2 -0053 20600000 rtn +0051 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 +0052 c0008055 beq datatype_device1 ,p_g24_bind_third_step_device1 +0053 c001005c beq datatype_device2 ,p_g24_bind_third_step_device2 +0054 20600000 rtn p_g24_bind_third_step_device1: -0054 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -0055 247a0000 nrtn blank -0056 6fe0c518 fetch 1 ,mem_24g_device1_bind_step -0057 c0010059 beq 2 ,p_g24_bind_dvc1_step_success -0058 20600000 rtn +0055 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable +0056 247a0000 nrtn blank +0057 6fe0c518 fetch 1 ,mem_24g_device1_bind_step +0058 c001005a beq 2 ,p_g24_bind_dvc1_step_success +0059 20600000 rtn p_g24_bind_dvc1_step_success: -0059 7045d701 jam 1 ,mem_24g_device1_bind_disable -005a 20204a01 branch g24_bind_dvc1_step_success +005a 7045d701 jam 1 ,mem_24g_device1_bind_disable +005b 20204a01 branch g24_bind_dvc1_step_success p_g24_bind_third_step_device2: -005b 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -005c 247a0000 nrtn blank -005d 6fe0c519 fetch 1 ,mem_24g_device2_bind_step -005e c0800060 bne 0 ,p_g24_bind_dvc2_step_success -005f 20600000 rtn +005c 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable +005d 247a0000 nrtn blank +005e 6fe0c519 fetch 1 ,mem_24g_device2_bind_step +005f c0800061 bne 0 ,p_g24_bind_dvc2_step_success +0060 20600000 rtn p_g24_bind_dvc2_step_success: -0060 7045d801 jam 1 ,mem_24g_device2_bind_disable -0061 20204a0c branch g24_bind_dvc2_step_success +0061 7045d801 jam 1 ,mem_24g_device2_bind_disable +0062 20204a0c branch g24_bind_dvc2_step_success p_le_enable_phy_by_pdata: -0062 18427e00 copy temp ,pdata -0063 c2808065 bbit1 bit_le_2m_phy ,p_le_enable_2m -0064 20203d19 branch le_enable_phy_by_pdata + 3 +0063 18427e00 copy temp ,pdata +0064 c2808066 bbit1 bit_le_2m_phy ,p_le_enable_2m +0065 20203d19 branch le_enable_phy_by_pdata + 3 p_le_enable_2m: -0065 708a6d89 jam 0x89 ,core_rx_bq_cfg0 -0066 20203d1f branch le_enable_2m +0066 708a6d89 jam 0x89 ,core_rx_bq_cfg0 +0067 20203d1f branch le_enable_2m p_le_receive_rxon: -0067 20403d3c call le_prep -0068 c597806d bmark0 mark_ble_lr ,p_le_receive_nolr -0069 783cfc00 pulse dewhiten_code_calc -006a 2000001e nop 30 -006b 20403d3c call le_prep -006c 19699600 lshift3 timeup ,timeup +0068 20403d3c call le_prep +0069 c597806e bmark0 mark_ble_lr ,p_le_receive_nolr +006a 783cfc00 pulse dewhiten_code_calc +006b 2000001e nop 30 +006c 20403d3c call le_prep +006d 19699600 lshift3 timeup ,timeup p_le_receive_nolr: -006d 7856fc00 disable match -006e 7826fc00 enable decode_fec0 -006f 7830fc00 enable is_rx -0070 78507c00 disable is_tx -0071 19623600 copy timeup ,stop_watch -0072 37c18400 correlate null ,timeout -0073 20370076 branch p_le_receive_on_attempt ,attempt -0074 1b420400 copy clke ,temp -0075 604b000f storet 6 ,mem_sync_clke +006e 7856fc00 disable match +006f 7826fc00 enable decode_fec0 +0070 7830fc00 enable is_rx +0071 78507c00 disable is_tx +0072 19623600 copy timeup ,stop_watch +0073 37c18400 correlate null ,timeout +0074 20370077 branch p_le_receive_on_attempt ,attempt +0075 1b420400 copy clke ,temp +0076 604b000f storet 6 ,mem_sync_clke p_le_receive_on_attempt: -0076 242c3e75 nbranch le_unsync_end ,sync -0077 78287c00 enable swfine -0078 db604eab arg param_t_ifs_150us + param_20ms_init + param_sync_time_difference ,stop_watch -0079 6fe0c11d fetch 1 ,mem_system_clk -007a 9b6f8400 imul32 stop_watch ,temp -007b 9840b600 iadd temp ,stop_watch -007c 20203de9 branch le_receive_on_attempt + 6 +0077 242c3e75 nbranch le_unsync_end ,sync +0078 78287c00 enable swfine +0079 db604eab arg param_t_ifs_150us + param_20ms_init + param_sync_time_difference ,stop_watch +007a 6fe0c11d fetch 1 ,mem_system_clk +007b 9b6f8400 imul32 stop_watch ,temp +007c 9840b600 iadd temp ,stop_watch +007d 20203de9 branch le_receive_on_attempt + 6 p_connection_nosniff: -007d 70000600 jam 0 ,mem_current_context -007e 20203822 branch connection_nosniff +007e 70000600 jam 0 ,mem_current_context +007f 20203822 branch connection_nosniff p_connection_incontext: -007f 20403863 call context_search_insniff -0080 2422807d nbranch p_connection_nosniff ,zero -0081 2020381d branch connection_incontext + 3 +0080 20403863 call context_search_insniff +0081 2422807e nbranch p_connection_nosniff ,zero +0082 2020381d branch connection_incontext + 3 p_le_crc_fail_tx: -0082 20406f09 call ccm_ctrl_clr -0083 6fe08198 fetch 1 ,mem_le_rx_phy -0084 7d3e7e07 nsetflag ble_coded_info ,bit_le_coded_phy_s8 ,pdata -0085 67e08198 store 1 ,mem_le_rx_phy -0086 7846fc00 disable decode_fec0 -0087 20403925 call set_sync_on -0088 708a3d12 jam 0x12 ,core_syn_top_ctrl -0089 68488008 fetcht 1 ,mem_last_freq -008a 1840a202 add temp ,2 ,rega -008b 2020398e branch rf_tx_write_freq +0083 20406f09 call ccm_ctrl_clr +0084 6fe08198 fetch 1 ,mem_le_rx_phy +0085 7d3e7e07 nsetflag ble_coded_info ,bit_le_coded_phy_s8 ,pdata +0086 67e08198 store 1 ,mem_le_rx_phy +0087 7846fc00 disable decode_fec0 +0088 20403925 call set_sync_on +0089 708a3d12 jam 0x12 ,core_syn_top_ctrl +008a 68488008 fetcht 1 ,mem_last_freq +008b 1840a202 add temp ,2 ,rega +008c 2020398e branch rf_tx_write_freq p_le_transmit: -008c 20403d3c call le_prep -008d 20403d4b call le_tx_setfreq -008e 20406451 call rf_debug_tx_on_line -008f 79202a00 set1 txgfsk ,radio_ctrl -0090 782efc00 enable encode_fec0 -0091 78307c00 enable is_tx -0092 7850fc00 disable is_rx -0093 20403dc2 call le_wait_tx -0094 785d7c00 disable lr_s2en -0095 c517beff bmark1 mark_ble_lr ,le_transmit_lr -0096 c5168098 bmark1 mark_ble_2m ,p_le_transmit_2m -0097 20203ec8 branch le_transmit + 12 +008d 20403d3c call le_prep +008e 20403d4b call le_tx_setfreq +008f 20406451 call rf_debug_tx_on_line +0090 79202a00 set1 txgfsk ,radio_ctrl +0091 782efc00 enable encode_fec0 +0092 78307c00 enable is_tx +0093 7850fc00 disable is_rx +0094 20403dc2 call le_wait_tx +0095 785d7c00 disable lr_s2en +0096 c517beff bmark1 mark_ble_lr ,le_transmit_lr +0097 c5168099 bmark1 mark_ble_2m ,p_le_transmit_2m +0098 20203ec8 branch le_transmit + 12 p_le_transmit_2m: -0098 6f20c11d fetchr loopcnt ,1 ,mem_system_clk +0099 6f20c11d fetchr loopcnt ,1 ,mem_system_clk p_le_transmit_2m_dealy: -0099 20000001 nop 1 -009a c2000099 loop p_le_transmit_2m_dealy -009b 20203f15 branch le_transmit_2m_dealy + 2 +009a 20000001 nop 1 +009b c200009a loop p_le_transmit_2m_dealy +009c 20203f15 branch le_transmit_2m_dealy + 2 p_enable_adc: -009c 6a508a12 fetchr regb ,1 ,core_rf_ldo_cfg6 -009d 708a123d jam 0x3d ,core_rf_ldo_cfg6 -009e 708a11aa jam 0xaa ,core_rf_ldo_cfg5 -009f 708a0a0c jam 0x0c ,core_rf_ldo_en0 -00a0 6ff08a09 fetch 1 ,core_clkpll_cfg6 -00a1 79207e07 set1 7 ,pdata -00a2 67f08a09 store 1 ,core_clkpll_cfg6 -00a3 708a0b04 jam 0x04 ,core_rf_ldo_en1 -00a4 2000003c nop 60 -00a5 708a1600 jam 0 ,core_syn_en -00a6 708a1706 jam 6 ,core_rx_en0 -00a7 20406cb4 call read_adc_mode -00a8 67f08a97 store 1 ,core_gpadc_ctrl -00a9 20206ca7 branch enable_adc + 15 +009d 6a508a12 fetchr regb ,1 ,core_rf_ldo_cfg6 +009e 708a123d jam 0x3d ,core_rf_ldo_cfg6 +009f 708a11aa jam 0xaa ,core_rf_ldo_cfg5 +00a0 708a0a0c jam 0x0c ,core_rf_ldo_en0 +00a1 6ff08a09 fetch 1 ,core_clkpll_cfg6 +00a2 79207e07 set1 7 ,pdata +00a3 67f08a09 store 1 ,core_clkpll_cfg6 +00a4 708a0b04 jam 0x04 ,core_rf_ldo_en1 +00a5 2000003c nop 60 +00a6 708a1600 jam 0 ,core_syn_en +00a7 708a1706 jam 6 ,core_rx_en0 +00a8 20406cb4 call read_adc_mode +00a9 67f08a97 store 1 ,core_gpadc_ctrl +00aa 20206ca7 branch enable_adc + 15 org 0x3800 start: Index: program/patch.prog =================================================================== --- /branch/usb/usb_public_base/program/patch.prog (revision 203) +++ /branch/usb/usb_public_base/program/patch.prog (working copy) @@ -34,6 +34,10 @@ rtn wake jam HVIN_VIN_GREATER_THAN_4V2,mem_lpm_ctrl3 call lpm_write_sel_vdd + + //disable mode switch + jam 1,mem_24g_B_S_mode_switch_disable + branch dongle_init //watch dog enable Index: sched/dongle.dat =================================================================== --- /branch/usb/usb_public_base/sched/dongle.dat (revision 203) +++ /branch/usb/usb_public_base/sched/dongle.dat (working copy) @@ -33,7 +33,7 @@ #rf config -mem_24g_lap:36 27 13 30 06 13#low 4B used for 24g rxaddr +mem_24g_lap:39 28 13 30 06 13#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