Index: format/app_dongle.format =================================================================== --- /1121s/branch/dongle/1m/USB_XZR/usb_1m_ai/format/app_dongle.format (revision 3896) +++ /1121s/branch/dongle/1m/USB_XZR/usb_1m_ai/format/app_dongle.format (working copy) @@ -47,7 +47,6 @@ 2 mem_usb_get_report_mouse_version_data 2 mem_dongle_version 1 mem_dongle_connect_mouse_flag -1 mem_dongle_no_data_flag //no use 2 mem_dongle_no_data_count 65 mem_usb_rf_state_data Index: output/eeprom.dat =================================================================== --- /1121s/branch/dongle/1m/USB_XZR/usb_1m_ai/output/eeprom.dat (revision 3896) +++ /1121s/branch/dongle/1m/USB_XZR/usb_1m_ai/output/eeprom.dat (working copy) @@ -1122,23 +1122,23 @@ 55 70 48 -50 +4f 40 70 48 -51 +50 a1 70 48 -52 +51 02 70 48 -53 +52 01 70 48 -54 +53 0b 6f e3 @@ -1147,7 +1147,7 @@ 67 e3 48 -55 +54 6f e1 48 @@ -1155,7 +1155,7 @@ 67 e1 48 -5b +5a 6f e1 48 @@ -1163,7 +1163,7 @@ 67 e1 48 -5d +5c 70 09 0c @@ -1174,27 +1174,27 @@ 69 70 48 -97 +96 01 70 48 -91 +90 40 70 48 -92 +91 a1 70 48 -93 +92 02 70 48 -94 +93 02 70 48 -95 +94 01 6f e0 @@ -1203,7 +1203,7 @@ 67 e0 c8 -96 +95 70 09 0c @@ -1214,23 +1214,23 @@ 69 70 48 -50 +4f 40 70 48 -51 +50 a1 70 48 -52 +51 02 70 48 -53 +52 03 70 48 -54 +53 06 6f e3 @@ -1239,7 +1239,7 @@ 67 e3 48 -55 +54 70 09 0c @@ -1250,27 +1250,27 @@ 69 70 48 -d8 +d7 01 70 48 -d2 +d1 40 70 48 -d3 +d2 a1 70 48 -d4 +d3 02 70 48 -d5 +d4 06 70 48 -d6 +d5 01 6f e0 @@ -1279,7 +1279,7 @@ 67 e0 c8 -d7 +d6 70 09 0c @@ -1306,27 +1306,27 @@ 00 70 48 -0f +0e 40 70 48 -10 +0f a1 70 48 -11 +10 02 70 48 -12 +11 05 70 48 -13 +12 01 70 48 -14 +13 01 70 09 @@ -1338,27 +1338,27 @@ 69 70 48 -0f +0e 40 70 48 -10 +0f a1 70 48 -11 +10 02 70 48 -12 +11 05 70 48 -13 +12 01 70 48 -14 +13 00 70 09 @@ -1370,11 +1370,11 @@ 69 70 48 -0f +0e 40 70 48 -10 +0f a1 d8 40 @@ -1423,7 +1423,7 @@ d8 a0 48 -11 +10 6f e1 c6 @@ -2043,7 +2043,7 @@ da 20 49 -13 +12 20 40 7d @@ -2115,7 +2115,7 @@ 6f e0 c9 -26 +25 24 5a 02 @@ -2166,7 +2166,7 @@ 00 67 e1 -c8 +48 0c 6f e0 @@ -2483,7 +2483,7 @@ da 20 49 -13 +12 20 40 7d @@ -2503,7 +2503,7 @@ da 20 49 -13 +12 20 20 7d @@ -2563,7 +2563,7 @@ 6f e0 c9 -26 +25 c0 00 02 @@ -2610,7 +2610,7 @@ 00 70 49 -26 +25 01 20 20 @@ -2619,11 +2619,11 @@ df e0 49 -2c +2b 67 e1 49 -29 +28 6f e0 88 @@ -2642,12 +2642,12 @@ 00 70 49 -26 +25 02 6f e1 c9 -1c +1b 67 e1 89 @@ -2658,12 +2658,12 @@ 28 70 49 -26 +25 02 6f e1 c9 -1f +1e 67 e1 89 @@ -2674,12 +2674,12 @@ 28 70 49 -26 +25 03 6f e0 c9 -1c +1b 67 e0 89 @@ -2690,7 +2690,7 @@ 28 70 49 -26 +25 04 d8 a0 @@ -2706,7 +2706,7 @@ a3 70 49 -28 +27 00 20 20 @@ -2714,12 +2714,12 @@ 28 70 49 -26 +25 07 6f e1 c9 -22 +21 67 e1 89 @@ -2730,7 +2730,7 @@ 28 70 49 -26 +25 08 20 20 @@ -2738,7 +2738,7 @@ a0 70 49 -26 +25 09 20 20 @@ -2746,7 +2746,7 @@ a6 70 49 -26 +25 00 20 20 @@ -2755,7 +2755,7 @@ 6f e0 c9 -25 +24 1f e0 fe @@ -2763,18 +2763,18 @@ 67 e0 c9 -25 +24 c1 87 80 00 70 49 -25 +24 00 70 49 -26 +25 05 20 60 @@ -2783,7 +2783,7 @@ 6f e0 c9 -28 +27 c0 00 82 @@ -2798,7 +2798,7 @@ 00 70 49 -26 +25 06 20 60 @@ -2807,11 +2807,11 @@ d8 40 49 -2c +2b 6f e0 c9 -2b +2a 98 40 84 @@ -2819,7 +2819,7 @@ 6f e1 49 -29 +28 98 46 7c @@ -2839,7 +2839,7 @@ 6f e0 c9 -27 +26 67 e0 89 @@ -2851,7 +2851,7 @@ 6f e1 49 -29 +28 1f e0 fe @@ -2859,10 +2859,10 @@ 67 e1 49 -29 +28 70 49 -28 +27 01 20 20 @@ -2871,7 +2871,7 @@ 68 49 49 -29 +28 ef e0 80 @@ -3006,12 +3006,12 @@ 00 70 49 -27 +26 00 6f e1 49 -29 +28 ef e0 80 @@ -3019,11 +3019,11 @@ d8 c0 49 -54 +53 68 48 c9 -53 +52 18 42 72 @@ -3050,7 +3050,7 @@ 00 70 49 -27 +26 02 20 60 @@ -3059,7 +3059,7 @@ da 20 49 -13 +12 20 40 7d @@ -3103,7 +3103,7 @@ da 20 49 -13 +12 20 40 7d @@ -3151,7 +3151,7 @@ 6f e0 c8 -0f +0e 20 7a 00 @@ -3163,7 +3163,7 @@ d8 c0 48 -10 +0f d8 e0 00 @@ -3183,7 +3183,7 @@ d8 a0 48 -0f +0e 20 20 03 @@ -3191,7 +3191,7 @@ 6f e0 c8 -50 +4f 20 7a 00 @@ -3203,7 +3203,7 @@ d8 c0 48 -51 +50 d8 e0 00 @@ -3223,7 +3223,7 @@ d8 a0 48 -50 +4f df 20 00 @@ -3235,7 +3235,7 @@ 6f e0 c8 -91 +90 20 7a 00 @@ -3247,7 +3247,7 @@ d8 c0 48 -92 +91 d8 e0 00 @@ -3267,7 +3267,7 @@ d8 a0 48 -91 +90 20 20 03 @@ -3275,7 +3275,7 @@ 6f e0 c8 -d2 +d1 20 7a 00 @@ -3287,7 +3287,7 @@ d8 c0 48 -d3 +d2 d8 e0 00 @@ -3307,7 +3307,7 @@ d8 a0 48 -d2 +d1 20 20 03 @@ -4139,7 +4139,7 @@ 6f e0 c9 -26 +25 20 7a 00 @@ -4158,16 +4158,16 @@ 00 6f e0 -c6 -16 -c1 -80 +c8 +0b +20 +7a 00 00 6f e1 48 -0d +0c 1f e0 fe @@ -4175,7 +4175,7 @@ 67 e1 48 -0d +0c d8 40 04 @@ -4195,7 +4195,7 @@ 67 e1 48 -0d +0c 6f e0 c8 @@ -4284,8 +4284,8 @@ 20 31 95 -c3 -34 +9c +78 aa 55 40 @@ -4761,13 +4761,13 @@ 00 09 48 -03 +04 00 aa 55 09 00 -1c +1b 49 08 00 @@ -4782,9 +4782,9 @@ 55 11 00 -29 +28 49 -2c +2b 49 0e 77 @@ -4805,7 +4805,7 @@ 55 16 00 -53 +52 49 15 7e @@ -5021,10 +5021,10 @@ aa aa 55 -ba +b7 a1 -8a -94 +7e +63 ff ff ff Index: output/memmap.format =================================================================== --- /1121s/branch/dongle/1m/USB_XZR/usb_1m_ai/output/memmap.format (revision 3896) +++ /1121s/branch/dongle/1m/USB_XZR/usb_1m_ai/output/memmap.format (working copy) @@ -1500,24 +1500,23 @@ 0x4807 mem_usb_get_report_mouse_version_data 0x4809 mem_dongle_version 0x480b mem_dongle_connect_mouse_flag -0x480c mem_dongle_no_data_flag//no use -0x480d mem_dongle_no_data_count -0x480f mem_usb_rf_state_data -0x4850 mem_dongle_usb_ep2_data -0x4891 mem_usb_dpi_info_data -0x48d2 mem_usb_battery_info_data -0x4913 mem_usb_ep2_fifo -0x491b mem_dongle_freq_hop_flag -0x491c mem_usb_win_cmd -0x491f mem_usb_mac_cmd -0x4922 mem_usb_kb_enter -0x4925 mem_usb_website_wait_count -0x4926 mem_usb_website_step -0x4927 mem_usb_website_shift_flag -0x4928 mem_usb_website_release_flag -0x4929 mem_usb_website_ptr -0x492b mem_usb_website_info -0x4953 mem_usb_website_info_sign +0x480c mem_dongle_no_data_count +0x480e mem_usb_rf_state_data +0x484f mem_dongle_usb_ep2_data +0x4890 mem_usb_dpi_info_data +0x48d1 mem_usb_battery_info_data +0x4912 mem_usb_ep2_fifo +0x491a mem_dongle_freq_hop_flag +0x491b mem_usb_win_cmd +0x491e mem_usb_mac_cmd +0x4921 mem_usb_kb_enter +0x4924 mem_usb_website_wait_count +0x4925 mem_usb_website_step +0x4926 mem_usb_website_shift_flag +0x4927 mem_usb_website_release_flag +0x4928 mem_usb_website_ptr +0x492a mem_usb_website_info +0x4952 mem_usb_website_info_sign 0x45d3 mem_rssi_hex_received 0x45d4 mem_24g_pair_sm 0x45d5 mem_24g_pair_no_ack Index: output/otp.dat =================================================================== --- /1121s/branch/dongle/1m/USB_XZR/usb_1m_ai/output/otp.dat (revision 3896) +++ /1121s/branch/dongle/1m/USB_XZR/usb_1m_ai/output/otp.dat (working copy) @@ -1131,23 +1131,23 @@ 55 70 48 -50 +4f 40 70 48 -51 +50 a1 70 48 -52 +51 02 70 48 -53 +52 01 70 48 -54 +53 0b 6f e3 @@ -1156,7 +1156,7 @@ 67 e3 48 -55 +54 6f e1 48 @@ -1164,7 +1164,7 @@ 67 e1 48 -5b +5a 6f e1 48 @@ -1172,7 +1172,7 @@ 67 e1 48 -5d +5c 70 09 0c @@ -1183,27 +1183,27 @@ 69 70 48 -97 +96 01 70 48 -91 +90 40 70 48 -92 +91 a1 70 48 -93 +92 02 70 48 -94 +93 02 70 48 -95 +94 01 6f e0 @@ -1212,7 +1212,7 @@ 67 e0 c8 -96 +95 70 09 0c @@ -1223,23 +1223,23 @@ 69 70 48 -50 +4f 40 70 48 -51 +50 a1 70 48 -52 +51 02 70 48 -53 +52 03 70 48 -54 +53 06 6f e3 @@ -1248,7 +1248,7 @@ 67 e3 48 -55 +54 70 09 0c @@ -1259,27 +1259,27 @@ 69 70 48 -d8 +d7 01 70 48 -d2 +d1 40 70 48 -d3 +d2 a1 70 48 -d4 +d3 02 70 48 -d5 +d4 06 70 48 -d6 +d5 01 6f e0 @@ -1288,7 +1288,7 @@ 67 e0 c8 -d7 +d6 70 09 0c @@ -1315,27 +1315,27 @@ 00 70 48 -0f +0e 40 70 48 -10 +0f a1 70 48 -11 +10 02 70 48 -12 +11 05 70 48 -13 +12 01 70 48 -14 +13 01 70 09 @@ -1347,27 +1347,27 @@ 69 70 48 -0f +0e 40 70 48 -10 +0f a1 70 48 -11 +10 02 70 48 -12 +11 05 70 48 -13 +12 01 70 48 -14 +13 00 70 09 @@ -1379,11 +1379,11 @@ 69 70 48 -0f +0e 40 70 48 -10 +0f a1 d8 40 @@ -1432,7 +1432,7 @@ d8 a0 48 -11 +10 6f e1 c6 @@ -2052,7 +2052,7 @@ da 20 49 -13 +12 20 40 7d @@ -2124,7 +2124,7 @@ 6f e0 c9 -26 +25 24 5a 02 @@ -2175,7 +2175,7 @@ 00 67 e1 -c8 +48 0c 6f e0 @@ -2492,7 +2492,7 @@ da 20 49 -13 +12 20 40 7d @@ -2512,7 +2512,7 @@ da 20 49 -13 +12 20 20 7d @@ -2572,7 +2572,7 @@ 6f e0 c9 -26 +25 c0 00 02 @@ -2619,7 +2619,7 @@ 00 70 49 -26 +25 01 20 20 @@ -2628,11 +2628,11 @@ df e0 49 -2c +2b 67 e1 49 -29 +28 6f e0 88 @@ -2651,12 +2651,12 @@ 00 70 49 -26 +25 02 6f e1 c9 -1c +1b 67 e1 89 @@ -2667,12 +2667,12 @@ 28 70 49 -26 +25 02 6f e1 c9 -1f +1e 67 e1 89 @@ -2683,12 +2683,12 @@ 28 70 49 -26 +25 03 6f e0 c9 -1c +1b 67 e0 89 @@ -2699,7 +2699,7 @@ 28 70 49 -26 +25 04 d8 a0 @@ -2715,7 +2715,7 @@ a3 70 49 -28 +27 00 20 20 @@ -2723,12 +2723,12 @@ 28 70 49 -26 +25 07 6f e1 c9 -22 +21 67 e1 89 @@ -2739,7 +2739,7 @@ 28 70 49 -26 +25 08 20 20 @@ -2747,7 +2747,7 @@ a0 70 49 -26 +25 09 20 20 @@ -2755,7 +2755,7 @@ a6 70 49 -26 +25 00 20 20 @@ -2764,7 +2764,7 @@ 6f e0 c9 -25 +24 1f e0 fe @@ -2772,18 +2772,18 @@ 67 e0 c9 -25 +24 c1 87 80 00 70 49 -25 +24 00 70 49 -26 +25 05 20 60 @@ -2792,7 +2792,7 @@ 6f e0 c9 -28 +27 c0 00 82 @@ -2807,7 +2807,7 @@ 00 70 49 -26 +25 06 20 60 @@ -2816,11 +2816,11 @@ d8 40 49 -2c +2b 6f e0 c9 -2b +2a 98 40 84 @@ -2828,7 +2828,7 @@ 6f e1 49 -29 +28 98 46 7c @@ -2848,7 +2848,7 @@ 6f e0 c9 -27 +26 67 e0 89 @@ -2860,7 +2860,7 @@ 6f e1 49 -29 +28 1f e0 fe @@ -2868,10 +2868,10 @@ 67 e1 49 -29 +28 70 49 -28 +27 01 20 20 @@ -2880,7 +2880,7 @@ 68 49 49 -29 +28 ef e0 80 @@ -3015,12 +3015,12 @@ 00 70 49 -27 +26 00 6f e1 49 -29 +28 ef e0 80 @@ -3028,11 +3028,11 @@ d8 c0 49 -54 +53 68 48 c9 -53 +52 18 42 72 @@ -3059,7 +3059,7 @@ 00 70 49 -27 +26 02 20 60 @@ -3068,7 +3068,7 @@ da 20 49 -13 +12 20 40 7d @@ -3112,7 +3112,7 @@ da 20 49 -13 +12 20 40 7d @@ -3160,7 +3160,7 @@ 6f e0 c8 -0f +0e 20 7a 00 @@ -3172,7 +3172,7 @@ d8 c0 48 -10 +0f d8 e0 00 @@ -3192,7 +3192,7 @@ d8 a0 48 -0f +0e 20 20 03 @@ -3200,7 +3200,7 @@ 6f e0 c8 -50 +4f 20 7a 00 @@ -3212,7 +3212,7 @@ d8 c0 48 -51 +50 d8 e0 00 @@ -3232,7 +3232,7 @@ d8 a0 48 -50 +4f df 20 00 @@ -3244,7 +3244,7 @@ 6f e0 c8 -91 +90 20 7a 00 @@ -3256,7 +3256,7 @@ d8 c0 48 -92 +91 d8 e0 00 @@ -3276,7 +3276,7 @@ d8 a0 48 -91 +90 20 20 03 @@ -3284,7 +3284,7 @@ 6f e0 c8 -d2 +d1 20 7a 00 @@ -3296,7 +3296,7 @@ d8 c0 48 -d3 +d2 d8 e0 00 @@ -3316,7 +3316,7 @@ d8 a0 48 -d2 +d1 20 20 03 @@ -4148,7 +4148,7 @@ 6f e0 c9 -26 +25 20 7a 00 @@ -4167,16 +4167,16 @@ 00 6f e0 -c6 -16 -c1 -80 +c8 +0b +20 +7a 00 00 6f e1 48 -0d +0c 1f e0 fe @@ -4184,7 +4184,7 @@ 67 e1 48 -0d +0c d8 40 04 @@ -4204,7 +4204,7 @@ 67 e1 48 -0d +0c 6f e0 c8 @@ -4293,8 +4293,8 @@ 20 31 95 -c3 -34 +9c +78 aa 55 40 @@ -4770,13 +4770,13 @@ 00 09 48 -03 +04 00 aa 55 09 00 -1c +1b 49 08 00 @@ -4791,9 +4791,9 @@ 55 11 00 -29 +28 49 -2c +2b 49 0e 77 @@ -4814,7 +4814,7 @@ 55 16 00 -53 +52 49 15 7e @@ -5030,8 +5030,8 @@ aa aa 55 -ba +b7 a1 -8a -94 +7e +63 f0 Index: output/program.lis =================================================================== --- /1121s/branch/dongle/1m/USB_XZR/usb_1m_ai/output/program.lis (revision 3896) +++ /1121s/branch/dongle/1m/USB_XZR/usb_1m_ai/output/program.lis (working copy) @@ -339,56 +339,56 @@ 0116 20200155 branch p_dongle_hci_event_invalid_packet p_dongle_usb_hci_cmd_get_deivce_info: -0117 70485040 jam 0x40 ,mem_dongle_usb_ep2_data -0118 704851a1 jam report_id_data_in ,mem_dongle_usb_ep2_data + 1 -0119 70485202 jam 0x02 ,mem_dongle_usb_ep2_data + 2 -011a 70485301 jam 0x01 ,mem_dongle_usb_ep2_data + 3 -011b 7048540b jam 0x0b ,mem_dongle_usb_ep2_data + 4 +0117 70484f40 jam 0x40 ,mem_dongle_usb_ep2_data +0118 704850a1 jam report_id_data_in ,mem_dongle_usb_ep2_data + 1 +0119 70485102 jam 0x02 ,mem_dongle_usb_ep2_data + 2 +011a 70485201 jam 0x01 ,mem_dongle_usb_ep2_data + 3 +011b 7048530b jam 0x0b ,mem_dongle_usb_ep2_data + 4 011c 6fe347ff fetch 6 ,mem_usb_get_report_sn_data -011d 67e34855 store 6 ,mem_dongle_usb_ep2_data + 5 +011d 67e34854 store 6 ,mem_dongle_usb_ep2_data + 5 011e 6fe14807 fetch 2 ,mem_usb_get_report_mouse_version_data -011f 67e1485b store 2 ,mem_dongle_usb_ep2_data + 11 +011f 67e1485a store 2 ,mem_dongle_usb_ep2_data + 11 0120 6fe14809 fetch 2 ,mem_dongle_version -0121 67e1485d store 2 ,mem_dongle_usb_ep2_data + 13 +0121 67e1485c store 2 ,mem_dongle_usb_ep2_data + 13 0122 70090c23 jam usb_ep2_device_info ,mem_usb_ep2_data 0123 20200269 branch p_dongle_usb_tx_enable_ep2 p_dongle_usb_hci_cmd_get_dpi: -0124 70489701 jam 0x01 ,mem_usb_dpi_info_data + 6 +0124 70489601 jam 0x01 ,mem_usb_dpi_info_data + 6 p_dongle_usb_tx_ep2_dpi_data: -0125 70489140 jam 0x40 ,mem_usb_dpi_info_data -0126 704892a1 jam report_id_data_in ,mem_usb_dpi_info_data + 1 -0127 70489302 jam 0x02 ,mem_usb_dpi_info_data + 2 -0128 70489402 jam 0x02 ,mem_usb_dpi_info_data + 3 -0129 70489501 jam 0x01 ,mem_usb_dpi_info_data + 4 +0125 70489040 jam 0x40 ,mem_usb_dpi_info_data +0126 704891a1 jam report_id_data_in ,mem_usb_dpi_info_data + 1 +0127 70489202 jam 0x02 ,mem_usb_dpi_info_data + 2 +0128 70489302 jam 0x02 ,mem_usb_dpi_info_data + 3 +0129 70489401 jam 0x01 ,mem_usb_dpi_info_data + 4 012a 6fe0c805 fetch 1 ,mem_usb_get_report_dpi_data -012b 67e0c896 store 1 ,mem_usb_dpi_info_data + 5 +012b 67e0c895 store 1 ,mem_usb_dpi_info_data + 5 012c 70090c24 jam usb_ep2_dpi ,mem_usb_ep2_data 012d 20200269 branch p_dongle_usb_tx_enable_ep2 p_dongle_usb_hci_cmd_get_sn: -012e 70485040 jam 0x40 ,mem_dongle_usb_ep2_data -012f 704851a1 jam report_id_data_in ,mem_dongle_usb_ep2_data + 1 -0130 70485202 jam 0x02 ,mem_dongle_usb_ep2_data + 2 -0131 70485303 jam 0x03 ,mem_dongle_usb_ep2_data + 3 -0132 70485406 jam 0x06 ,mem_dongle_usb_ep2_data + 4 +012e 70484f40 jam 0x40 ,mem_dongle_usb_ep2_data +012f 704850a1 jam report_id_data_in ,mem_dongle_usb_ep2_data + 1 +0130 70485102 jam 0x02 ,mem_dongle_usb_ep2_data + 2 +0131 70485203 jam 0x03 ,mem_dongle_usb_ep2_data + 3 +0132 70485306 jam 0x06 ,mem_dongle_usb_ep2_data + 4 0133 6fe347ff fetch 6 ,mem_usb_get_report_sn_data -0134 67e34855 store 6 ,mem_dongle_usb_ep2_data + 5 +0134 67e34854 store 6 ,mem_dongle_usb_ep2_data + 5 0135 70090c26 jam usb_ep2_sn ,mem_usb_ep2_data 0136 20200269 branch p_dongle_usb_tx_enable_ep2 p_dongle_usb_hci_cmd_get_battery: -0137 7048d801 jam 0x01 ,mem_usb_battery_info_data + 6 +0137 7048d701 jam 0x01 ,mem_usb_battery_info_data + 6 p_dongle_usb_tx_ep2_battery_data: -0138 7048d240 jam 0x40 ,mem_usb_battery_info_data -0139 7048d3a1 jam report_id_data_in ,mem_usb_battery_info_data + 1 -013a 7048d402 jam 0x02 ,mem_usb_battery_info_data + 2 -013b 7048d506 jam 0x06 ,mem_usb_battery_info_data + 3 -013c 7048d601 jam 0x01 ,mem_usb_battery_info_data + 4 +0138 7048d140 jam 0x40 ,mem_usb_battery_info_data +0139 7048d2a1 jam report_id_data_in ,mem_usb_battery_info_data + 1 +013a 7048d302 jam 0x02 ,mem_usb_battery_info_data + 2 +013b 7048d406 jam 0x06 ,mem_usb_battery_info_data + 3 +013c 7048d501 jam 0x01 ,mem_usb_battery_info_data + 4 013d 6fe0c806 fetch 1 ,mem_usb_get_report_battery_data -013e 67e0c8d7 store 1 ,mem_usb_battery_info_data + 5 +013e 67e0c8d6 store 1 ,mem_usb_battery_info_data + 5 013f 70090c25 jam usb_ep2_battery ,mem_usb_ep2_data 0140 20200269 branch p_dongle_usb_tx_enable_ep2 @@ -399,28 +399,28 @@ 0144 20600000 rtn p_dongle_usb_device_connect: -0145 70480f40 jam 0x40 ,mem_usb_rf_state_data -0146 704810a1 jam report_id_data_in ,mem_usb_rf_state_data + 1 -0147 70481102 jam 0x02 ,mem_usb_rf_state_data + 2 -0148 70481205 jam 0x05 ,mem_usb_rf_state_data + 3 -0149 70481301 jam 0x01 ,mem_usb_rf_state_data + 4 -014a 70481401 jam 0x01 ,mem_usb_rf_state_data + 5 +0145 70480e40 jam 0x40 ,mem_usb_rf_state_data +0146 70480fa1 jam report_id_data_in ,mem_usb_rf_state_data + 1 +0147 70481002 jam 0x02 ,mem_usb_rf_state_data + 2 +0148 70481105 jam 0x05 ,mem_usb_rf_state_data + 3 +0149 70481201 jam 0x01 ,mem_usb_rf_state_data + 4 +014a 70481301 jam 0x01 ,mem_usb_rf_state_data + 5 014b 70090c27 jam usb_ep2_mskb_state ,mem_usb_ep2_data 014c 20200269 branch p_dongle_usb_tx_enable_ep2 p_dongle_usb_device_disconnect: -014d 70480f40 jam 0x40 ,mem_usb_rf_state_data -014e 704810a1 jam report_id_data_in ,mem_usb_rf_state_data + 1 -014f 70481102 jam 0x02 ,mem_usb_rf_state_data + 2 -0150 70481205 jam 0x05 ,mem_usb_rf_state_data + 3 -0151 70481301 jam 0x01 ,mem_usb_rf_state_data + 4 -0152 70481400 jam 0x00 ,mem_usb_rf_state_data + 5 +014d 70480e40 jam 0x40 ,mem_usb_rf_state_data +014e 70480fa1 jam report_id_data_in ,mem_usb_rf_state_data + 1 +014f 70481002 jam 0x02 ,mem_usb_rf_state_data + 2 +0150 70481105 jam 0x05 ,mem_usb_rf_state_data + 3 +0151 70481201 jam 0x01 ,mem_usb_rf_state_data + 4 +0152 70481300 jam 0x00 ,mem_usb_rf_state_data + 5 0153 70090c27 jam usb_ep2_mskb_state ,mem_usb_ep2_data 0154 20200269 branch p_dongle_usb_tx_enable_ep2 p_dongle_hci_event_invalid_packet: -0155 70480f40 jam 0x40 ,mem_usb_rf_state_data -0156 704810a1 jam 0xA1 ,mem_usb_rf_state_data + 1 +0155 70480e40 jam 0x40 ,mem_usb_rf_state_data +0156 70480fa1 jam 0xA1 ,mem_usb_rf_state_data + 1 0157 d8400001 arg 1 ,temp p_dongle_hci_event_ack_packet: @@ -436,7 +436,7 @@ 015f 67e0c6e0 store 1 ,mem_dongle_usb_len 0160 604c0678 storet 8 ,mem_temp 0161 684c0678 fetcht 8 ,mem_temp -0162 d8a04811 arg mem_usb_rf_state_data + 2 ,contw +0162 d8a04810 arg mem_usb_rf_state_data + 2 ,contw 0163 6fe1c6de fetch 3 ,mem_dongle_usb_header 0164 e7e18005 istore 3 ,contw 0165 1a627e00 copy regc ,pdata @@ -627,7 +627,7 @@ 01fc 20600000 rtn p_usb_tx_ep2_queue_buff_check: -01fd da204913 arg mem_usb_ep2_fifo ,rega +01fd da204912 arg mem_usb_ep2_fifo ,rega 01fe 20407da3 call fifo_is_empty 01ff 207a0000 rtn blank 0200 20204837 branch dongle_usb_tx_enable_ep2 @@ -647,7 +647,7 @@ 020c 6fe08902 fetch 1 ,mem_usb_clear_remote_wakeup 020d 243a7c06 nbranch usb_tx_fifo_release ,blank 020e 20400272 call p_usb_tx_data_ep1 -020f 6fe0c926 fetch 1 ,mem_usb_website_step +020f 6fe0c925 fetch 1 ,mem_usb_website_step 0210 245a0212 ncall p_usb_ms_data_clear_key_value ,blank 0211 202002fb branch p_usb_tx_data_ep2 @@ -666,7 +666,7 @@ p_g24_receive_packet_start1: 021a 20400214 call p_dongle_usb_connect_mouse_check 021b 58000000 setarg 0 -021c 67e1c80c store 3 ,mem_dongle_no_data_flag +021c 67e1480c store 2 ,mem_dongle_no_data_count 021d 6fe0c5ea fetch 1 ,mem_24g_rxdata_temp + 2 021e c000b3c4 beq datatype_device1 ,g24_data_device1 021f c00133d3 beq datatype_device2 ,g24_data_device2 @@ -767,12 +767,12 @@ p_dongle_usb_tx_enable_ep2: 0269 6fe0890e fetch 1 ,mem_usb_device_enumeration_endflag 026a 207a0000 rtn blank -026b da204913 arg mem_usb_ep2_fifo ,rega +026b da204912 arg mem_usb_ep2_fifo ,rega 026c 20407da5 call fifo_is_full 026d 247a0000 nrtn blank 026e 6fe0890c fetch 1 ,mem_usb_ep2_data 026f 67e0866f store 1 ,mem_fifo_temp -0270 da204913 arg mem_usb_ep2_fifo ,rega +0270 da204912 arg mem_usb_ep2_fifo ,rega 0271 20207d8b branch fifo_in p_usb_tx_data_ep1: @@ -791,7 +791,7 @@ 027e 2020235a branch assert p_usb_tx_http_data_set: -027f 6fe0c926 fetch 1 ,mem_usb_website_step +027f 6fe0c925 fetch 1 ,mem_usb_website_step 0280 c000028b beq key_release ,p_usb_webstie_key_release_data 0281 c000828d beq website_win ,p_usb_website_winr_data 0282 c001029b beq website_r_space_release ,p_usb_website_r_space_release_data @@ -805,104 +805,104 @@ 028a 20600000 rtn p_usb_webstie_key_release_data: -028b 70492601 jam website_win ,mem_usb_website_step +028b 70492501 jam website_win ,mem_usb_website_step 028c 20204832 branch dongle_g24_ms_blank_data_tx_ep2 p_usb_website_winr_data: -028d dfe0492c arg mem_usb_website_info + 1 ,pdata -028e 67e14929 store 2 ,mem_usb_website_ptr +028d dfe0492b arg mem_usb_website_info + 1 ,pdata +028e 67e14928 store 2 ,mem_usb_website_ptr 028f 6fe088fa fetch 1 ,mem_usb_tx_mac_enable 0290 c0000293 beq 0 ,p_usb_tx_winos_winr_data 0291 c0008297 beq 1 ,p_usb_tx_macos_winr_data 0292 20600000 rtn p_usb_tx_winos_winr_data: -0293 70492602 jam website_r_space_release ,mem_usb_website_step -0294 6fe1c91c fetch 3 ,mem_usb_win_cmd +0293 70492502 jam website_r_space_release ,mem_usb_website_step +0294 6fe1c91b fetch 3 ,mem_usb_win_cmd 0295 67e18923 store 3 ,mem_usb_kb_data 0296 20207c28 branch usb_tx_kb_normal_data p_usb_tx_macos_winr_data: -0297 70492602 jam website_r_space_release ,mem_usb_website_step -0298 6fe1c91f fetch 3 ,mem_usb_mac_cmd +0297 70492502 jam website_r_space_release ,mem_usb_website_step +0298 6fe1c91e fetch 3 ,mem_usb_mac_cmd 0299 67e18923 store 3 ,mem_usb_kb_data 029a 20207c28 branch usb_tx_kb_normal_data p_usb_website_r_space_release_data: -029b 70492603 jam website_win_release ,mem_usb_website_step -029c 6fe0c91c fetch 1 ,mem_usb_win_cmd +029b 70492503 jam website_win_release ,mem_usb_website_step +029c 6fe0c91b fetch 1 ,mem_usb_win_cmd 029d 67e08923 store 1 ,mem_usb_kb_data 029e 20207c28 branch usb_tx_kb_normal_data p_usb_website_win_release_data: -029f 70492604 jam website_wait ,mem_usb_website_step +029f 70492504 jam website_wait ,mem_usb_website_step p_usb_webstie_release_data: 02a0 d8a00923 arg mem_usb_kb_data ,contw 02a1 df200008 arg 8 ,loopcnt 02a2 20407ca3 call memset0 -02a3 70492800 jam 0 ,mem_usb_website_release_flag +02a3 70492700 jam 0 ,mem_usb_website_release_flag 02a4 20207c28 branch usb_tx_kb_normal_data p_usb_website_enter_data1: -02a5 70492607 jam website_enter_release_1 ,mem_usb_website_step +02a5 70492507 jam website_enter_release_1 ,mem_usb_website_step p_usb_webstie_enter_data: -02a6 6fe1c922 fetch 3 ,mem_usb_kb_enter +02a6 6fe1c921 fetch 3 ,mem_usb_kb_enter 02a7 67e18923 store 3 ,mem_usb_kb_data 02a8 20207c28 branch usb_tx_kb_normal_data p_usb_website_enter_release_data1: -02a9 70492608 jam website_enter_2 ,mem_usb_website_step +02a9 70492508 jam website_enter_2 ,mem_usb_website_step 02aa 202002a0 branch p_usb_webstie_release_data p_usb_website_enter_data2: -02ab 70492609 jam website_enter_release_2 ,mem_usb_website_step +02ab 70492509 jam website_enter_release_2 ,mem_usb_website_step 02ac 202002a6 branch p_usb_webstie_enter_data p_usb_website_enter_release_data2: -02ad 70492600 jam website_done ,mem_usb_website_step +02ad 70492500 jam website_done ,mem_usb_website_step 02ae 202002a0 branch p_usb_webstie_release_data p_usb_website_wait_tx_data: -02af 6fe0c925 fetch 1 ,mem_usb_website_wait_count +02af 6fe0c924 fetch 1 ,mem_usb_website_wait_count 02b0 1fe0fe01 increase 1 ,pdata -02b1 67e0c925 store 1 ,mem_usb_website_wait_count +02b1 67e0c924 store 1 ,mem_usb_website_wait_count 02b2 c1878000 rtnne website_wait_count -02b3 70492500 jam 0 ,mem_usb_website_wait_count -02b4 70492605 jam website_data ,mem_usb_website_step +02b3 70492400 jam 0 ,mem_usb_website_wait_count +02b4 70492505 jam website_data ,mem_usb_website_step 02b5 20600000 rtn p_usb_website_data: -02b6 6fe0c928 fetch 1 ,mem_usb_website_release_flag +02b6 6fe0c927 fetch 1 ,mem_usb_website_release_flag 02b7 c00082a0 beq 1 ,p_usb_webstie_release_data 02b8 c00002bc beq 0 ,p_usb_website_info_data 02b9 20600000 rtn p_usb_webstie_info_data_done: -02ba 70492606 jam website_enter_1 ,mem_usb_website_step +02ba 70492506 jam website_enter_1 ,mem_usb_website_step 02bb 20600000 rtn p_usb_website_info_data: -02bc d840492c arg mem_usb_website_info + 1 ,temp -02bd 6fe0c92b fetch 1 ,mem_usb_website_info +02bc d840492b arg mem_usb_website_info + 1 ,temp +02bd 6fe0c92a fetch 1 ,mem_usb_website_info 02be 98408400 iadd temp ,temp -02bf 6fe14929 fetch 2 ,mem_usb_website_ptr +02bf 6fe14928 fetch 2 ,mem_usb_website_ptr 02c0 98467c00 isub temp ,null 02c1 202282ba branch p_usb_webstie_info_data_done ,zero 02c2 204002cc call p_usb_tx_website_acii2hidkey 02c3 204002ee call p_usb_tx_website_need_shift -02c4 6fe0c927 fetch 1 ,mem_usb_website_shift_flag +02c4 6fe0c926 fetch 1 ,mem_usb_website_shift_flag 02c5 67e08923 store 1 ,mem_usb_kb_data 02c6 62208925 storer rega ,1 ,mem_usb_kb_data + 2 -02c7 6fe14929 fetch 2 ,mem_usb_website_ptr +02c7 6fe14928 fetch 2 ,mem_usb_website_ptr 02c8 1fe0fe01 increase 1 ,pdata -02c9 67e14929 store 2 ,mem_usb_website_ptr -02ca 70492801 jam 1 ,mem_usb_website_release_flag +02c9 67e14928 store 2 ,mem_usb_website_ptr +02ca 70492701 jam 1 ,mem_usb_website_release_flag 02cb 20207c28 branch usb_tx_kb_normal_data p_usb_tx_website_acii2hidkey: -02cc 68494929 fetcht 2 ,mem_usb_website_ptr +02cc 68494928 fetcht 2 ,mem_usb_website_ptr 02cd efe08002 ifetch 1 ,temp 02ce 1fe67c7a sub pdata ,0x7a ,null 02cf 242102d3 nbranch p_usb_tx_website_acii2hidkey1 ,positive @@ -954,11 +954,11 @@ 02ed 20600000 rtn p_usb_tx_website_need_shift: -02ee 70492700 jam 0 ,mem_usb_website_shift_flag -02ef 6fe14929 fetch 2 ,mem_usb_website_ptr +02ee 70492600 jam 0 ,mem_usb_website_shift_flag +02ef 6fe14928 fetch 2 ,mem_usb_website_ptr 02f0 efe0803f ifetch 1 ,pdata -02f1 d8c04954 arg mem_usb_website_info_sign + 1 ,contr -02f2 6848c953 fetcht 1 ,mem_usb_website_info_sign +02f1 d8c04953 arg mem_usb_website_info_sign + 1 ,contr +02f2 6848c952 fetcht 1 ,mem_usb_website_info_sign 02f3 18427200 copy temp ,loopcnt p_usb_tx_website_need_shift_check_loop: @@ -969,11 +969,11 @@ 02f8 20600000 rtn p_usb_tx_website_need_shift_setflag: -02f9 70492702 jam 2 ,mem_usb_website_shift_flag +02f9 70492602 jam 2 ,mem_usb_website_shift_flag 02fa 20600000 rtn p_usb_tx_data_ep2: -02fb da204913 arg mem_usb_ep2_fifo ,rega +02fb da204912 arg mem_usb_ep2_fifo ,rega 02fc 20407da3 call fifo_is_empty 02fd 207a0000 rtn blank 02fe 6ff08c25 fetch 1 ,core_usb_txbusy @@ -984,7 +984,7 @@ 0303 6fe0890d fetch 1 ,mem_usb_tx_enable 0304 793ffe02 set0 2 ,pdata 0305 67e0890d store 1 ,mem_usb_tx_enable -0306 da204913 arg mem_usb_ep2_fifo ,rega +0306 da204912 arg mem_usb_ep2_fifo ,rega 0307 20407d97 call fifo_out 0308 207a0000 rtn blank 0309 c0107c09 beq usb_ep2_ms ,usb_tx_ms_data @@ -998,54 +998,54 @@ 0311 2020235a branch assert p_usb_tx_rf_state_data: -0312 6fe0c80f fetch 1 ,mem_usb_rf_state_data +0312 6fe0c80e fetch 1 ,mem_usb_rf_state_data 0313 207a0000 rtn blank 0314 1fe27200 copy pdata ,loopcnt -0315 d8c04810 arg mem_usb_rf_state_data + 1 ,contr +0315 d8c0480f arg mem_usb_rf_state_data + 1 ,contr 0316 d8e00002 arg 2 ,queue 0317 da200759 arg mem_usb_txbuf2 ,rega 0318 62310c0c storer rega ,2 ,core_usb_tx_saddr2 0319 20407bd2 call usb_tx_buf -031a d8a0480f arg mem_usb_rf_state_data ,contw +031a d8a0480e arg mem_usb_rf_state_data ,contw 031b 20200325 branch p_usb_tx_buff_clr p_usb_tx_dongle_ep2_data: -031c 6fe0c850 fetch 1 ,mem_dongle_usb_ep2_data +031c 6fe0c84f fetch 1 ,mem_dongle_usb_ep2_data 031d 207a0000 rtn blank 031e 1fe27200 copy pdata ,loopcnt -031f d8c04851 arg mem_dongle_usb_ep2_data + 1 ,contr +031f d8c04850 arg mem_dongle_usb_ep2_data + 1 ,contr 0320 d8e00002 arg 2 ,queue 0321 da200759 arg mem_usb_txbuf2 ,rega 0322 62310c0c storer rega ,2 ,core_usb_tx_saddr2 0323 20407bd2 call usb_tx_buf -0324 d8a04850 arg mem_dongle_usb_ep2_data ,contw +0324 d8a0484f arg mem_dongle_usb_ep2_data ,contw p_usb_tx_buff_clr: 0325 df200041 arg 65 ,loopcnt 0326 20207ca1 branch clear_mem p_usb_tx_dongle_ep2_dpi_data: -0327 6fe0c891 fetch 1 ,mem_usb_dpi_info_data +0327 6fe0c890 fetch 1 ,mem_usb_dpi_info_data 0328 207a0000 rtn blank 0329 1fe27200 copy pdata ,loopcnt -032a d8c04892 arg mem_usb_dpi_info_data + 1 ,contr +032a d8c04891 arg mem_usb_dpi_info_data + 1 ,contr 032b d8e00002 arg 2 ,queue 032c da200759 arg mem_usb_txbuf2 ,rega 032d 62310c0c storer rega ,2 ,core_usb_tx_saddr2 032e 20407bd2 call usb_tx_buf -032f d8a04891 arg mem_usb_dpi_info_data ,contw +032f d8a04890 arg mem_usb_dpi_info_data ,contw 0330 20200325 branch p_usb_tx_buff_clr p_usb_tx_dongle_ep2_battery_data: -0331 6fe0c8d2 fetch 1 ,mem_usb_battery_info_data +0331 6fe0c8d1 fetch 1 ,mem_usb_battery_info_data 0332 207a0000 rtn blank 0333 1fe27200 copy pdata ,loopcnt -0334 d8c048d3 arg mem_usb_battery_info_data + 1 ,contr +0334 d8c048d2 arg mem_usb_battery_info_data + 1 ,contr 0335 d8e00002 arg 2 ,queue 0336 da200759 arg mem_usb_txbuf2 ,rega 0337 62310c0c storer rega ,2 ,core_usb_tx_saddr2 0338 20407bd2 call usb_tx_buf -0339 d8a048d2 arg mem_usb_battery_info_data ,contw +0339 d8a048d1 arg mem_usb_battery_info_data ,contw 033a 20200325 branch p_usb_tx_buff_clr p_rx_dcoc: @@ -1317,23 +1317,23 @@ 0408 20207ce1 branch timer_init p_g24_http_over_pack_check: -0409 6fe0c926 fetch 1 ,mem_usb_website_step +0409 6fe0c925 fetch 1 ,mem_usb_website_step 040a 207a0000 rtn blank 040b 2020022a branch p_dongle_usb_tx_http_data p_g24_dongle_disconnect_state_check: 040c 6fe0c62b fetch 1 ,mem_24g_bind_device_living 040d c4000000 rtnbit0 0 -040e 6fe0c616 fetch 1 ,mem_24g_work_mode -040f c1800000 rtnne dongle_work -0410 6fe1480d fetch 2 ,mem_dongle_no_data_count +040e 6fe0c80b fetch 1 ,mem_dongle_connect_mouse_flag +040f 207a0000 rtn blank +0410 6fe1480c fetch 2 ,mem_dongle_no_data_count 0411 1fe0fe01 increase 1 ,pdata -0412 67e1480d store 2 ,mem_dongle_no_data_count +0412 67e1480c store 2 ,mem_dongle_no_data_count 0413 d84004b0 arg 0x4b0 ,temp 0414 98467c00 isub temp ,null 0415 24610000 nrtn positive 0416 58000000 setarg 0 -0417 67e1480d store 2 ,mem_dongle_no_data_count +0417 67e1480c store 2 ,mem_dongle_no_data_count 0418 6fe0c80b fetch 1 ,mem_dongle_connect_mouse_flag 0419 207a0000 rtn blank 041a 70480b00 jam 0 ,mem_dongle_connect_mouse_flag Index: program/patch.prog =================================================================== --- /1121s/branch/dongle/1m/USB_XZR/usb_1m_ai/program/patch.prog (revision 3896) +++ /1121s/branch/dongle/1m/USB_XZR/usb_1m_ai/program/patch.prog (working copy) @@ -739,7 +739,7 @@ p_g24_receive_packet_start1: call p_dongle_usb_connect_mouse_check setarg 0 - store 3,mem_dongle_no_data_flag + store 2,mem_dongle_no_data_count fetch 1,mem_24g_rxdata_temp+2 beq DATATYPE_DEVICE1,g24_data_device1 //mouse beq DATATYPE_DEVICE2,g24_data_device2 //keyboard @@ -1368,10 +1368,8 @@ p_g24_dongle_disconnect_state_check: fetch 1,mem_24g_bind_device_living rtnbit0 0 - fetch 1,mem_24g_work_mode - rtnne DONGLE_WORK -// fetch 1,mem_dongle_no_data_flag -// rtn blank + fetch 1,mem_dongle_connect_mouse_flag + rtn blank fetch 2,mem_dongle_no_data_count increase 1,pdata store 2,mem_dongle_no_data_count Index: sched/dongle.dat =================================================================== --- /1121s/branch/dongle/1m/USB_XZR/usb_1m_ai/sched/dongle.dat (revision 3896) +++ /1121s/branch/dongle/1m/USB_XZR/usb_1m_ai/sched/dongle.dat (working copy) @@ -141,7 +141,7 @@ 81 02 C0 -mem_dongle_version:03 00 +mem_dongle_version:04 00 mem_usb_win_cmd:08 00 15 #win+r mem_usb_mac_cmd:08 00 2c #command+space