Index: output/eeprom.dat =================================================================== --- /branch/usb/usb_public_125K/output/eeprom.dat (revision 358) +++ /branch/usb/usb_public_125K/output/eeprom.dat (working copy) @@ -2,48 +2,40 @@ 02 aa 55 -d2 +5a 04 c2 84 00 -0b +09 c0 00 00 -14 +12 c0 0a 80 -8f +71 c0 0b 80 -95 +77 c0 1b 00 -3e -c0 -1b -80 -51 +2a c0 5c 80 -59 +3c c0 60 80 -6e +51 c0 6a 80 -8a -c0 -31 -00 -21 +6c 20 20 3a @@ -55,31 +47,31 @@ c0 14 00 -98 +7a c0 1d 00 -bb +9d c0 1d 80 -cf +b1 c0 1e -81 -1c +80 +fe c0 20 80 -a1 +83 c0 22 -01 -11 +00 +f3 c0 40 00 -33 +1f 20 20 3a @@ -115,7 +107,7 @@ 20 40 00 -1d +1b 20 20 38 @@ -136,78 +128,6 @@ 20 3a c5 -58 -00 -52 -7c -67 -e1 -45 -23 -58 -00 -53 -5a -67 -e1 -45 -27 -58 -00 -00 -28 -67 -e1 -45 -29 -20 -20 -52 -4f -6f -e2 -45 -2f -68 -4a -45 -6f -98 -46 -7c -00 -20 -22 -80 -2d -20 -20 -53 -6b -6f -e0 -c5 -2e -c0 -01 -00 -30 -20 -20 -53 -6b -d8 -a0 -45 -2b -df -20 -00 -04 -20 -20 -75 -00 20 40 52 @@ -223,7 +143,7 @@ 20 40 00 -3b +27 6f e0 c5 @@ -252,10 +172,6 @@ 60 00 00 -20 -40 -00 -57 6f e0 87 @@ -315,7 +231,7 @@ c0 50 80 -4f +3a 20 20 52 @@ -328,38 +244,6 @@ 20 53 08 -6f -e0 -c5 -59 -c1 -80 -00 -00 -20 -40 -4a -f5 -6f -e0 -c5 -53 -24 -7a -00 -00 -20 -20 -4b -99 -58 -00 -00 -10 -20 -20 -6d -e1 20 40 6f @@ -371,7 +255,7 @@ 20 40 00 -6b +4e 70 06 10 @@ -493,13 +377,9 @@ 74 6c 20 -40 -00 -7c 20 -20 -74 -5f +00 +5e 6f f0 8c @@ -539,7 +419,7 @@ c0 08 00 -87 +69 20 20 3a @@ -563,7 +443,7 @@ c2 80 80 -8d +6f 20 20 3d @@ -771,7 +651,7 @@ 20 40 00 -c7 +a9 20 40 4a @@ -839,19 +719,19 @@ c0 55 00 -d5 +b7 c0 2a 80 -df +c1 c0 11 00 -ef +d1 c0 7f -81 -07 +80 +e9 20 60 00 @@ -863,11 +743,11 @@ c0 00 80 -d9 +bb c0 01 00 -dc +be 20 60 00 @@ -903,7 +783,7 @@ 20 3a 00 -e5 +c7 6f e2 45 @@ -927,11 +807,11 @@ c0 00 80 -e9 +cb c0 01 00 -ec +ce 20 60 00 @@ -967,7 +847,7 @@ 20 3a 00 -f5 +d7 6f e2 45 @@ -991,11 +871,11 @@ c0 00 80 -f9 +db c0 01 -01 00 +e2 20 60 00 @@ -1015,7 +895,7 @@ c0 01 00 -fe +e0 20 60 00 @@ -1042,8 +922,8 @@ 19 c0 80 -01 -05 +00 +e7 20 60 00 @@ -1062,12 +942,12 @@ 2e c0 00 -81 -0b +80 +ed c0 01 -01 -0e +00 +f0 20 60 00 @@ -1106,8 +986,8 @@ 00 20 40 -01 -15 +00 +f7 20 20 4b @@ -1147,7 +1027,7 @@ c0 00 81 -21 +03 c0 01 4a @@ -1155,7 +1035,7 @@ c0 7f 81 -32 +14 20 20 4a @@ -1191,7 +1071,7 @@ c0 00 81 -2a +0c 20 20 4a @@ -1234,10 +1114,10 @@ 30 20 20 -01 -07 -ef -d1 +00 +e9 +2b +2b aa 55 40 @@ -1250,13 +1130,13 @@ 00 00 00 -c0 +40 +00 00 00 00 00 00 -04 00 00 00 @@ -1335,7 +1215,7 @@ 00 eb 43 -01 +00 aa 55 01 @@ -1384,8 +1264,8 @@ 37 44 77 -68 -18 +46 +13 ad 06 13 @@ -1523,7 +1403,7 @@ aa aa 55 -e3 +37 3f -00 -a3 +b9 +16 Index: output/program.lis =================================================================== --- /branch/usb/usb_public_125K/output/program.lis (revision 358) +++ /branch/usb/usb_public_125K/output/program.lis (working copy) @@ -1,413 +1,369 @@ include "bt_format " org 0x0000 -0000 c284000b bbit1 8 ,pf_patch_ext -0001 c0000014 beq patch00_0 ,p_soft_reset -0002 c00a808f beq patch02_5 ,p_set_freq_tx -0003 c00b8095 beq patch02_7 ,p_set_tx_power_8db -0004 c01b003e beq patch06_6 ,p_dongle_usb_dispatch -0005 c01b8051 beq patch06_7 ,p_dongle_work_mode_auto -0006 c05c8059 beq patch17_1 ,p_usb_init -0007 c060806e beq patch18_1 ,p_usb_tx -0008 c06a808a beq patch1a_5 ,p_le_enable_phy_by_pdata -0009 c0310021 beq patch0c_2 ,p_app_init -000a 20203aba branch assert +0000 c2840009 bbit1 8 ,pf_patch_ext +0001 c0000012 beq patch00_0 ,p_soft_reset +0002 c00a8071 beq patch02_5 ,p_set_freq_tx +0003 c00b8077 beq patch02_7 ,p_set_tx_power_8db +0004 c01b002a beq patch06_6 ,p_dongle_usb_dispatch +0005 c05c803c beq patch17_1 ,p_usb_init +0006 c0608051 beq patch18_1 ,p_usb_tx +0007 c06a806c beq patch1a_5 ,p_le_enable_phy_by_pdata +0008 20203aba branch assert pf_patch_ext: -000b c17f8000 rtneq patch3f_7 -000c c0140098 beq patch25_0 ,p_g24_receive_skip_end -000d c01d00bb beq patch27_2 ,p_g24_bind_data_process -000e c01d80cf beq patch27_3 ,p_g24_bind_data_parse_next -000f c01e811c beq patch27_5 ,p_g24_receive_packet_start_next -0010 c02080a1 beq patch28_1 ,p_g24_mode_switch_bind_search -0011 c0220111 beq patch28_4 ,p_g24_search_mode_auto -0012 c0400033 beq patch30_0 ,p_dongle_default_init -0013 20203aba branch assert +0009 c17f8000 rtneq patch3f_7 +000a c014007a beq patch25_0 ,p_g24_receive_skip_end +000b c01d009d beq patch27_2 ,p_g24_bind_data_process +000c c01d80b1 beq patch27_3 ,p_g24_bind_data_parse_next +000d c01e80fe beq patch27_5 ,p_g24_receive_packet_start_next +000e c0208083 beq patch28_1 ,p_g24_mode_switch_bind_search +000f c02200f3 beq patch28_4 ,p_g24_search_mode_auto +0010 c040001f beq patch30_0 ,p_dongle_default_init +0011 20203aba branch assert p_soft_reset: -0014 20800000 clear_stack -0015 6fe240cc fetch 4 ,mem_lpm_ctrl3 -0016 67f2004c store 4 ,core_lpm_reg -0017 20403c49 call lpm_write_ctrl3 -0018 20404da6 call app_param_init -0019 20403a0e call initialize_radio -001a 20406a00 call iic_init_360khz -001b 2040001d call p_init_param -001c 20203807 branch soft_reset + 6 +0012 20800000 clear_stack +0013 6fe240cc fetch 4 ,mem_lpm_ctrl3 +0014 67f2004c store 4 ,core_lpm_reg +0015 20403c49 call lpm_write_ctrl3 +0016 20404da6 call app_param_init +0017 20403a0e call initialize_radio +0018 20406a00 call iic_init_360khz +0019 2040001b call p_init_param +001a 20203807 branch soft_reset + 6 p_init_param: -001d 58000000 setarg 0 -001e 67e40000 store 8 ,mem_le_adv_transmit -001f e7e30005 istore 6 ,contw -0020 20203ac5 branch init_param + 2 - -p_app_init: - -p_dongle_init: -0021 5800527c setarg dongle_dispatch -0022 67e14523 store 2 ,mem_cb_24g_receive_process -0023 5800535a setarg dongle_g24_mouse -0024 67e14527 store 2 ,mem_cb_24g_data_device1 -0025 58000028 setarg p_dongle_g24_kb -0026 67e14529 store 2 ,mem_cb_24g_data_device2 -0027 2020524f branch dongle_init + 6 - -p_dongle_g24_kb: -0028 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 -0029 684a456f fetcht 4 ,mem_24g_transmitter_addr -002a 98467c00 isub temp ,null -002b 2022802d branch p_g24_kb_data_check ,zero -002c 2020536b branch dongle_g24_kb - -p_g24_kb_data_check: -002d 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -002e c0010030 beq 0x02 ,p_g24_rx_buff_clear -002f 2020536b branch dongle_g24_kb - -p_g24_rx_buff_clear: -0030 d8a0452b arg mem_24g_rxdata_temp ,contw -0031 df200004 arg 4 ,loopcnt -0032 20207500 branch memset0 +001b 58000000 setarg 0 +001c 67e40000 store 8 ,mem_le_adv_transmit +001d e7e30005 istore 6 ,contw +001e 20203ac5 branch init_param + 2 p_dongle_default_init: -0033 20405255 call dongle_default_init + 1 -0034 70451694 jam tx_power_f20db ,mem_24g_pair_tx_power -0035 70451000 jam off ,mem_24g_disable_fec1 -0036 2040003b call p_g24_enable_coded_s8 -0037 6fe0c5ab fetch 1 ,mem_dg_sys_config -0038 c4000000 rtnbit0 dg_enable_new_revision -0039 70451001 jam on ,mem_24g_disable_fec1 -003a 2020492e branch g24_enable_2m +001f 20405255 call dongle_default_init + 1 +0020 70451694 jam tx_power_f20db ,mem_24g_pair_tx_power +0021 70451000 jam off ,mem_24g_disable_fec1 +0022 20400027 call p_g24_enable_coded_s8 +0023 6fe0c5ab fetch 1 ,mem_dg_sys_config +0024 c4000000 rtnbit0 dg_enable_new_revision +0025 70451001 jam on ,mem_24g_disable_fec1 +0026 2020492e branch g24_enable_2m p_g24_enable_coded_s8: -003b 7044fd84 jam 0x84 ,mem_24g_rx_phy -003c 7044fe84 jam 0x84 ,mem_24g_tx_phy -003d 20600000 rtn +0027 7044fd84 jam 0x84 ,mem_24g_rx_phy +0028 7044fe84 jam 0x84 ,mem_24g_tx_phy +0029 20600000 rtn p_dongle_usb_dispatch: -003e 20400057 call p_wdt_kick -003f 6fe08755 fetch 1 ,mem_usb_remote_wakeup -0040 205a533b call dongle_clear_pc_sleep_flag ,blank -0041 20407176 call usb_isr -0042 6fe0874b fetch 1 ,mem_usb0_get_set_report -0043 207a0000 rtn blank -0044 70074b00 jam 0 ,mem_usb0_get_set_report -0045 6fe10749 fetch 2 ,mem_usb_setup_bvalue_temp -0046 d84002ba arg pc_set_report ,temp -0047 98467c00 isub temp ,null -0048 24628000 nrtn zero -0049 6fe086c9 fetch 1 ,mem_usb0_set_report_data -004a c1dd0000 rtnne pc_report_id -004b 6fe086ca fetch 1 ,mem_usb0_set_report_data + 1 -004c c0505302 beq command_mode ,dongle_dispose_cmd_mode -004d c050804f beq command_bind ,p_dongle_dispose_cmd_bind -004e 202052fd branch dongle_usb_dispatch_check_cmd + 3 +002a 6fe08755 fetch 1 ,mem_usb_remote_wakeup +002b 205a533b call dongle_clear_pc_sleep_flag ,blank +002c 20407176 call usb_isr +002d 6fe0874b fetch 1 ,mem_usb0_get_set_report +002e 207a0000 rtn blank +002f 70074b00 jam 0 ,mem_usb0_get_set_report +0030 6fe10749 fetch 2 ,mem_usb_setup_bvalue_temp +0031 d84002ba arg pc_set_report ,temp +0032 98467c00 isub temp ,null +0033 24628000 nrtn zero +0034 6fe086c9 fetch 1 ,mem_usb0_set_report_data +0035 c1dd0000 rtnne pc_report_id +0036 6fe086ca fetch 1 ,mem_usb0_set_report_data + 1 +0037 c0505302 beq command_mode ,dongle_dispose_cmd_mode +0038 c050803a beq command_bind ,p_dongle_dispose_cmd_bind +0039 202052fd branch dongle_usb_dispatch_check_cmd + 3 p_dongle_dispose_cmd_bind: -004f 7045d800 jam 0 ,mem_24g_device2_bind_disable -0050 20205308 branch dongle_dispose_cmd_bind - -p_dongle_work_mode_auto: -0051 6fe0c559 fetch 1 ,mem_24g_work_mode -0052 c1800000 rtnne dongle_work -0053 20404af5 call g24_work_mode_start -0054 6fe0c553 fetch 1 ,mem_24g_pair_mode -0055 247a0000 nrtn blank -0056 20204b99 branch g24_nodata_process - -p_wdt_kick: -0057 58000010 setarg 16 -0058 20206de1 branch wdt_init_config +003a 7045d800 jam 0 ,mem_24g_device2_bind_disable +003b 20205308 branch dongle_dispose_cmd_bind p_usb_init: -0059 20406fd3 call enable_authrom -005a 204071a1 call usb_init_param -005b 2040006b call p_usb_manufacturer_update -005c 70061003 jam 0x03 ,mem_devicedesc + 17 -005d 708c0000 jam 0x00 ,core_usb_config -005e 20002710 nop 10000 -005f 708c1800 jam 0x00 ,core_usb_trig -0060 6ff10050 fetch 2 ,core_clkoff -0061 793ffe0a set0 clock_off_usb ,pdata -0062 67f10050 store 2 ,core_clkoff -0063 708c1100 jam 0x0 ,core_usb_hmode -0064 708c003c jam 0x3c ,core_usb_config -0065 58000bb3 setarg mem_usb_rxbuf_new -0066 67f10c03 store 2 ,core_usb_rx_saddr -0067 67f10c07 store 2 ,core_usb_rxptr -0068 58000bf7 setarg mem_usb_rxbuf_new_end -0069 67f10c05 store 2 ,core_usb_rx_eaddr -006a 20207192 branch usb_init + 16 +003c 20406fd3 call enable_authrom +003d 204071a1 call usb_init_param +003e 2040004e call p_usb_manufacturer_update +003f 70061003 jam 0x03 ,mem_devicedesc + 17 +0040 708c0000 jam 0x00 ,core_usb_config +0041 20002710 nop 10000 +0042 708c1800 jam 0x00 ,core_usb_trig +0043 6ff10050 fetch 2 ,core_clkoff +0044 793ffe0a set0 clock_off_usb ,pdata +0045 67f10050 store 2 ,core_clkoff +0046 708c1100 jam 0x0 ,core_usb_hmode +0047 708c003c jam 0x3c ,core_usb_config +0048 58000bb3 setarg mem_usb_rxbuf_new +0049 67f10c03 store 2 ,core_usb_rx_saddr +004a 67f10c07 store 2 ,core_usb_rxptr +004b 58000bf7 setarg mem_usb_rxbuf_new_end +004c 67f10c05 store 2 ,core_usb_rx_eaddr +004d 20207192 branch usb_init + 16 p_usb_manufacturer_update: -006b 6fe345e5 fetch 6 ,mem_usb_manufacturer_info -006c 67e30653 store 6 ,mem_string1 -006d 20600000 rtn +004e 6fe345e5 fetch 6 ,mem_usb_manufacturer_info +004f 67e30653 store 6 ,mem_string1 +0050 20600000 rtn p_usb_tx: -006e 6fe08761 fetch 1 ,mem_usb_tx_enable -006f 207a0000 rtn blank -0070 6ff08c24 fetch 1 ,core_usb_txbusy -0071 1fe17e0f and_into 0x0f ,pdata -0072 243a7496 nbranch usb_inwake_state_tx_dispose ,blank -0073 6fe08762 fetch 1 ,mem_usb_device_enumeration_endflag -0074 203a746c branch usb_tx_fifo_release ,blank -0075 6fe08754 fetch 1 ,mem_usb_state -0076 c001f4a6 beq usb_sleep ,usb_windows_wakeup -0077 c081746c bne usb_connected ,usb_tx_fifo_release -0078 6fe08756 fetch 1 ,mem_usb_clear_remote_wakeup -0079 243a746c nbranch usb_tx_fifo_release ,blank -007a 2040007c call p_usb_tx_data_ep1 -007b 2020745f branch usb_tx_data_ep2 +0051 6fe08761 fetch 1 ,mem_usb_tx_enable +0052 207a0000 rtn blank +0053 6ff08c24 fetch 1 ,core_usb_txbusy +0054 1fe17e0f and_into 0x0f ,pdata +0055 243a7496 nbranch usb_inwake_state_tx_dispose ,blank +0056 6fe08762 fetch 1 ,mem_usb_device_enumeration_endflag +0057 203a746c branch usb_tx_fifo_release ,blank +0058 6fe08754 fetch 1 ,mem_usb_state +0059 c001f4a6 beq usb_sleep ,usb_windows_wakeup +005a c081746c bne usb_connected ,usb_tx_fifo_release +005b 6fe08756 fetch 1 ,mem_usb_clear_remote_wakeup +005c 243a746c nbranch usb_tx_fifo_release ,blank +005d 2020005e branch p_usb_tx_data_ep1 p_usb_tx_data_ep1: -007c 6ff08c24 fetch 1 ,core_usb_txbusy -007d c3808000 rtnbit1 1 -007e 6fe08761 fetch 1 ,mem_usb_tx_enable -007f c4008000 rtnbit0 1 -0080 6fe08761 fetch 1 ,mem_usb_tx_enable -0081 793ffe01 set0 1 ,pdata -0082 67e08761 store 1 ,mem_usb_tx_enable -0083 6fe0875f fetch 1 ,mem_usb_ep1_data -0084 207a0000 rtn blank -0085 c0080087 beq usb_ep1_kb ,p_usb_tx_kb_normal_data -0086 20203aba branch assert +005e 6ff08c24 fetch 1 ,core_usb_txbusy +005f c3808000 rtnbit1 1 +0060 6fe08761 fetch 1 ,mem_usb_tx_enable +0061 c4008000 rtnbit0 1 +0062 6fe08761 fetch 1 ,mem_usb_tx_enable +0063 793ffe01 set0 1 ,pdata +0064 67e08761 store 1 ,mem_usb_tx_enable +0065 6fe0875f fetch 1 ,mem_usb_ep1_data +0066 207a0000 rtn blank +0067 c0080069 beq usb_ep1_kb ,p_usb_tx_kb_normal_data +0068 20203aba branch assert p_usb_tx_kb_normal_data: -0087 58000000 setarg 0 -0088 67e2077b store 4 ,mem_usb_kb_data + 4 -0089 2020748e branch usb_tx_kb_normal_data +0069 58000000 setarg 0 +006a 67e2077b store 4 ,mem_usb_kb_data + 4 +006b 2020748e branch usb_tx_kb_normal_data p_le_enable_phy_by_pdata: -008a 18427e00 copy temp ,pdata -008b c280808d bbit1 bit_le_2m_phy ,p_le_enable_2m -008c 20203d19 branch le_enable_phy_by_pdata + 3 +006c 18427e00 copy temp ,pdata +006d c280806f bbit1 bit_le_2m_phy ,p_le_enable_2m +006e 20203d19 branch le_enable_phy_by_pdata + 3 p_le_enable_2m: -008d 708a6d89 jam 0x89 ,core_rx_bq_cfg0 -008e 20203d1f branch le_enable_2m +006f 708a6d89 jam 0x89 ,core_rx_bq_cfg0 +0070 20203d1f branch le_enable_2m p_set_freq_tx: -008f 708a3d12 jam 0x12 ,core_syn_top_ctrl -0090 60488008 storet 1 ,mem_last_freq -0091 1840a202 add temp ,2 ,rega -0092 2040398e call rf_tx_write_freq -0093 200003c0 nop 0x3c0 -0094 202039cf branch txon +0071 708a3d12 jam 0x12 ,core_syn_top_ctrl +0072 60488008 storet 1 ,mem_last_freq +0073 1840a202 add temp ,2 ,rega +0074 2040398e call rf_tx_write_freq +0075 200003c0 nop 0x3c0 +0076 202039cf branch txon p_set_tx_power_8db: -0095 708a39ab jam 0xab ,core_tx_pwr_ctrl0 -0096 708a3a0f jam 0x0f ,core_tx_pwr_ctrl1 -0097 202039f3 branch set_rf_ldo_cfg89_2 +0077 708a39ab jam 0xab ,core_tx_pwr_ctrl0 +0078 708a3a0f jam 0x0f ,core_tx_pwr_ctrl1 +0079 202039f3 branch set_rf_ldo_cfg89_2 p_g24_receive_skip_end: -0098 6fe0c5ab fetch 1 ,mem_dg_sys_config -0099 c300481c bbit0 dg_enable_new_revision ,g24_receive_skip_end -009a 2000012c nop 300 -009b 6fe0c43e fetch 1 ,mem_24g_rxbuf + 1 -009c 79207e00 set1 bit_ack_24g ,pdata -009d 67e0c43e store 1 ,mem_24g_rxbuf + 1 -009e 20404a3b call g24_ackpayload_prep -009f 2040488f call g24_transmit_prep -00a0 2020483f branch g24_transmit +007a 6fe0c5ab fetch 1 ,mem_dg_sys_config +007b c300481c bbit0 dg_enable_new_revision ,g24_receive_skip_end +007c 2000012c nop 300 +007d 6fe0c43e fetch 1 ,mem_24g_rxbuf + 1 +007e 79207e00 set1 bit_ack_24g ,pdata +007f 67e0c43e store 1 ,mem_24g_rxbuf + 1 +0080 20404a3b call g24_ackpayload_prep +0081 2040488f call g24_transmit_prep +0082 2020483f branch g24_transmit p_g24_mode_switch_bind_search: -00a1 6fe0c559 fetch 1 ,mem_24g_work_mode -00a2 c1000000 rtneq dongle_work -00a3 6fe0c56d fetch 1 ,mem_24g_b_s_mode_switch_disable -00a4 247a0000 nrtn blank -00a5 6fe0c56b fetch 1 ,mem_24g_mode_b_s_switch_exit -00a6 247a0000 nrtn blank -00a7 6fe0c567 fetch 1 ,mem_24g_mode_b_s_switch -00a8 207a0000 rtn blank -00a9 6fe0c56e fetch 1 ,mem_24g_bind_device_living -00aa 2fe00603 compare 3 ,pdata ,3 -00ab 2020cadc branch g24_mode_b_s_switch_exit ,true -00ac 204048ef call g24_timer_check -00ad 24740000 nrtn user -00ae 6fe14569 fetch 2 ,mem_24g_mode_b_s_switch_cnt -00af 1fe0fe01 increase 1 ,pdata -00b0 67e14569 store 2 ,mem_24g_mode_b_s_switch_cnt -00b1 d84007d0 arg 0x7d0 ,temp -00b2 98467c00 isub temp ,null -00b3 20214adc branch g24_mode_b_s_switch_exit ,positive -00b4 6fe0c56c fetch 1 ,mem_24g_b_s_time_slice -00b5 1fe0fe01 increase 1 ,pdata -00b6 1fe17e01 and_into 1 ,pdata -00b7 67e0c56c store 1 ,mem_24g_b_s_time_slice -00b8 c0004ba3 beq 0 ,g24_search_mode_enable -00b9 c000c99f beq 1 ,g24_bind_mode_enable -00ba 20600000 rtn +0083 6fe0c559 fetch 1 ,mem_24g_work_mode +0084 c1000000 rtneq dongle_work +0085 6fe0c56d fetch 1 ,mem_24g_b_s_mode_switch_disable +0086 247a0000 nrtn blank +0087 6fe0c56b fetch 1 ,mem_24g_mode_b_s_switch_exit +0088 247a0000 nrtn blank +0089 6fe0c567 fetch 1 ,mem_24g_mode_b_s_switch +008a 207a0000 rtn blank +008b 6fe0c56e fetch 1 ,mem_24g_bind_device_living +008c 2fe00603 compare 3 ,pdata ,3 +008d 2020cadc branch g24_mode_b_s_switch_exit ,true +008e 204048ef call g24_timer_check +008f 24740000 nrtn user +0090 6fe14569 fetch 2 ,mem_24g_mode_b_s_switch_cnt +0091 1fe0fe01 increase 1 ,pdata +0092 67e14569 store 2 ,mem_24g_mode_b_s_switch_cnt +0093 d84007d0 arg 0x7d0 ,temp +0094 98467c00 isub temp ,null +0095 20214adc branch g24_mode_b_s_switch_exit ,positive +0096 6fe0c56c fetch 1 ,mem_24g_b_s_time_slice +0097 1fe0fe01 increase 1 ,pdata +0098 1fe17e01 and_into 1 ,pdata +0099 67e0c56c store 1 ,mem_24g_b_s_time_slice +009a c0004ba3 beq 0 ,g24_search_mode_enable +009b c000c99f beq 1 ,g24_bind_mode_enable +009c 20600000 rtn p_g24_bind_data_process: -00bb 20404a54 call g24_rx_interrupt_clear -00bc 204047ce call g24_receive_packet -00bd 2437ca54 nbranch g24_rx_interrupt_clear ,user3 -00be 204049bf call g24_bind_data_parse -00bf 204000c7 call p_g24_bind_transmit_ack -00c0 20404a2e call g24_bind_device_status_check -00c1 204053c3 call dongle_kb_bind_soft_reset -00c2 6fe0c4f4 fetch 1 ,mem_24g_pair_switch -00c3 207a0000 rtn blank -00c4 6fe2456f fetch 4 ,mem_24g_transmitter_addr -00c5 207a0000 rtn blank -00c6 202048e0 branch g24_update_addr_and_synccrc8 +009d 20404a54 call g24_rx_interrupt_clear +009e 204047ce call g24_receive_packet +009f 2437ca54 nbranch g24_rx_interrupt_clear ,user3 +00a0 204049bf call g24_bind_data_parse +00a1 204000a9 call p_g24_bind_transmit_ack +00a2 20404a2e call g24_bind_device_status_check +00a3 204053c3 call dongle_kb_bind_soft_reset +00a4 6fe0c4f4 fetch 1 ,mem_24g_pair_switch +00a5 207a0000 rtn blank +00a6 6fe2456f fetch 4 ,mem_24g_transmitter_addr +00a7 207a0000 rtn blank +00a8 202048e0 branch g24_update_addr_and_synccrc8 p_g24_bind_transmit_ack: -00c7 6fe0c43d fetch 1 ,mem_24g_rxbuf -00c8 67e0c4cf store 1 ,mem_24g_data_type -00c9 204048be call g24_read_len_pid_crc -00ca 20404a3b call g24_ackpayload_prep -00cb 2437c837 nbranch g24_end_of_packet ,user3 -00cc 2040488f call g24_transmit_prep -00cd 2040483f call g24_transmit -00ce 20204837 branch g24_end_of_packet +00a9 6fe0c43d fetch 1 ,mem_24g_rxbuf +00aa 67e0c4cf store 1 ,mem_24g_data_type +00ab 204048be call g24_read_len_pid_crc +00ac 20404a3b call g24_ackpayload_prep +00ad 2437c837 nbranch g24_end_of_packet ,user3 +00ae 2040488f call g24_transmit_prep +00af 2040483f call g24_transmit +00b0 20204837 branch g24_end_of_packet p_g24_bind_data_parse_next: -00cf 6fe0c52d fetch 1 ,mem_24g_rxdata_temp + 2 -00d0 c05500d5 beq datatype_bind ,p_g24_bind_first_step -00d1 c02a80df beq datatype_config ,p_g24_bind_second_step -00d2 c01100ef beq datatype_ok ,p_g24_bind_third_step -00d3 c07f8107 beq datatype_attemp ,p_g24_data_attemp -00d4 20600000 rtn +00b1 6fe0c52d fetch 1 ,mem_24g_rxdata_temp + 2 +00b2 c05500b7 beq datatype_bind ,p_g24_bind_first_step +00b3 c02a80c1 beq datatype_config ,p_g24_bind_second_step +00b4 c01100d1 beq datatype_ok ,p_g24_bind_third_step +00b5 c07f80e9 beq datatype_attemp ,p_g24_data_attemp +00b6 20600000 rtn p_g24_bind_first_step: -00d5 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -00d6 c00080d9 beq datatype_device1 ,p_g24_bind_first_step_device1 -00d7 c00100dc beq datatype_device2 ,p_g24_bind_first_step_device2 -00d8 20600000 rtn +00b7 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 +00b8 c00080bb beq datatype_device1 ,p_g24_bind_first_step_device1 +00b9 c00100be beq datatype_device2 ,p_g24_bind_first_step_device2 +00ba 20600000 rtn p_g24_bind_first_step_device1: -00d9 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -00da 247a0000 nrtn blank -00db 202049ce branch g24_bind_first_step_device1 +00bb 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable +00bc 247a0000 nrtn blank +00bd 202049ce branch g24_bind_first_step_device1 p_g24_bind_first_step_device2: -00dc 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -00dd 247a0000 nrtn blank -00de 202049d4 branch g24_bind_first_step_device2 +00be 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable +00bf 247a0000 nrtn blank +00c0 202049d4 branch g24_bind_first_step_device2 p_g24_bind_second_step: -00df 6fe0c4f4 fetch 1 ,mem_24g_pair_switch -00e0 203a00e5 branch p_g24_bind_second_step_skip ,blank -00e1 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 -00e2 684a4437 fetcht 4 ,mem_24g_lap -00e3 98467c00 isub temp ,null -00e4 24628000 nrtn zero +00c1 6fe0c4f4 fetch 1 ,mem_24g_pair_switch +00c2 203a00c7 branch p_g24_bind_second_step_skip ,blank +00c3 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 +00c4 684a4437 fetcht 4 ,mem_24g_lap +00c5 98467c00 isub temp ,null +00c6 24628000 nrtn zero p_g24_bind_second_step_skip: -00e5 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -00e6 c00080e9 beq datatype_device1 ,p_g24_bind_second_step_device1 -00e7 c00100ec beq datatype_device2 ,p_g24_bind_second_step_device2 -00e8 20600000 rtn +00c7 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 +00c8 c00080cb beq datatype_device1 ,p_g24_bind_second_step_device1 +00c9 c00100ce beq datatype_device2 ,p_g24_bind_second_step_device2 +00ca 20600000 rtn p_g24_bind_second_step_device1: -00e9 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -00ea 247a0000 nrtn blank -00eb 202049e1 branch g24_bind_second_step_device1 +00cb 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable +00cc 247a0000 nrtn blank +00cd 202049e1 branch g24_bind_second_step_device1 p_g24_bind_second_step_device2: -00ec 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -00ed 247a0000 nrtn blank -00ee 202049ec branch g24_bind_second_step_device2 +00ce 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable +00cf 247a0000 nrtn blank +00d0 202049ec branch g24_bind_second_step_device2 p_g24_bind_third_step: -00ef 6fe0c4f4 fetch 1 ,mem_24g_pair_switch -00f0 203a00f5 branch p_g24_bind_third_step_skip ,blank -00f1 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 -00f2 684a456f fetcht 4 ,mem_24g_transmitter_addr -00f3 98467c00 isub temp ,null -00f4 24628000 nrtn zero +00d1 6fe0c4f4 fetch 1 ,mem_24g_pair_switch +00d2 203a00d7 branch p_g24_bind_third_step_skip ,blank +00d3 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 +00d4 684a456f fetcht 4 ,mem_24g_transmitter_addr +00d5 98467c00 isub temp ,null +00d6 24628000 nrtn zero p_g24_bind_third_step_skip: -00f5 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -00f6 c00080f9 beq datatype_device1 ,p_g24_bind_third_step_device1 -00f7 c0010100 beq datatype_device2 ,p_g24_bind_third_step_device2 -00f8 20600000 rtn +00d7 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 +00d8 c00080db beq datatype_device1 ,p_g24_bind_third_step_device1 +00d9 c00100e2 beq datatype_device2 ,p_g24_bind_third_step_device2 +00da 20600000 rtn p_g24_bind_third_step_device1: -00f9 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -00fa 247a0000 nrtn blank -00fb 6fe0c518 fetch 1 ,mem_24g_device1_bind_step -00fc c00100fe beq 2 ,p_g24_bind_dvc1_step_success -00fd 20600000 rtn +00db 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable +00dc 247a0000 nrtn blank +00dd 6fe0c518 fetch 1 ,mem_24g_device1_bind_step +00de c00100e0 beq 2 ,p_g24_bind_dvc1_step_success +00df 20600000 rtn p_g24_bind_dvc1_step_success: -00fe 7045d701 jam 1 ,mem_24g_device1_bind_disable -00ff 20204a02 branch g24_bind_dvc1_step_success + 1 +00e0 7045d701 jam 1 ,mem_24g_device1_bind_disable +00e1 20204a02 branch g24_bind_dvc1_step_success + 1 p_g24_bind_third_step_device2: -0100 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -0101 247a0000 nrtn blank -0102 6fe0c519 fetch 1 ,mem_24g_device2_bind_step -0103 c0800105 bne 0 ,p_g24_bind_dvc2_step_success -0104 20600000 rtn +00e2 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable +00e3 247a0000 nrtn blank +00e4 6fe0c519 fetch 1 ,mem_24g_device2_bind_step +00e5 c08000e7 bne 0 ,p_g24_bind_dvc2_step_success +00e6 20600000 rtn p_g24_bind_dvc2_step_success: -0105 7045d801 jam 1 ,mem_24g_device2_bind_disable -0106 20204a0d branch g24_bind_dvc2_step_success + 1 +00e7 7045d801 jam 1 ,mem_24g_device2_bind_disable +00e8 20204a0d branch g24_bind_dvc2_step_success + 1 p_g24_data_attemp: -0107 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -0108 c000810b beq datatype_device1 ,p_g24_data_attemp_device1 -0109 c001010e beq datatype_device2 ,p_g24_data_attemp_device2 -010a 20600000 rtn +00e9 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 +00ea c00080ed beq datatype_device1 ,p_g24_data_attemp_device1 +00eb c00100f0 beq datatype_device2 ,p_g24_data_attemp_device2 +00ec 20600000 rtn p_g24_data_attemp_device1: -010b 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -010c 247a0000 nrtn blank -010d 20204c24 branch g24_data_attemp_device1 +00ed 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable +00ee 247a0000 nrtn blank +00ef 20204c24 branch g24_data_attemp_device1 p_g24_data_attemp_device2: -010e 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -010f 247a0000 nrtn blank -0110 20204c28 branch g24_data_attemp_device2 +00f0 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable +00f1 247a0000 nrtn blank +00f2 20204c28 branch g24_data_attemp_device2 p_g24_search_mode_auto: -0111 6fe0c559 fetch 1 ,mem_24g_work_mode -0112 c1838000 rtnne dongle_search -0113 20400115 call p_g24_search_mode_init -0114 20204b1b branch g24_search_mode_auto + 4 +00f3 6fe0c559 fetch 1 ,mem_24g_work_mode +00f4 c1838000 rtnne dongle_search +00f5 204000f7 call p_g24_search_mode_init +00f6 20204b1b branch g24_search_mode_auto + 4 p_g24_search_mode_init: -0115 6fe0c558 fetch 1 ,mem_24g_mode_init -0116 c3838000 rtnbit1 dongle_search -0117 79207e07 set1 dongle_search ,pdata -0118 67e0c558 store 1 ,mem_24g_mode_init -0119 6fe0c566 fetch 1 ,mem_tx_power_temp -011a 67e0c116 store 1 ,mem_tx_power -011b 20204b0b branch g24_search_mode_init + 4 +00f7 6fe0c558 fetch 1 ,mem_24g_mode_init +00f8 c3838000 rtnbit1 dongle_search +00f9 79207e07 set1 dongle_search ,pdata +00fa 67e0c558 store 1 ,mem_24g_mode_init +00fb 6fe0c566 fetch 1 ,mem_tx_power_temp +00fc 67e0c116 store 1 ,mem_tx_power +00fd 20204b0b branch g24_search_mode_init + 4 p_g24_receive_packet_start_next: -011c 6fe0c52d fetch 1 ,mem_24g_rxdata_temp + 2 -011d c0008121 beq datatype_device1 ,p_g24_data_device1 -011e c0014a69 beq datatype_device2 ,g24_data_device2 -011f c07f8132 beq datatype_attemp ,p_g24_data_receive_attemp -0120 20204a54 branch g24_rx_interrupt_clear +00fe 6fe0c52d fetch 1 ,mem_24g_rxdata_temp + 2 +00ff c0008103 beq datatype_device1 ,p_g24_data_device1 +0100 c0014a69 beq datatype_device2 ,g24_data_device2 +0101 c07f8114 beq datatype_attemp ,p_g24_data_receive_attemp +0102 20204a54 branch g24_rx_interrupt_clear p_g24_data_device1: -0121 20404a22 call g24_binding_dvc1_living -0122 20404bbd call g24_ch_timer_reinit -0123 6fe0c54d fetch 1 ,mem_24g_abort_packet -0124 6848c52b fetcht 1 ,mem_24g_rxdata_temp -0125 284ffe03 isolate1 bit_abort ,temp -0126 7920fe00 setflag true ,0 ,pdata -0127 67e0c54d store 1 ,mem_24g_abort_packet -0128 c000812a beq 1 ,p_g24_data_attemp_device1_abort -0129 20204a62 branch g24_data_device1 + 8 +0103 20404a22 call g24_binding_dvc1_living +0104 20404bbd call g24_ch_timer_reinit +0105 6fe0c54d fetch 1 ,mem_24g_abort_packet +0106 6848c52b fetcht 1 ,mem_24g_rxdata_temp +0107 284ffe03 isolate1 bit_abort ,temp +0108 7920fe00 setflag true ,0 ,pdata +0109 67e0c54d store 1 ,mem_24g_abort_packet +010a c000810c beq 1 ,p_g24_data_attemp_device1_abort +010b 20204a62 branch g24_data_device1 + 8 p_g24_data_attemp_device1_abort: -012a 6fe0c095 fetch 1 ,mem_device_option -012b 1fe67c0e sub pdata ,dvc_op_car ,null -012c 2042cf01 call car_stop_blink ,zero -012d 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -012e 247a0000 nrtn blank -012f 7045d701 jam 1 ,mem_24g_device1_bind_disable -0130 6fe24535 fetch 4 ,mem_24g_rxdata_temp + 10 -0131 20204c26 branch g24_store_device1_addr +010c 6fe0c095 fetch 1 ,mem_device_option +010d 1fe67c0e sub pdata ,dvc_op_car ,null +010e 2042cf01 call car_stop_blink ,zero +010f 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable +0110 247a0000 nrtn blank +0111 7045d701 jam 1 ,mem_24g_device1_bind_disable +0112 6fe24535 fetch 4 ,mem_24g_rxdata_temp + 10 +0113 20204c26 branch g24_store_device1_addr p_g24_data_receive_attemp: -0132 20404a30 call g24_bind_device_status -0133 20200107 branch p_g24_data_attemp +0114 20404a30 call g24_bind_device_status +0115 202000e9 branch p_g24_data_attemp org 0x3800 start: Index: program/patch.prog =================================================================== --- /branch/usb/usb_public_125K/program/patch.prog (revision 358) +++ /branch/usb/usb_public_125K/program/patch.prog (working copy) @@ -6,11 +6,9 @@ beq patch02_5,p_set_freq_tx beq patch02_7,p_set_tx_power_8db beq patch06_6,p_dongle_usb_dispatch - beq patch06_7,p_dongle_work_mode_auto beq patch17_1,p_usb_init beq patch18_1,p_usb_tx beq patch1a_5,p_le_enable_phy_by_pdata - beq patch0c_2,p_app_init branch assert pf_patch_ext: @@ -42,36 +40,6 @@ istore 6,contw branch init_param+2 -p_app_init: -p_dongle_init: - setarg dongle_dispatch - store 2,mem_cb_24g_receive_process - setarg dongle_g24_mouse - store 2,mem_cb_24g_data_device1 - setarg p_dongle_g24_kb - store 2,mem_cb_24g_data_device2 - branch dongle_init+6 - -p_dongle_g24_kb: -ifdef UART_LOG - call p_g24_kb_data_print -endif - fetch 4,mem_24g_rxdata_temp+4 - fetcht 4,mem_24g_transmitter_addr - isub temp,null - branch p_g24_kb_data_check,zero - branch dongle_g24_kb - -p_g24_kb_data_check: - fetch 1,mem_24g_rxdata_temp+3 - beq 0x02,p_g24_rx_buff_clear - branch dongle_g24_kb - -p_g24_rx_buff_clear: - arg mem_24g_rxdata_temp,contw - arg 4,loopcnt - branch memset0 - p_dongle_default_init: ifdef UART_LOG call p_device_hardware_init @@ -92,7 +60,7 @@ p_dongle_usb_dispatch: - call p_wdt_kick + //call p_wdt_kick fetch 1,mem_usb_remote_wakeup call dongle_clear_pc_sleep_flag,blank call usb_isr @@ -115,18 +83,9 @@ jam 0,mem_24g_device2_bind_disable branch dongle_dispose_cmd_bind -p_dongle_work_mode_auto: - fetch 1,mem_24g_work_mode - rtnne DONGLE_WORK - call g24_work_mode_start - //call dongle_g24_blank_data_process - fetch 1,mem_24g_pair_mode - nrtn blank - branch g24_nodata_process - -p_wdt_kick: - setarg 16 //about 148ms - branch wdt_init_config +//p_wdt_kick: +// setarg 16 //about 148ms +// branch wdt_init_config p_usb_init: @@ -167,8 +126,7 @@ bne USB_CONNECTED,usb_tx_fifo_release fetch 1,mem_usb_clear_remote_wakeup nbranch usb_tx_fifo_release,blank - call p_usb_tx_data_ep1 - branch usb_tx_data_ep2 + branch p_usb_tx_data_ep1 p_usb_tx_data_ep1: fetch 1,core_usb_txbusy @@ -453,11 +411,7 @@ rtneq GPIO_DISABLE branch gpio_config_function_int -p_g24_kb_data_print: - arg 10,loopcnt - arg mem_24g_rxdata_temp,regc - call log_bytes - branch log_end + p_24g_rxpayload_print: arg mem_temp_block0,contw Index: sched/dongle.dat =================================================================== --- /branch/usb/usb_public_125K/sched/dongle.dat (revision 358) +++ /branch/usb/usb_public_125K/sched/dongle.dat (working copy) @@ -3,7 +3,7 @@ mem_ui_button_gpio:ff mem_load_check_sum:5a #skip data check when loadcode -mem_wdt_always_work:01 +mem_wdt_always_work:00 #sys config #bit7:enable 16M xtal#0:24M#1:16M @@ -35,7 +35,7 @@ 'Smart #rf config -mem_24g_lap:77 68 18 ad 06 13#low 4B used for 24g rxaddr +mem_24g_lap:77 46 13 ad 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