Index: output/eeprom.dat =================================================================== --- /branch/usb/usb_public_125K/output/eeprom.dat (revision 340) +++ /branch/usb/usb_public_125K/output/eeprom.dat (working copy) @@ -2,40 +2,48 @@ 02 aa 55 -66 +d2 04 c2 84 00 -09 +0b c0 00 00 -12 +14 c0 0a 80 -74 +8f c0 0b 80 -7a +95 c0 1b 00 -2a +3e +c0 +1b +80 +51 c0 5c 80 -3f +59 c0 60 80 -54 +6e c0 6a 80 -6f +8a +c0 +31 +00 +21 20 20 3a @@ -47,31 +55,31 @@ c0 14 00 -7d +98 c0 1d 00 -a0 +bb c0 1d 80 -b4 +cf c0 1e 81 -01 +1c c0 20 80 -86 +a1 c0 22 -00 -f6 +01 +11 c0 40 00 -1f +33 20 20 3a @@ -107,7 +115,7 @@ 20 40 00 -1b +1d 20 20 38 @@ -128,6 +136,78 @@ 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 @@ -143,7 +223,7 @@ 20 40 00 -27 +3b 6f e0 c5 @@ -175,7 +255,7 @@ 20 40 00 -3d +57 6f e0 87 @@ -235,7 +315,7 @@ c0 50 80 -3b +4f 20 20 52 @@ -248,6 +328,30 @@ 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 @@ -267,7 +371,7 @@ 20 40 00 -51 +6b 70 06 10 @@ -389,9 +493,13 @@ 74 6c 20 -20 +40 00 -61 +7c +20 +20 +74 +5f 6f f0 8c @@ -431,7 +539,7 @@ c0 08 00 -6c +87 20 20 3a @@ -455,7 +563,7 @@ c2 80 80 -72 +8d 20 20 3d @@ -663,7 +771,7 @@ 20 40 00 -ac +c7 20 40 4a @@ -731,19 +839,19 @@ c0 55 00 -ba +d5 c0 2a 80 -c4 +df c0 11 00 -d4 +ef c0 7f -80 -ec +81 +07 20 60 00 @@ -755,11 +863,11 @@ c0 00 80 -be +d9 c0 01 00 -c1 +dc 20 60 00 @@ -795,7 +903,7 @@ 20 3a 00 -ca +e5 6f e2 45 @@ -819,11 +927,11 @@ c0 00 80 -ce +e9 c0 01 00 -d1 +ec 20 60 00 @@ -859,7 +967,7 @@ 20 3a 00 -da +f5 6f e2 45 @@ -883,11 +991,11 @@ c0 00 80 -de +f9 c0 01 +01 00 -e5 20 60 00 @@ -907,7 +1015,7 @@ c0 01 00 -e3 +fe 20 60 00 @@ -934,8 +1042,8 @@ 19 c0 80 -00 -ea +01 +05 20 60 00 @@ -954,12 +1062,12 @@ 2e c0 00 -80 -f0 +81 +0b c0 01 -00 -f3 +01 +0e 20 60 00 @@ -998,8 +1106,8 @@ 00 20 40 -00 -fa +01 +15 20 20 4b @@ -1039,7 +1147,7 @@ c0 00 81 -06 +21 c0 01 4a @@ -1047,7 +1155,7 @@ c0 7f 81 -17 +32 20 20 4a @@ -1083,7 +1191,7 @@ c0 00 81 -0f +2a 20 20 4a @@ -1126,10 +1234,10 @@ 30 20 20 -00 -ec -83 -57 +01 +07 +ef +d1 aa 55 40 @@ -1142,13 +1250,13 @@ 00 00 00 -40 -00 +c0 00 00 00 00 00 +04 00 00 00 @@ -1276,8 +1384,8 @@ 37 44 77 -46 -13 +68 +18 ad 06 13 @@ -1415,7 +1523,7 @@ aa aa 55 -38 +e3 3f -14 -08 +00 +a3 Index: output/program.lis =================================================================== --- /branch/usb/usb_public_125K/output/program.lis (revision 340) +++ /branch/usb/usb_public_125K/output/program.lis (working copy) @@ -1,374 +1,413 @@ include "bt_format " org 0x0000 -0000 c2840009 bbit1 8 ,pf_patch_ext -0001 c0000012 beq patch00_0 ,p_soft_reset -0002 c00a8074 beq patch02_5 ,p_set_freq_tx -0003 c00b807a beq patch02_7 ,p_set_tx_power_8db -0004 c01b002a beq patch06_6 ,p_dongle_usb_dispatch -0005 c05c803f beq patch17_1 ,p_usb_init -0006 c0608054 beq patch18_1 ,p_usb_tx -0007 c06a806f beq patch1a_5 ,p_le_enable_phy_by_pdata -0008 20203aba branch assert +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 pf_patch_ext: -0009 c17f8000 rtneq patch3f_7 -000a c014007d beq patch25_0 ,p_g24_receive_skip_end -000b c01d00a0 beq patch27_2 ,p_g24_bind_data_process -000c c01d80b4 beq patch27_3 ,p_g24_bind_data_parse_next -000d c01e8101 beq patch27_5 ,p_g24_receive_packet_start_next -000e c0208086 beq patch28_1 ,p_g24_mode_switch_bind_search -000f c02200f6 beq patch28_4 ,p_g24_search_mode_auto -0010 c040001f beq patch30_0 ,p_dongle_default_init -0011 20203aba branch assert +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 p_soft_reset: -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 +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 p_init_param: -001b 58000000 setarg 0 -001c 67e40000 store 8 ,mem_le_adv_transmit -001d e7e30005 istore 6 ,contw -001e 20203ac5 branch init_param + 2 +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 p_dongle_default_init: -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 +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 p_g24_enable_coded_s8: -0027 7044fd84 jam 0x84 ,mem_24g_rx_phy -0028 7044fe84 jam 0x84 ,mem_24g_tx_phy -0029 20600000 rtn +003b 7044fd84 jam 0x84 ,mem_24g_rx_phy +003c 7044fe84 jam 0x84 ,mem_24g_tx_phy +003d 20600000 rtn p_dongle_usb_dispatch: -002a 2040003d call p_wdt_kick -002b 6fe08755 fetch 1 ,mem_usb_remote_wakeup -002c 205a533b call dongle_clear_pc_sleep_flag ,blank -002d 20407176 call usb_isr -002e 6fe0874b fetch 1 ,mem_usb0_get_set_report -002f 207a0000 rtn blank -0030 70074b00 jam 0 ,mem_usb0_get_set_report -0031 6fe10749 fetch 2 ,mem_usb_setup_bvalue_temp -0032 d84002ba arg pc_set_report ,temp -0033 98467c00 isub temp ,null -0034 24628000 nrtn zero -0035 6fe086c9 fetch 1 ,mem_usb0_set_report_data -0036 c1dd0000 rtnne pc_report_id -0037 6fe086ca fetch 1 ,mem_usb0_set_report_data + 1 -0038 c0505302 beq command_mode ,dongle_dispose_cmd_mode -0039 c050803b beq command_bind ,p_dongle_dispose_cmd_bind -003a 202052fd branch dongle_usb_dispatch_check_cmd + 3 +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 p_dongle_dispose_cmd_bind: -003b 7045d800 jam 0 ,mem_24g_device2_bind_disable -003c 20205308 branch 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: -003d 58000010 setarg 16 -003e 20206de1 branch wdt_init_config +0057 58000010 setarg 16 +0058 20206de1 branch wdt_init_config p_usb_init: -003f 20406fd3 call enable_authrom -0040 204071a1 call usb_init_param -0041 20400051 call p_usb_manufacturer_update -0042 70061003 jam 0x03 ,mem_devicedesc + 17 -0043 708c0000 jam 0x00 ,core_usb_config -0044 20002710 nop 10000 -0045 708c1800 jam 0x00 ,core_usb_trig -0046 6ff10050 fetch 2 ,core_clkoff -0047 793ffe0a set0 clock_off_usb ,pdata -0048 67f10050 store 2 ,core_clkoff -0049 708c1100 jam 0x0 ,core_usb_hmode -004a 708c003c jam 0x3c ,core_usb_config -004b 58000bb3 setarg mem_usb_rxbuf_new -004c 67f10c03 store 2 ,core_usb_rx_saddr -004d 67f10c07 store 2 ,core_usb_rxptr -004e 58000bf7 setarg mem_usb_rxbuf_new_end -004f 67f10c05 store 2 ,core_usb_rx_eaddr -0050 20207192 branch usb_init + 16 +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 p_usb_manufacturer_update: -0051 6fe345e5 fetch 6 ,mem_usb_manufacturer_info -0052 67e30653 store 6 ,mem_string1 -0053 20600000 rtn +006b 6fe345e5 fetch 6 ,mem_usb_manufacturer_info +006c 67e30653 store 6 ,mem_string1 +006d 20600000 rtn p_usb_tx: -0054 6fe08761 fetch 1 ,mem_usb_tx_enable -0055 207a0000 rtn blank -0056 6ff08c24 fetch 1 ,core_usb_txbusy -0057 1fe17e0f and_into 0x0f ,pdata -0058 243a7496 nbranch usb_inwake_state_tx_dispose ,blank -0059 6fe08762 fetch 1 ,mem_usb_device_enumeration_endflag -005a 203a746c branch usb_tx_fifo_release ,blank -005b 6fe08754 fetch 1 ,mem_usb_state -005c c001f4a6 beq usb_sleep ,usb_windows_wakeup -005d c081746c bne usb_connected ,usb_tx_fifo_release -005e 6fe08756 fetch 1 ,mem_usb_clear_remote_wakeup -005f 243a746c nbranch usb_tx_fifo_release ,blank -0060 20200061 branch p_usb_tx_data_ep1 +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 p_usb_tx_data_ep1: -0061 6ff08c24 fetch 1 ,core_usb_txbusy -0062 c3808000 rtnbit1 1 -0063 6fe08761 fetch 1 ,mem_usb_tx_enable -0064 c4008000 rtnbit0 1 -0065 6fe08761 fetch 1 ,mem_usb_tx_enable -0066 793ffe01 set0 1 ,pdata -0067 67e08761 store 1 ,mem_usb_tx_enable -0068 6fe0875f fetch 1 ,mem_usb_ep1_data -0069 207a0000 rtn blank -006a c008006c beq usb_ep1_kb ,p_usb_tx_kb_normal_data -006b 20203aba branch assert +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 p_usb_tx_kb_normal_data: -006c 58000000 setarg 0 -006d 67e2077b store 4 ,mem_usb_kb_data + 4 -006e 2020748e branch 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 p_le_enable_phy_by_pdata: -006f 18427e00 copy temp ,pdata -0070 c2808072 bbit1 bit_le_2m_phy ,p_le_enable_2m -0071 20203d19 branch le_enable_phy_by_pdata + 3 +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 p_le_enable_2m: -0072 708a6d89 jam 0x89 ,core_rx_bq_cfg0 -0073 20203d1f branch le_enable_2m +008d 708a6d89 jam 0x89 ,core_rx_bq_cfg0 +008e 20203d1f branch le_enable_2m p_set_freq_tx: -0074 708a3d12 jam 0x12 ,core_syn_top_ctrl -0075 60488008 storet 1 ,mem_last_freq -0076 1840a202 add temp ,2 ,rega -0077 2040398e call rf_tx_write_freq -0078 200003c0 nop 0x3c0 -0079 202039cf branch txon +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 p_set_tx_power_8db: -007a 708a39ab jam 0xab ,core_tx_pwr_ctrl0 -007b 708a3a0f jam 0x0f ,core_tx_pwr_ctrl1 -007c 202039f3 branch set_rf_ldo_cfg89_2 +0095 708a39ab jam 0xab ,core_tx_pwr_ctrl0 +0096 708a3a0f jam 0x0f ,core_tx_pwr_ctrl1 +0097 202039f3 branch set_rf_ldo_cfg89_2 p_g24_receive_skip_end: -007d 6fe0c5ab fetch 1 ,mem_dg_sys_config -007e c300481c bbit0 dg_enable_new_revision ,g24_receive_skip_end -007f 2000012c nop 300 -0080 6fe0c43e fetch 1 ,mem_24g_rxbuf + 1 -0081 79207e00 set1 bit_ack_24g ,pdata -0082 67e0c43e store 1 ,mem_24g_rxbuf + 1 -0083 20404a3b call g24_ackpayload_prep -0084 2040488f call g24_transmit_prep -0085 2020483f branch g24_transmit +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 p_g24_mode_switch_bind_search: -0086 6fe0c559 fetch 1 ,mem_24g_work_mode -0087 c1000000 rtneq dongle_work -0088 6fe0c56d fetch 1 ,mem_24g_b_s_mode_switch_disable -0089 247a0000 nrtn blank -008a 6fe0c56b fetch 1 ,mem_24g_mode_b_s_switch_exit -008b 247a0000 nrtn blank -008c 6fe0c567 fetch 1 ,mem_24g_mode_b_s_switch -008d 207a0000 rtn blank -008e 6fe0c56e fetch 1 ,mem_24g_bind_device_living -008f 2fe00603 compare 3 ,pdata ,3 -0090 2020cadc branch g24_mode_b_s_switch_exit ,true -0091 204048ef call g24_timer_check -0092 24740000 nrtn user -0093 6fe14569 fetch 2 ,mem_24g_mode_b_s_switch_cnt -0094 1fe0fe01 increase 1 ,pdata -0095 67e14569 store 2 ,mem_24g_mode_b_s_switch_cnt -0096 d84007d0 arg 0x7d0 ,temp -0097 98467c00 isub temp ,null -0098 20214adc branch g24_mode_b_s_switch_exit ,positive -0099 6fe0c56c fetch 1 ,mem_24g_b_s_time_slice -009a 1fe0fe01 increase 1 ,pdata -009b 1fe17e01 and_into 1 ,pdata -009c 67e0c56c store 1 ,mem_24g_b_s_time_slice -009d c0004ba3 beq 0 ,g24_search_mode_enable -009e c000c99f beq 1 ,g24_bind_mode_enable -009f 20600000 rtn +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 p_g24_bind_data_process: -00a0 20404a54 call g24_rx_interrupt_clear -00a1 204047ce call g24_receive_packet -00a2 2437ca54 nbranch g24_rx_interrupt_clear ,user3 -00a3 204049bf call g24_bind_data_parse -00a4 204000ac call p_g24_bind_transmit_ack -00a5 20404a2e call g24_bind_device_status_check -00a6 204053c3 call dongle_kb_bind_soft_reset -00a7 6fe0c4f4 fetch 1 ,mem_24g_pair_switch -00a8 207a0000 rtn blank -00a9 6fe2456f fetch 4 ,mem_24g_transmitter_addr -00aa 207a0000 rtn blank -00ab 202048e0 branch g24_update_addr_and_synccrc8 +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 p_g24_bind_transmit_ack: -00ac 6fe0c43d fetch 1 ,mem_24g_rxbuf -00ad 67e0c4cf store 1 ,mem_24g_data_type -00ae 204048be call g24_read_len_pid_crc -00af 20404a3b call g24_ackpayload_prep -00b0 2437c837 nbranch g24_end_of_packet ,user3 -00b1 2040488f call g24_transmit_prep -00b2 2040483f call g24_transmit -00b3 20204837 branch g24_end_of_packet +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 p_g24_bind_data_parse_next: -00b4 6fe0c52d fetch 1 ,mem_24g_rxdata_temp + 2 -00b5 c05500ba beq datatype_bind ,p_g24_bind_first_step -00b6 c02a80c4 beq datatype_config ,p_g24_bind_second_step -00b7 c01100d4 beq datatype_ok ,p_g24_bind_third_step -00b8 c07f80ec beq datatype_attemp ,p_g24_data_attemp -00b9 20600000 rtn +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 p_g24_bind_first_step: -00ba 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -00bb c00080be beq datatype_device1 ,p_g24_bind_first_step_device1 -00bc c00100c1 beq datatype_device2 ,p_g24_bind_first_step_device2 -00bd 20600000 rtn +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 p_g24_bind_first_step_device1: -00be 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -00bf 247a0000 nrtn blank -00c0 202049ce branch 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 p_g24_bind_first_step_device2: -00c1 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -00c2 247a0000 nrtn blank -00c3 202049d4 branch 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 p_g24_bind_second_step: -00c4 6fe0c4f4 fetch 1 ,mem_24g_pair_switch -00c5 203a00ca branch p_g24_bind_second_step_skip ,blank -00c6 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 -00c7 684a4437 fetcht 4 ,mem_24g_lap -00c8 98467c00 isub temp ,null -00c9 24628000 nrtn zero +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 p_g24_bind_second_step_skip: -00ca 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -00cb c00080ce beq datatype_device1 ,p_g24_bind_second_step_device1 -00cc c00100d1 beq datatype_device2 ,p_g24_bind_second_step_device2 -00cd 20600000 rtn +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 p_g24_bind_second_step_device1: -00ce 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -00cf 247a0000 nrtn blank -00d0 202049e1 branch 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 p_g24_bind_second_step_device2: -00d1 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -00d2 247a0000 nrtn blank -00d3 202049ec branch 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 p_g24_bind_third_step: -00d4 6fe0c4f4 fetch 1 ,mem_24g_pair_switch -00d5 203a00da branch p_g24_bind_third_step_skip ,blank -00d6 6fe2452f fetch 4 ,mem_24g_rxdata_temp + 4 -00d7 684a456f fetcht 4 ,mem_24g_transmitter_addr -00d8 98467c00 isub temp ,null -00d9 24628000 nrtn zero +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 p_g24_bind_third_step_skip: -00da 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -00db c00080de beq datatype_device1 ,p_g24_bind_third_step_device1 -00dc c00100e5 beq datatype_device2 ,p_g24_bind_third_step_device2 -00dd 20600000 rtn +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 p_g24_bind_third_step_device1: -00de 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -00df 247a0000 nrtn blank -00e0 6fe0c518 fetch 1 ,mem_24g_device1_bind_step -00e1 c00100e3 beq 2 ,p_g24_bind_dvc1_step_success -00e2 20600000 rtn +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 p_g24_bind_dvc1_step_success: -00e3 7045d701 jam 1 ,mem_24g_device1_bind_disable -00e4 20204a02 branch g24_bind_dvc1_step_success + 1 +00fe 7045d701 jam 1 ,mem_24g_device1_bind_disable +00ff 20204a02 branch g24_bind_dvc1_step_success + 1 p_g24_bind_third_step_device2: -00e5 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -00e6 247a0000 nrtn blank -00e7 6fe0c519 fetch 1 ,mem_24g_device2_bind_step -00e8 c08000ea bne 0 ,p_g24_bind_dvc2_step_success -00e9 20600000 rtn +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 p_g24_bind_dvc2_step_success: -00ea 7045d801 jam 1 ,mem_24g_device2_bind_disable -00eb 20204a0d branch g24_bind_dvc2_step_success + 1 +0105 7045d801 jam 1 ,mem_24g_device2_bind_disable +0106 20204a0d branch g24_bind_dvc2_step_success + 1 p_g24_data_attemp: -00ec 6fe0c52e fetch 1 ,mem_24g_rxdata_temp + 3 -00ed c00080f0 beq datatype_device1 ,p_g24_data_attemp_device1 -00ee c00100f3 beq datatype_device2 ,p_g24_data_attemp_device2 -00ef 20600000 rtn +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 p_g24_data_attemp_device1: -00f0 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -00f1 247a0000 nrtn blank -00f2 20204c24 branch g24_data_attemp_device1 +010b 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable +010c 247a0000 nrtn blank +010d 20204c24 branch g24_data_attemp_device1 p_g24_data_attemp_device2: -00f3 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable -00f4 247a0000 nrtn blank -00f5 20204c28 branch g24_data_attemp_device2 +010e 6fe0c5d8 fetch 1 ,mem_24g_device2_bind_disable +010f 247a0000 nrtn blank +0110 20204c28 branch g24_data_attemp_device2 p_g24_search_mode_auto: -00f6 6fe0c559 fetch 1 ,mem_24g_work_mode -00f7 c1838000 rtnne dongle_search -00f8 204000fa call p_g24_search_mode_init -00f9 20204b1b branch g24_search_mode_auto + 4 +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 p_g24_search_mode_init: -00fa 6fe0c558 fetch 1 ,mem_24g_mode_init -00fb c3838000 rtnbit1 dongle_search -00fc 79207e07 set1 dongle_search ,pdata -00fd 67e0c558 store 1 ,mem_24g_mode_init -00fe 6fe0c566 fetch 1 ,mem_tx_power_temp -00ff 67e0c116 store 1 ,mem_tx_power -0100 20204b0b branch g24_search_mode_init + 4 +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 p_g24_receive_packet_start_next: -0101 6fe0c52d fetch 1 ,mem_24g_rxdata_temp + 2 -0102 c0008106 beq datatype_device1 ,p_g24_data_device1 -0103 c0014a69 beq datatype_device2 ,g24_data_device2 -0104 c07f8117 beq datatype_attemp ,p_g24_data_receive_attemp -0105 20204a54 branch g24_rx_interrupt_clear +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 p_g24_data_device1: -0106 20404a22 call g24_binding_dvc1_living -0107 20404bbd call g24_ch_timer_reinit -0108 6fe0c54d fetch 1 ,mem_24g_abort_packet -0109 6848c52b fetcht 1 ,mem_24g_rxdata_temp -010a 284ffe03 isolate1 bit_abort ,temp -010b 7920fe00 setflag true ,0 ,pdata -010c 67e0c54d store 1 ,mem_24g_abort_packet -010d c000810f beq 1 ,p_g24_data_attemp_device1_abort -010e 20204a62 branch g24_data_device1 + 8 +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 p_g24_data_attemp_device1_abort: -010f 6fe0c095 fetch 1 ,mem_device_option -0110 1fe67c0e sub pdata ,dvc_op_car ,null -0111 2042cf01 call car_stop_blink ,zero -0112 6fe0c5d7 fetch 1 ,mem_24g_device1_bind_disable -0113 247a0000 nrtn blank -0114 7045d701 jam 1 ,mem_24g_device1_bind_disable -0115 6fe24535 fetch 4 ,mem_24g_rxdata_temp + 10 -0116 20204c26 branch g24_store_device1_addr +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 p_g24_data_receive_attemp: -0117 20404a30 call g24_bind_device_status -0118 202000ec branch p_g24_data_attemp +0132 20404a30 call g24_bind_device_status +0133 20200107 branch p_g24_data_attemp org 0x3800 start: Index: program/patch.prog =================================================================== --- /branch/usb/usb_public_125K/program/patch.prog (revision 340) +++ /branch/usb/usb_public_125K/program/patch.prog (working copy) @@ -6,9 +6,11 @@ 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: @@ -40,6 +42,36 @@ 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 @@ -83,6 +115,15 @@ 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 @@ -126,7 +167,8 @@ bne USB_CONNECTED,usb_tx_fifo_release fetch 1,mem_usb_clear_remote_wakeup nbranch usb_tx_fifo_release,blank - branch p_usb_tx_data_ep1 + call p_usb_tx_data_ep1 + branch usb_tx_data_ep2 p_usb_tx_data_ep1: fetch 1,core_usb_txbusy @@ -411,7 +453,11 @@ 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 340) +++ /branch/usb/usb_public_125K/sched/dongle.dat (working copy) @@ -35,7 +35,7 @@ 'Smart #rf config -mem_24g_lap:77 46 13 ad 06 13#low 4B used for 24g rxaddr +mem_24g_lap:77 68 18 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