Index: output/eeprom.dat
===================================================================
--- /1121s/branch/dongle/1m/usb_1m/output/eeprom.dat	(revision 4006)
+++ /1121s/branch/dongle/1m/usb_1m/output/eeprom.dat	(working copy)
@@ -2,112 +2,120 @@
 02
 aa
 55
-fe
-07
+a6
+08
 c2
 84
 00
-12
+13
 c0
 00
 00
-1c
+1e
 c0
 01
 00
-22
+43
 c0
 08
 80
-2b
+4c
 c0
 0a
 01
-8e
+b8
 c0
 0a
 80
-c7
+f1
 c0
 0c
 00
-d5
+ff
 c0
 0c
 80
-7b
+ab
 c0
 0d
 00
-39
+68
+c0
+0e
+00
+5a
 c0
 1b
-81
-ec
+82
+16
 c0
 1c
 00
-9a
+c4
 c0
 1c
 80
-96
+c0
 c0
 1e
-81
-e8
+82
+12
 c0
 62
 80
-93
+bd
 c0
 6d
 01
-5f
+89
 c0
 6e
 01
-6f
+99
 c0
 7f
-80
-df
+81
+09
 20
 20
 23
 5a
 c0
 00
-00
-fc
+01
+26
 c0
 03
 01
-1b
+45
 c0
 1c
 81
-aa
+d4
 c0
 26
 81
-ae
+d8
 c0
 37
-81
-f5
+82
+1f
 c0
 41
 01
-b0
+da
 c0
 44
 01
-d0
+fa
 c0
 45
-01
-dd
+02
+07
+c0
+45
+80
+24
 c1
 7f
 80
@@ -140,6 +148,130 @@
 20
 20
 03
+6f
+e0
+c6
+16
+c1
+83
+80
+00
+20
+40
+34
+76
+20
+40
+34
+ae
+20
+40
+33
+f1
+24
+37
+b3
+be
+20
+40
+35
+06
+20
+42
+b3
+ad
+6f
+e0
+c6
+0a
+20
+5a
+34
+4d
+70
+46
+16
+00
+6f
+e0
+c6
+15
+79
+20
+7e
+00
+67
+e0
+c6
+15
+20
+40
+34
+ec
+6f
+e0
+c6
+11
+1f
+e6
+7c
+02
+24
+42
+b5
+04
+20
+40
+33
+be
+20
+40
+33
+fe
+20
+40
+35
+06
+20
+22
+b4
+a7
+6f
+e2
+45
+8f
+68
+4a
+46
+34
+98
+46
+7c
+00
+20
+22
+b4
+aa
+6f
+e2
+45
+8f
+68
+4a
+46
+30
+98
+46
+7c
+00
+20
+22
+b4
+ac
+20
+60
+00
+00
 20
 40
 75
@@ -175,7 +307,7 @@
 20
 20
 00
-22
+43
 70
 8a
 0f
@@ -233,6 +365,66 @@
 00
 00
 70
+8a
+20
+30
+70
+8a
+23
+dd
+20
+40
+21
+d0
+58
+00
+00
+00
+67
+e1
+06
+70
+d8
+40
+3a
+98
+6f
+e1
+06
+70
+1f
+e0
+fe
+01
+67
+e1
+06
+70
+98
+46
+7c
+00
+20
+21
+6c
+a3
+6f
+f0
+8a
+7c
+c3
+00
+00
+60
+20
+20
+22
+9a
+70
+8a
+88
+40
+70
 89
 46
 0d
@@ -259,7 +451,7 @@
 20
 40
 00
-9c
+c6
 6f
 e0
 c4
@@ -283,7 +475,7 @@
 c0
 08
 00
-70
+a0
 6f
 e0
 c4
@@ -327,7 +519,7 @@
 20
 40
 00
-62
+92
 70
 80
 43
@@ -351,15 +543,15 @@
 20
 40
 01
-31
+5b
 20
 40
 01
-5c
+86
 20
 40
 00
-5c
+8c
 70
 41
 48
@@ -371,7 +563,7 @@
 20
 20
 01
-5e
+88
 20
 75
 80
@@ -403,7 +595,7 @@
 c0
 0c
 00
-68
+98
 6f
 e0
 c4
@@ -495,7 +687,7 @@
 20
 20
 00
-4e
+7e
 6f
 e0
 c1
@@ -505,21 +697,17 @@
 22
 25
 c0
-05
-00
-82
-c0
 4f
 00
-87
+b1
 c0
 4f
 80
-8b
+b5
 c0
 50
 00
-8f
+b9
 20
 20
 22
@@ -527,26 +715,6 @@
 70
 8a
 14
-25
-58
-a9
-3f
-3f
-67
-f1
-8a
-60
-70
-8a
-63
-1f
-20
-60
-00
-00
-70
-8a
-14
 17
 58
 25
@@ -631,7 +799,7 @@
 20
 35
 80
-c3
+ed
 6f
 e2
 02
@@ -799,7 +967,7 @@
 20
 20
 00
-ad
+d7
 20
 40
 68
@@ -922,8 +1090,8 @@
 96
 c0
 00
-80
-ee
+81
+18
 d8
 a0
 08
@@ -954,8 +1122,8 @@
 00
 20
 20
-00
-fc
+01
+26
 d8
 a0
 08
@@ -974,8 +1142,8 @@
 0c
 c0
 00
-80
-f6
+81
+20
 70
 08
 f7
@@ -1031,7 +1199,7 @@
 c0
 00
 01
-02
+2c
 20
 20
 23
@@ -1059,7 +1227,7 @@
 c0
 00
 81
-0a
+34
 c0
 01
 79
@@ -1079,7 +1247,7 @@
 c0
 04
 81
-0f
+39
 c0
 05
 fb
@@ -1098,8 +1266,8 @@
 75
 20
 40
-00
-dc
+01
+06
 70
 08
 f7
@@ -1187,11 +1355,11 @@
 20
 40
 01
-29
+53
 20
 20
 01
-2d
+57
 6f
 f0
 8c
@@ -1275,7 +1443,7 @@
 20
 40
 01
-4e
+78
 2a
 2f
 fe
@@ -1307,7 +1475,7 @@
 20
 40
 01
-4e
+78
 d8
 a0
 8a
@@ -1335,7 +1503,7 @@
 20
 21
 01
-43
+6d
 20
 20
 21
@@ -1439,7 +1607,7 @@
 20
 40
 01
-87
+b1
 70
 8a
 08
@@ -1475,7 +1643,7 @@
 20
 40
 01
-7d
+a7
 6f
 f0
 8a
@@ -1519,7 +1687,7 @@
 20
 40
 01
-87
+b1
 70
 80
 cd
@@ -1579,7 +1747,7 @@
 c3
 02
 81
-88
+b2
 68
 59
 01
@@ -1615,7 +1783,7 @@
 c0
 08
 01
-a7
+d1
 58
 00
 57
@@ -1659,7 +1827,7 @@
 c0
 08
 01
-a4
+ce
 58
 00
 2b
@@ -1695,7 +1863,7 @@
 20
 20
 01
-a0
+ca
 58
 00
 83
@@ -1707,7 +1875,7 @@
 20
 20
 01
-95
+bf
 6f
 e0
 c3
@@ -1747,7 +1915,7 @@
 c0
 11
 01
-b6
+e0
 c0
 7f
 b5
@@ -1763,7 +1931,7 @@
 20
 3a
 01
-bc
+e6
 6f
 e2
 45
@@ -1787,11 +1955,11 @@
 c0
 00
 81
-c0
+ea
 c0
 01
 01
-c8
+f2
 20
 60
 00
@@ -1811,7 +1979,7 @@
 c0
 01
 01
-c5
+ef
 20
 60
 00
@@ -1843,7 +2011,7 @@
 c0
 80
 01
-cd
+f7
 20
 60
 00
@@ -1922,8 +2090,8 @@
 00
 20
 40
-01
-e1
+02
+0b
 20
 20
 34
@@ -1958,8 +2126,8 @@
 07
 20
 40
-01
-ea
+02
+14
 20
 20
 48
@@ -2048,8 +2216,8 @@
 20
 31
 95
-0d
-20
+f3
+c9
 aa
 55
 40
@@ -2059,7 +2227,7 @@
 05
 00
 32
-07
+17
 00
 00
 80
@@ -2105,7 +2273,7 @@
 00
 00
 04
-05
+0d
 00
 00
 00
@@ -2164,8 +2332,8 @@
 01
 51
 31
-20
-10
+01
+06
 51
 31
 20
@@ -2200,7 +2368,7 @@
 44
 36
 27
-83
+86
 74
 12
 23
@@ -2224,6 +2392,13 @@
 55
 01
 00
+3f
+44
+8c
+aa
+55
+01
+00
 48
 41
 0c
@@ -2412,185 +2587,10 @@
 aa
 aa
 55
-28
-4c
-7c
-d7
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
+29
+4e
+20
+c6
 ff
 ff
 ff
@@ -8188,5 +8188,5 @@
 ff
 ff
 ff
-2d
-f9
+76
+6d
Index: output/flash.dat
===================================================================
--- /1121s/branch/dongle/1m/usb_1m/output/flash.dat	(revision 4006)
+++ /1121s/branch/dongle/1m/usb_1m/output/flash.dat	(working copy)
@@ -2,112 +2,120 @@
 02
 aa
 55
-fe
-07
+a6
+08
 c2
 84
 00
-12
+13
 c0
 00
 00
-1c
+1e
 c0
 01
 00
-22
+43
 c0
 08
 80
-2b
+4c
 c0
 0a
 01
-8e
+b8
 c0
 0a
 80
-c7
+f1
 c0
 0c
 00
-d5
+ff
 c0
 0c
 80
-7b
+ab
 c0
 0d
 00
-39
+68
+c0
+0e
+00
+5a
 c0
 1b
-81
-ec
+82
+16
 c0
 1c
 00
-9a
+c4
 c0
 1c
 80
-96
+c0
 c0
 1e
-81
-e8
+82
+12
 c0
 62
 80
-93
+bd
 c0
 6d
 01
-5f
+89
 c0
 6e
 01
-6f
+99
 c0
 7f
-80
-df
+81
+09
 20
 20
 23
 5a
 c0
 00
-00
-fc
+01
+26
 c0
 03
 01
-1b
+45
 c0
 1c
 81
-aa
+d4
 c0
 26
 81
-ae
+d8
 c0
 37
-81
-f5
+82
+1f
 c0
 41
 01
-b0
+da
 c0
 44
 01
-d0
+fa
 c0
 45
-01
-dd
+02
+07
+c0
+45
+80
+24
 c1
 7f
 80
@@ -140,6 +148,130 @@
 20
 20
 03
+6f
+e0
+c6
+16
+c1
+83
+80
+00
+20
+40
+34
+76
+20
+40
+34
+ae
+20
+40
+33
+f1
+24
+37
+b3
+be
+20
+40
+35
+06
+20
+42
+b3
+ad
+6f
+e0
+c6
+0a
+20
+5a
+34
+4d
+70
+46
+16
+00
+6f
+e0
+c6
+15
+79
+20
+7e
+00
+67
+e0
+c6
+15
+20
+40
+34
+ec
+6f
+e0
+c6
+11
+1f
+e6
+7c
+02
+24
+42
+b5
+04
+20
+40
+33
+be
+20
+40
+33
+fe
+20
+40
+35
+06
+20
+22
+b4
+a7
+6f
+e2
+45
+8f
+68
+4a
+46
+34
+98
+46
+7c
+00
+20
+22
+b4
+aa
+6f
+e2
+45
+8f
+68
+4a
+46
+30
+98
+46
+7c
+00
+20
+22
+b4
+ac
+20
+60
+00
+00
 20
 40
 75
@@ -175,7 +307,7 @@
 20
 20
 00
-22
+43
 70
 8a
 0f
@@ -233,6 +365,66 @@
 00
 00
 70
+8a
+20
+30
+70
+8a
+23
+dd
+20
+40
+21
+d0
+58
+00
+00
+00
+67
+e1
+06
+70
+d8
+40
+3a
+98
+6f
+e1
+06
+70
+1f
+e0
+fe
+01
+67
+e1
+06
+70
+98
+46
+7c
+00
+20
+21
+6c
+a3
+6f
+f0
+8a
+7c
+c3
+00
+00
+60
+20
+20
+22
+9a
+70
+8a
+88
+40
+70
 89
 46
 0d
@@ -259,7 +451,7 @@
 20
 40
 00
-9c
+c6
 6f
 e0
 c4
@@ -283,7 +475,7 @@
 c0
 08
 00
-70
+a0
 6f
 e0
 c4
@@ -327,7 +519,7 @@
 20
 40
 00
-62
+92
 70
 80
 43
@@ -351,15 +543,15 @@
 20
 40
 01
-31
+5b
 20
 40
 01
-5c
+86
 20
 40
 00
-5c
+8c
 70
 41
 48
@@ -371,7 +563,7 @@
 20
 20
 01
-5e
+88
 20
 75
 80
@@ -403,7 +595,7 @@
 c0
 0c
 00
-68
+98
 6f
 e0
 c4
@@ -495,7 +687,7 @@
 20
 20
 00
-4e
+7e
 6f
 e0
 c1
@@ -505,21 +697,17 @@
 22
 25
 c0
-05
-00
-82
-c0
 4f
 00
-87
+b1
 c0
 4f
 80
-8b
+b5
 c0
 50
 00
-8f
+b9
 20
 20
 22
@@ -527,26 +715,6 @@
 70
 8a
 14
-25
-58
-a9
-3f
-3f
-67
-f1
-8a
-60
-70
-8a
-63
-1f
-20
-60
-00
-00
-70
-8a
-14
 17
 58
 25
@@ -631,7 +799,7 @@
 20
 35
 80
-c3
+ed
 6f
 e2
 02
@@ -799,7 +967,7 @@
 20
 20
 00
-ad
+d7
 20
 40
 68
@@ -922,8 +1090,8 @@
 96
 c0
 00
-80
-ee
+81
+18
 d8
 a0
 08
@@ -954,8 +1122,8 @@
 00
 20
 20
-00
-fc
+01
+26
 d8
 a0
 08
@@ -974,8 +1142,8 @@
 0c
 c0
 00
-80
-f6
+81
+20
 70
 08
 f7
@@ -1031,7 +1199,7 @@
 c0
 00
 01
-02
+2c
 20
 20
 23
@@ -1059,7 +1227,7 @@
 c0
 00
 81
-0a
+34
 c0
 01
 79
@@ -1079,7 +1247,7 @@
 c0
 04
 81
-0f
+39
 c0
 05
 fb
@@ -1098,8 +1266,8 @@
 75
 20
 40
-00
-dc
+01
+06
 70
 08
 f7
@@ -1187,11 +1355,11 @@
 20
 40
 01
-29
+53
 20
 20
 01
-2d
+57
 6f
 f0
 8c
@@ -1275,7 +1443,7 @@
 20
 40
 01
-4e
+78
 2a
 2f
 fe
@@ -1307,7 +1475,7 @@
 20
 40
 01
-4e
+78
 d8
 a0
 8a
@@ -1335,7 +1503,7 @@
 20
 21
 01
-43
+6d
 20
 20
 21
@@ -1439,7 +1607,7 @@
 20
 40
 01
-87
+b1
 70
 8a
 08
@@ -1475,7 +1643,7 @@
 20
 40
 01
-7d
+a7
 6f
 f0
 8a
@@ -1519,7 +1687,7 @@
 20
 40
 01
-87
+b1
 70
 80
 cd
@@ -1579,7 +1747,7 @@
 c3
 02
 81
-88
+b2
 68
 59
 01
@@ -1615,7 +1783,7 @@
 c0
 08
 01
-a7
+d1
 58
 00
 57
@@ -1659,7 +1827,7 @@
 c0
 08
 01
-a4
+ce
 58
 00
 2b
@@ -1695,7 +1863,7 @@
 20
 20
 01
-a0
+ca
 58
 00
 83
@@ -1707,7 +1875,7 @@
 20
 20
 01
-95
+bf
 6f
 e0
 c3
@@ -1747,7 +1915,7 @@
 c0
 11
 01
-b6
+e0
 c0
 7f
 b5
@@ -1763,7 +1931,7 @@
 20
 3a
 01
-bc
+e6
 6f
 e2
 45
@@ -1787,11 +1955,11 @@
 c0
 00
 81
-c0
+ea
 c0
 01
 01
-c8
+f2
 20
 60
 00
@@ -1811,7 +1979,7 @@
 c0
 01
 01
-c5
+ef
 20
 60
 00
@@ -1843,7 +2011,7 @@
 c0
 80
 01
-cd
+f7
 20
 60
 00
@@ -1922,8 +2090,8 @@
 00
 20
 40
-01
-e1
+02
+0b
 20
 20
 34
@@ -1958,8 +2126,8 @@
 07
 20
 40
-01
-ea
+02
+14
 20
 20
 48
@@ -2048,8 +2216,8 @@
 20
 31
 95
-0d
-20
+f3
+c9
 aa
 55
 40
@@ -2059,7 +2227,7 @@
 05
 00
 32
-07
+17
 00
 00
 80
@@ -2105,7 +2273,7 @@
 00
 00
 04
-05
+0d
 00
 00
 00
@@ -2164,8 +2332,8 @@
 01
 51
 31
-20
-10
+01
+06
 51
 31
 20
@@ -2200,7 +2368,7 @@
 44
 36
 27
-83
+86
 74
 12
 23
@@ -2224,6 +2392,13 @@
 55
 01
 00
+3f
+44
+8c
+aa
+55
+01
+00
 48
 41
 0c
@@ -2412,185 +2587,10 @@
 aa
 aa
 55
-28
-4c
-7c
-d7
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
-ff
+29
+4e
+20
+c6
 ff
 ff
 ff
@@ -8188,5 +8188,5 @@
 ff
 ff
 ff
-2d
-f9
+76
+6d
Index: output/otp.dat
===================================================================
--- /1121s/branch/dongle/1m/usb_1m/output/otp.dat	(revision 4006)
+++ /1121s/branch/dongle/1m/usb_1m/output/otp.dat	(working copy)
@@ -11,112 +11,120 @@
 00
 aa
 55
-fe
-07
+a6
+08
 c2
 84
 00
-12
+13
 c0
 00
 00
-1c
+1e
 c0
 01
 00
-22
+43
 c0
 08
 80
-2b
+4c
 c0
 0a
 01
-8e
+b8
 c0
 0a
 80
-c7
+f1
 c0
 0c
 00
-d5
+ff
 c0
 0c
 80
-7b
+ab
 c0
 0d
 00
-39
+68
+c0
+0e
+00
+5a
 c0
 1b
-81
-ec
+82
+16
 c0
 1c
 00
-9a
+c4
 c0
 1c
 80
-96
+c0
 c0
 1e
-81
-e8
+82
+12
 c0
 62
 80
-93
+bd
 c0
 6d
 01
-5f
+89
 c0
 6e
 01
-6f
+99
 c0
 7f
-80
-df
+81
+09
 20
 20
 23
 5a
 c0
 00
-00
-fc
+01
+26
 c0
 03
 01
-1b
+45
 c0
 1c
 81
-aa
+d4
 c0
 26
 81
-ae
+d8
 c0
 37
-81
-f5
+82
+1f
 c0
 41
 01
-b0
+da
 c0
 44
 01
-d0
+fa
 c0
 45
-01
-dd
+02
+07
+c0
+45
+80
+24
 c1
 7f
 80
@@ -149,6 +157,130 @@
 20
 20
 03
+6f
+e0
+c6
+16
+c1
+83
+80
+00
+20
+40
+34
+76
+20
+40
+34
+ae
+20
+40
+33
+f1
+24
+37
+b3
+be
+20
+40
+35
+06
+20
+42
+b3
+ad
+6f
+e0
+c6
+0a
+20
+5a
+34
+4d
+70
+46
+16
+00
+6f
+e0
+c6
+15
+79
+20
+7e
+00
+67
+e0
+c6
+15
+20
+40
+34
+ec
+6f
+e0
+c6
+11
+1f
+e6
+7c
+02
+24
+42
+b5
+04
+20
+40
+33
+be
+20
+40
+33
+fe
+20
+40
+35
+06
+20
+22
+b4
+a7
+6f
+e2
+45
+8f
+68
+4a
+46
+34
+98
+46
+7c
+00
+20
+22
+b4
+aa
+6f
+e2
+45
+8f
+68
+4a
+46
+30
+98
+46
+7c
+00
+20
+22
+b4
+ac
+20
+60
+00
+00
 20
 40
 75
@@ -184,7 +316,7 @@
 20
 20
 00
-22
+43
 70
 8a
 0f
@@ -242,6 +374,66 @@
 00
 00
 70
+8a
+20
+30
+70
+8a
+23
+dd
+20
+40
+21
+d0
+58
+00
+00
+00
+67
+e1
+06
+70
+d8
+40
+3a
+98
+6f
+e1
+06
+70
+1f
+e0
+fe
+01
+67
+e1
+06
+70
+98
+46
+7c
+00
+20
+21
+6c
+a3
+6f
+f0
+8a
+7c
+c3
+00
+00
+60
+20
+20
+22
+9a
+70
+8a
+88
+40
+70
 89
 46
 0d
@@ -268,7 +460,7 @@
 20
 40
 00
-9c
+c6
 6f
 e0
 c4
@@ -292,7 +484,7 @@
 c0
 08
 00
-70
+a0
 6f
 e0
 c4
@@ -336,7 +528,7 @@
 20
 40
 00
-62
+92
 70
 80
 43
@@ -360,15 +552,15 @@
 20
 40
 01
-31
+5b
 20
 40
 01
-5c
+86
 20
 40
 00
-5c
+8c
 70
 41
 48
@@ -380,7 +572,7 @@
 20
 20
 01
-5e
+88
 20
 75
 80
@@ -412,7 +604,7 @@
 c0
 0c
 00
-68
+98
 6f
 e0
 c4
@@ -504,7 +696,7 @@
 20
 20
 00
-4e
+7e
 6f
 e0
 c1
@@ -514,21 +706,17 @@
 22
 25
 c0
-05
-00
-82
-c0
 4f
 00
-87
+b1
 c0
 4f
 80
-8b
+b5
 c0
 50
 00
-8f
+b9
 20
 20
 22
@@ -536,26 +724,6 @@
 70
 8a
 14
-25
-58
-a9
-3f
-3f
-67
-f1
-8a
-60
-70
-8a
-63
-1f
-20
-60
-00
-00
-70
-8a
-14
 17
 58
 25
@@ -640,7 +808,7 @@
 20
 35
 80
-c3
+ed
 6f
 e2
 02
@@ -808,7 +976,7 @@
 20
 20
 00
-ad
+d7
 20
 40
 68
@@ -931,8 +1099,8 @@
 96
 c0
 00
-80
-ee
+81
+18
 d8
 a0
 08
@@ -963,8 +1131,8 @@
 00
 20
 20
-00
-fc
+01
+26
 d8
 a0
 08
@@ -983,8 +1151,8 @@
 0c
 c0
 00
-80
-f6
+81
+20
 70
 08
 f7
@@ -1040,7 +1208,7 @@
 c0
 00
 01
-02
+2c
 20
 20
 23
@@ -1068,7 +1236,7 @@
 c0
 00
 81
-0a
+34
 c0
 01
 79
@@ -1088,7 +1256,7 @@
 c0
 04
 81
-0f
+39
 c0
 05
 fb
@@ -1107,8 +1275,8 @@
 75
 20
 40
-00
-dc
+01
+06
 70
 08
 f7
@@ -1196,11 +1364,11 @@
 20
 40
 01
-29
+53
 20
 20
 01
-2d
+57
 6f
 f0
 8c
@@ -1284,7 +1452,7 @@
 20
 40
 01
-4e
+78
 2a
 2f
 fe
@@ -1316,7 +1484,7 @@
 20
 40
 01
-4e
+78
 d8
 a0
 8a
@@ -1344,7 +1512,7 @@
 20
 21
 01
-43
+6d
 20
 20
 21
@@ -1448,7 +1616,7 @@
 20
 40
 01
-87
+b1
 70
 8a
 08
@@ -1484,7 +1652,7 @@
 20
 40
 01
-7d
+a7
 6f
 f0
 8a
@@ -1528,7 +1696,7 @@
 20
 40
 01
-87
+b1
 70
 80
 cd
@@ -1588,7 +1756,7 @@
 c3
 02
 81
-88
+b2
 68
 59
 01
@@ -1624,7 +1792,7 @@
 c0
 08
 01
-a7
+d1
 58
 00
 57
@@ -1668,7 +1836,7 @@
 c0
 08
 01
-a4
+ce
 58
 00
 2b
@@ -1704,7 +1872,7 @@
 20
 20
 01
-a0
+ca
 58
 00
 83
@@ -1716,7 +1884,7 @@
 20
 20
 01
-95
+bf
 6f
 e0
 c3
@@ -1756,7 +1924,7 @@
 c0
 11
 01
-b6
+e0
 c0
 7f
 b5
@@ -1772,7 +1940,7 @@
 20
 3a
 01
-bc
+e6
 6f
 e2
 45
@@ -1796,11 +1964,11 @@
 c0
 00
 81
-c0
+ea
 c0
 01
 01
-c8
+f2
 20
 60
 00
@@ -1820,7 +1988,7 @@
 c0
 01
 01
-c5
+ef
 20
 60
 00
@@ -1852,7 +2020,7 @@
 c0
 80
 01
-cd
+f7
 20
 60
 00
@@ -1931,8 +2099,8 @@
 00
 20
 40
-01
-e1
+02
+0b
 20
 20
 34
@@ -1967,8 +2135,8 @@
 07
 20
 40
-01
-ea
+02
+14
 20
 20
 48
@@ -2057,8 +2225,8 @@
 20
 31
 95
-0d
-20
+f3
+c9
 aa
 55
 40
@@ -2068,7 +2236,7 @@
 05
 00
 32
-07
+17
 00
 00
 80
@@ -2114,7 +2282,7 @@
 00
 00
 04
-05
+0d
 00
 00
 00
@@ -2173,8 +2341,8 @@
 01
 51
 31
-20
-10
+01
+06
 51
 31
 20
@@ -2209,7 +2377,7 @@
 44
 36
 27
-83
+86
 74
 12
 23
@@ -2233,6 +2401,13 @@
 55
 01
 00
+3f
+44
+8c
+aa
+55
+01
+00
 48
 41
 0c
@@ -2421,8 +2596,8 @@
 aa
 aa
 55
-28
-4c
-7c
-d7
+29
+4e
+20
+c6
 f0
Index: output/ramcode.rom
===================================================================
--- /1121s/branch/dongle/1m/usb_1m/output/ramcode.rom	(revision 4006)
+++ /1121s/branch/dongle/1m/usb_1m/output/ramcode.rom	(working copy)
@@ -1,29 +1,31 @@
-c2840012
-c000001c
-c0010022
-c008802b
-c00a018e
-c00a80c7
-c00c00d5
-c00c807b
-c00d0039
-c01b81ec
-c01c009a
-c01c8096
-c01e81e8
-c0628093
-c06d015f
-c06e016f
-c07f80df
+c2840013
+c000001e
+c0010043
+c008804c
+c00a01b8
+c00a80f1
+c00c00ff
+c00c80ab
+c00d0068
+c00e005a
+c01b8216
+c01c00c4
+c01c80c0
+c01e8212
+c06280bd
+c06d0189
+c06e0199
+c07f8109
 2020235a
-c00000fc
-c003011b
-c01c81aa
-c02681ae
-c03781f5
-c04101b0
-c04401d0
-c04501dd
+c0000126
+c0030145
+c01c81d4
+c02681d8
+c037821f
+c04101da
+c04401fa
+c0450207
+c0458024
 c17f8000
 2020235a
 20800000
@@ -32,6 +34,37 @@
 204023e1
 20007530
 20202003
+6fe0c616
+c1838000
+20403476
+204034ae
+204033f1
+2437b3be
+20403506
+2042b3ad
+6fe0c60a
+205a344d
+70461600
+6fe0c615
+79207e00
+67e0c615
+204034ec
+6fe0c611
+1fe67c02
+2442b504
+204033be
+204033fe
+20403506
+2022b4a7
+6fe2458f
+684a4634
+98467c00
+2022b4aa
+6fe2458f
+684a4630
+98467c00
+2022b4ac
+20600000
 20407552
 20407448
 20402a45
@@ -40,7 +73,7 @@
 20402018
 2040310f
 2040248c
-20200022
+20200043
 708a0f60
 708a10aa
 708a127a
@@ -55,19 +88,34 @@
 708a1260
 708a23dd
 20600000
+708a2030
+708a23dd
+204021d0
+58000000
+67e10670
+d8403a98
+6fe10670
+1fe0fe01
+67e10670
+98467c00
+20216ca3
+6ff08a7c
+c3000060
+2020229a
+708a8840
 7089460d
 70896f10
 708a0610
 708a844a
 708a8540
 708a16fe
-2040009c
+204000c6
 6fe0c436
 205a70d7
 37d98200
 70813b5f
 6fe0c099
-c0080070
+c00800a0
 6fe0c438
 1fe1fe04
 67f08a02
@@ -78,18 +126,18 @@
 67f18a73
 708a8660
 708a8b3b
-20400062
+20400092
 70804300
 70804205
 58557474
 67f18968
 7089606e
-20400131
-2040015c
-2040005c
+2040015b
+20400186
+2040008c
 7041480c
 20406f4e
-2020015e
+20200188
 20758000
 37d98200
 6fe0c11c
@@ -97,7 +145,7 @@
 37d98200
 20600000
 6fe0c099
-c00c0068
+c00c0098
 6fe0c438
 1fe1fe06
 67f08a02
@@ -120,19 +168,13 @@
 67f18a73
 708a762a
 70890204
-2020004e
+2020007e
 6fe0c141
 c0032225
-c0050082
-c04f0087
-c04f808b
-c050008f
+c04f00b1
+c04f80b5
+c05000b9
 2020220e
-708a1425
-58a93f3f
-67f18a60
-708a631f
-20600000
 708a1417
 58250300
 67f18a60
@@ -154,7 +196,7 @@
 20206b45
 da401f00
 202047f1
-203580c3
+203580ed
 6fe2020d
 207a0000
 37d98200
@@ -196,7 +238,7 @@
 6fe1415b
 207a0000
 67e1020f
-202000ad
+202000d7
 2040686f
 204021ba
 18002a08
@@ -227,7 +269,7 @@
 2841fe0d
 2020f999
 6fe0c696
-c00080ee
+c0008118
 d8a0086d
 20407994
 6fe0870c
@@ -235,12 +277,12 @@
 c000f9b6
 1fe67c07
 20610000
-202000fc
+20200126
 d8a00875
 20407994
 70469600
 6fe0870c
-c00080f6
+c0008120
 7008f701
 708c1b03
 20600000
@@ -254,24 +296,24 @@
 6fe0886d
 1fe17e80
 c04079ba
-c0000102
+c000012c
 2020235a
 6fe0886d
 1ff1fe00
 1fe37e00
 1fe17e03
 c00079d6
-c000810a
+c0008134
 c00179e3
 2020235a
 6fe0886e
 c0057b4b
-c004810f
+c0048139
 c005fb7c
 202079e4
 20003a98
 d8a00875
-204000dc
+20400106
 7008f701
 20407b6e
 6fe0c696
@@ -293,8 +335,8 @@
 c0817c06
 6fe08902
 243a7c06
-20400129
-2020012d
+20400153
+20200157
 6ff08c25
 1fe17e0f
 247a0000
@@ -315,7 +357,7 @@
 708ac200
 708ac300
 d8e00006
-2040014e
+20400178
 2a2ffe0d
 2040211d
 2a4ffe0d
@@ -323,14 +365,14 @@
 d8e00005
 2040211c
 2040211e
-2040014e
+20400178
 d8a08ac2
 1a31fe00
 20402117
 1a51fe00
 20402117
 18e08fff
-20210143
+2021016d
 2020214f
 2000003c
 58000f00
@@ -356,7 +398,7 @@
 6fe0c409
 67f080cd
 20000bb8
-20400187
+204001b1
 708a08c1
 6a40c419
 df200008
@@ -365,7 +407,7 @@
 67e0c433
 6240c419
 20600000
-2040017d
+204001a7
 6ff08a09
 793ffe07
 67f08a09
@@ -376,7 +418,7 @@
 6fe0c409
 67f080cd
 20000bb8
-20400187
+204001b1
 7080cd00
 20206fa1
 6ff080cc
@@ -391,7 +433,7 @@
 20600000
 7080cc03
 6ff08129
-c3028188
+c30281b2
 68590164
 6049440a
 7080cc00
@@ -400,7 +442,7 @@
 708a8d12
 708a8e0a
 6fe0c099
-c00801a7
+c00801d1
 58005762
 67f10907
 70890103
@@ -411,7 +453,7 @@
 708a8d44
 708a8e0a
 6fe0c099
-c00801a4
+c00801ce
 58002bb1
 67f10907
 c6978000
@@ -420,10 +462,10 @@
 20600000
 58004189
 67f10907
-202001a0
+202001ca
 58008312
 67f10907
-20200195
+202001bf
 6fe0c334
 c1000000
 c001b04a
@@ -433,23 +475,23 @@
 6fe0c5ea
 c0553329
 c02ab33a
-c01101b6
+c01101e0
 c07fb59b
 20600000
 6fe0c5ae
-203a01bc
+203a01e6
 6fe245ec
 684a462c
 98467c00
 24628000
 6fe0c5eb
-c00081c0
-c00101c8
+c00081ea
+c00101f2
 20600000
 6fe0c5de
 247a0000
 6fe0c5d3
-c00101c5
+c00101ef
 20600000
 7045de01
 2040338d
@@ -457,7 +499,7 @@
 6fe0c5df
 247a0000
 6fe0c5d4
-c08001cd
+c08001f7
 20600000
 7045df01
 20403393
@@ -477,7 +519,7 @@
 20203436
 6fe0c616
 c1808000
-204001e1
+2040020b
 2020346d
 6fe0c615
 c3808000
@@ -486,7 +528,7 @@
 58000000
 67e1c5d3
 20203307
-204001ea
+20400214
 20204868
 58000010
 202070c8
Index: output/sched.rom
===================================================================
--- /1121s/branch/dongle/1m/usb_1m/output/sched.rom	(revision 4006)
+++ /1121s/branch/dongle/1m/usb_1m/output/sched.rom	(working copy)
@@ -2,7 +2,7 @@
 05   #mem_patch00
 00   #mem_patch01
 32   #mem_patch02
-07   #mem_patch03
+17   #mem_patch03
 00   #mem_patch04
 00   #mem_patch05
 80   #mem_patch06
@@ -48,7 +48,7 @@
 00   #mem_patch2e
 00   #mem_patch2f
 04   #mem_patch30
-05   #mem_patch31
+0d   #mem_patch31
 00   #mem_patch32
 00   #mem_patch33
 00   #mem_patch34
@@ -89,7 +89,7 @@
 01 #disable
 #mouse only#auto pair
 51 31#VID
-20 10#PID
+01 06#PID
 #mouse & keyboard
 51 31#VID
 20 30#PID
@@ -98,10 +98,10 @@
 '2.4G Receiver
 
 #pair tx
-mem_24g_pair_tx_power_init:94 #94: -20dBm  9e: -30dBm  9f: -35dBm a0: -40dBm 
+mem_24g_pair_tx_power_init:94 #94: -20dBm  9e: -30dBm  9f: -35dBm a0: -40dBm
 
 #rf config
-mem_24g_lap:36 27 83 74 12 23#low 4B used for 24g rxaddr
+mem_24g_lap:36 27 86 74 12 23#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
@@ -131,18 +131,19 @@
 
 
 
-#mem_rf_debug_rx_gpio:87
-#mem_rf_debug_tx_gpio:88
+mem_rf_debug_rx_gpio:8c
+#mem_rf_debug_tx_gpio:8c
 #uart config
 #mem_device_uart_tx_gpio:09	#08
 #mem_device_uart_rx_gpio:ff
-#mem_device_uart_baud_rate:d0 00	#115200	
+#mem_device_uart_baud_rate:d0 00
 #mem_device_uart_rx_buffer:00 1c
 #mem_device_uart_rx_buffer_end:ff 1f
 #mem_device_uart_tx_buffer:00 4f
 #mem_device_uart_tx_buffer_end:ff 4f
 
-
+#
+#baud rate #@115200
 
 mem_system_clk:0c
 mem_lpm_xtalcnt:35 3f 64
Index: program/g24_protocol_stack/24g_transmitter.prog
===================================================================
--- /1121s/branch/dongle/1m/usb_1m/program/g24_protocol_stack/24g_transmitter.prog	(revision 4235)
+++ /1121s/branch/dongle/1m/usb_1m/program/g24_protocol_stack/24g_transmitter.prog	(working copy)
@@ -42,7 +42,7 @@
 	call power_ctrl_start
 	fetch 1,mem_device_option
 	beq DVC_OP_MOUSE,mouse_24g_transmit_start
-g24_transmit_start_next:	
+g24_transmit_start_next:
 	fetch 8,mem_24g_long_sleep_set
 	store 8,mem_24g_enter_hibernate
 	fetch 2,mem_24g_long_sleep_param_update_timer_init
@@ -69,7 +69,7 @@
 	call clk2lpo
 	storet 4,mem_sleep_counter
 	branch lpm_sleep
-	
+
 /****************************g24 transmitter data prep start********************************/
 
 g24_txdata_prep:
@@ -85,7 +85,7 @@
 	fetch 7,mem_24g_txbuf+1	//mouse data
 	rtn blank
 	branch enable_user	// retransmit
-	
+
 g24_accumulate_data:
 	jam 0,mem_24g_abort_pac
 	add rega,1,pdata
@@ -96,7 +96,7 @@
 	copy rega,loopcnt
 	branch memcpy
 
-g24_transmit_rf_ctrl_clear:	
+g24_transmit_rf_ctrl_clear:
 	fetch 1,mem_24g_data_type
 	and_into bits_data,pdata
 	store 1,mem_24g_data_type
@@ -158,28 +158,28 @@
 	bpatchx patch33_2,mem_patch33
 	fetch 1,mem_device_option
 	beq DVC_OP_MOUSE,mouse_g24_retransmit
-g24_retransmit0:	
+g24_retransmit0:
 	fetch 1,mem_24g_abort_pac
 	nrtn blank
 	fetch 2,mem_24g_txfail_cnt
 	increase 1,pdata
-	store 2,mem_24g_txfail_cnt	
+	store 2,mem_24g_txfail_cnt
 	fetch 1,mem_24g_txfail_cnt+1
 	bbit1 4,g24_tx_attempt_fail
 	call g24_transmit_hop_process
 	fetch 2,mem_24g_retransmit
 	increase 1,pdata
-	store 2,mem_24g_retransmit	
+	store 2,mem_24g_retransmit
 	branch g24_transmit_loop
 
 g24_ackpayload_parse:
 	bpatchx patch33_3,mem_patch33
 	call g24_read_len_pid_crc
-	fetch 1,mem_24g_rxdata_length	//ack payload length 
+	fetch 1,mem_24g_rxdata_length	//ack payload length
 	rtn blank
 	iforce loopcnt
 	arg mem_24g_rxbuf+2,contr
-	arg mem_24g_rxpayload,contw	//ack payload buffer 
+	arg mem_24g_rxpayload,contw	//ack payload buffer
 	branch memcpy
 
 
@@ -188,7 +188,7 @@
 	setarg 0
 	store 2,mem_24g_txfail_cnt
 	jam 1,mem_24g_attempt_fail_flag
-g24_stop_24g_mode:	
+g24_stop_24g_mode:
 	jam BT_EVT_24G_ATTEMPT_FAIL,mem_fifo_temp
 	branch ui_ipc_send_event
 
@@ -213,14 +213,14 @@
 	fetch 1,mem_24g_retry
 	beq 6,g24_hop_ch_disable
 	beq 12,g24_hop_ch_disable
-	rtn	
+	rtn
 
 
 g24_transmit_hop_process_4ms:
 	fetch 1,mem_24g_retry
 	beq 3,g24_hop_ch_disable
 	beq 6,g24_hop_ch_disable
-	rtn	
+	rtn
 
 
 
@@ -229,7 +229,7 @@
 	//set1 bit_hop,pdata
 	//store 1,mem_24g_data_type
 	//update txpayload
-g24_txpayload_type_update:	
+g24_txpayload_type_update:
 	bmark1 mark_ble_lr,g24_lr_type_update
 	store 1,mem_24g_txpayload+OFFSET_DATA_TYPE
 	rtn
@@ -252,7 +252,7 @@
 	call power_ctrl_txpower_incrs
 	call power_ctrl_pac_succ_decrs
 	branch g24_ch
-	
+
 /****************************g24 transmitter hop end********************************/
 
 
@@ -297,7 +297,7 @@
 	store 1,mem_24g_data_type
 	call g24_transmit_prep
 	branch g24_transmit_start
-	
+
 
 
 g24_lpm_wait:
@@ -339,7 +339,7 @@
 	call g24_transmit_by_interrupt_exit,zero
 	branch g24_transmit_no_interrupt
 
-	
+
 g24_transmit_by_interrupt_exit:
 	jam G24_TX_TIMER_INT_DISABLE,mem_24g_transmit_by_interrupt
 	setarg 0
@@ -355,7 +355,7 @@
 g24_interval_max:
 	fetch 1,mem_24g_interval_max
 	branch g24_interval_store
-	
+
 g24_interval_calibrate:
 	fetch 1,mem_24g_pac_index
 	increase 1,pdata
@@ -395,4 +395,4 @@
 
 
 
-	
+
Index: program/patch.prog
===================================================================
--- /1121s/branch/dongle/1m/usb_1m/program/patch.prog	(revision 4235)
+++ /1121s/branch/dongle/1m/usb_1m/program/patch.prog	(working copy)
@@ -31,6 +31,7 @@
 	beq patch30_2,p_g24_bind_data_parse_next
 	beq patch31_0,p_g24_mode_switch_bind_search
 	beq patch31_2,p_g24_bind_mode_auto
+	beq patch31_3,p_g24_search_mode_auto
 	rtneq patch3f_7
 	branch assert
 
@@ -38,10 +39,51 @@
 	clear_stack
 	until null,lpo_edge
 	fetch 1,mem_lpm_hv_sel
-	call lpm_write_sel_hv 
+	call lpm_write_sel_hv
 	nop 30000
 	branch soft_reset+2
-	
+
+p_g24_search_mode_auto:
+	fetch 1,mem_24g_work_mode
+	rtnne DONGLE_SEARCH
+	call g24_search_mode_init
+	call g24_auto_addr_ch_search
+	call g24_receive_transmit_ack
+	nbranch g24_rx_interrupt_clear,user3
+	//dongle addr,then parse rxdata
+	call g24_receiver_addr_check
+	call g24_receive_packet_parse,zero
+
+	fetch 1,mem_24g_abort_packet
+	call g24_mode_B_S_switch_stop,blank	//works on auto pair only
+
+	//receive data,then go to paired
+	jam DONGLE_WORK,mem_24g_work_mode
+	fetch 1,mem_24g_mode_init
+	set1 DONGLE_WORK,pdata
+	store 1,mem_24g_mode_init
+	call g24_auto_bind_config_self
+	// fetch 1,0x4fff
+	// ncall g24_auto_bind_config_self,blank
+	fetch 1,mem_24g_ackpayload_enable
+	sub pdata,2,null
+	ncall g24_ackpayload_disable,zero
+	//jam 0x00,0x4fff
+	call g24_rx_interrupt_clear
+	call g24_enable_nodata_timer
+	call g24_receiver_addr_check
+	branch g24_self_ch_num_reinit,zero
+	//jam 0x01,0x4fff
+	fetch 4,mem_24g_addr
+	fetcht 4,mem_24g_device2_addr
+	isub temp,null
+	branch g24_device2_ch_num_reinit,zero
+	fetch 4,mem_24g_addr
+	fetcht 4,mem_24g_device1_addr
+	isub temp,null
+	branch g24_device1_ch_num_reinit,zero
+	rtn
+
 p_main_loop:
 ifdef SECURE_CONNECTION
 	call sp_calc_sequence_256
@@ -56,19 +98,19 @@
 	branch p_main_loop
 
 p_set_sync_on:
-	jam 0x60,0x8a0f 
-	jam 0xaa,0x8a10 
-	jam 0x7a,0x8a12 
-	jam 0x00,0x8a25 
-	jam 0x00,0x8a26 
+	jam 0x60,0x8a0f
+	jam 0xaa,0x8a10
+	jam 0x7a,0x8a12
+	jam 0x00,0x8a25
+	jam 0x00,0x8a26
 	nop 60
-	jam 0x20,0x8a20 
-	jam 0xf5,0x8a23 
-	jam 0x12,0x8a24 
-	jam 0x10,0x8a24 
+	jam 0x20,0x8a20
+	jam 0xf5,0x8a23
+	jam 0x12,0x8a24
+	jam 0x10,0x8a24
 	nop 60
-	jam 0x60,0x8a12 
-	jam 0xdd,0x8a23 
+	jam 0x60,0x8a12
+	jam 0xdd,0x8a23
 	rtn
 
 p_aac_ghpc:
@@ -92,7 +134,7 @@
 	jam 0x40,core_rx_cfg0
 	jam 0x0d,0x8946
 	jam 0x10,0x896f
-	
+
 	jam 0x10,0x8a06
 	jam 0x4a,0x8a84
 	jam 0x40,0x8a85
@@ -103,7 +145,7 @@
 	call wdt_set_disable,blank
 
 	until null,lpo_edge
-	jam 0x5f,0x813b 
+	jam 0x5f,0x813b
 	fetch 1,mem_fcomp_div
 	beq XTAL_16M,p_initialize_radio_16m
 	fetch 1,mem_ring_ibias_trim
@@ -113,10 +155,10 @@
 	jam 0x24,0x8a80
 	jam 0x62,0x8a81
 	setarg 0xe61212
-	store 3,0x8a73	
+	store 3,0x8a73
 p_initialize_radio2:
 	jam 0x60,0x8a86
-	jam 0x3b,0x8a8b 
+	jam 0x3b,0x8a8b
 	call p_dpll_on
 	jam 0,core_config
 	jam CLKSEL_DPLL,core_clksel
@@ -137,7 +179,7 @@
 	store 1,core_xtal_cap
 	until null,lpo_edge
 	rtn
-	
+
 p_dpll_on:
 	fetch 1,mem_fcomp_div
 	beq XTAL_24M,p_dpll_on_24m
@@ -145,7 +187,7 @@
 	or_into 0x06,pdata
 	store 1,0x8a02
 	jam 0xe0,0x8a05
-p_dpll_on_24m:	
+p_dpll_on_24m:
 	jam 0xd8,0x8a00
 	nop 60
 	jam 0xa0,0x8a01
@@ -154,7 +196,7 @@
 	nop 20
 	jam 0x9f,0x8a00
 	rtn
-	
+
 p_initialize_radio_16m:
 	fetch 1,mem_ring_ibias_trim
 	or_into 0x06,pdata
@@ -165,8 +207,8 @@
 	setarg 0xe40909
 	store 3,0x8a73
 	jam 0x2a,0x8a76
-	jam 0x04,0x8902	
-	branch p_initialize_radio2	
+	jam 0x04,0x8902
+	branch p_initialize_radio2
 
 p_set_tx_power:
 	fetch 1,mem_tx_power
@@ -178,22 +220,22 @@
 
 
 p_set_tx_power_f30db:
-	jam 0x17,0x8a14 
+	jam 0x17,0x8a14
 	setarg 0x250300
 	store 3,0x8a60
 	branch set_tx_power_8a63_28
 
 p_set_tx_power_f35db:
-	jam 0x17,0x8a14 
+	jam 0x17,0x8a14
 	setarg 0x250100
 	store 3,0x8a60
 	branch set_tx_power_8a63_28
 
 p_set_tx_power_f40db:
-	jam 0x17,0x8a14 
+	jam 0x17,0x8a14
 	setarg 0x250000
 	store 3,0x8a60
-	branch set_tx_power_8a63_28	
+	branch set_tx_power_8a63_28
 
 p_otp_read_data:
 	call enable_otp_read			//read enable
@@ -205,7 +247,7 @@
 	arg mem_dg_kb_bind_flag,rega
 	arg DONGLE_KB_BIND_OTP_OFFECT,regb
 	branch otp_write
-	
+
 p_dongle_read_kb_bind_status:
 	arg DONGLE_KB_BIND_OTP_OFFECT,regb
 	branch dongle_read_kb_bind_status+2
@@ -219,7 +261,7 @@
 	and pdata,0xf0,pdata
 	fetcht 1,mem_otp_core_ldo
 	ior temp,pdata
-	store 1,0x8136 
+	store 1,0x8136
 	until null,lpo_edge
 
 	fetch 1,0x8138
@@ -227,9 +269,9 @@
 	fetcht 1,mem_otp_verf_bg
 	lshift3 temp,temp
 	ior temp,pdata
-	store 1,0x8138 
+	store 1,0x8138
 	until null,lpo_edge
-	
+
 p_set_otp_config2:
 	fetch 1,0x8acb
 	and pdata,0xf0,pdata
@@ -244,7 +286,7 @@
 	fetch 1,0x8a06
 	setflag true,7,pdata
 	store 1,0x8a06
-	
+
 	fetch 1,mem_otp_dpll_ibais
 	and pdata,7,temp
 	lshift4 temp,temp
@@ -255,7 +297,7 @@
 	ior temp,pdata
 	store 1,0x8a02
 	rtn
-	
+
 p_set_otp_config_wake:
 	fetch 2,mem_otp_charge_pump_x
 	rtn blank
@@ -279,39 +321,39 @@
 	jam 0x30,0x8a26
 	jam 0xfe,0x8a16
 	branch rf_rx_enable+14
-	
+
 p_txon:
 //	bpatch patch03_0,mem_patch03
 	setarg 0x0aaa7e
 	store 3,0x8a0f
 	nop 60
-	jam 0x00,0x8a25 
-	jam 0x0d,0x8a26 
-	jam 0xf6,0x8a16 
+	jam 0x00,0x8a25
+	jam 0x0d,0x8a26
+	jam 0xf6,0x8a16
 	branch txon+7
 
-	
+
 p_usb_rx_data:
 	fetch 1,core_usb_txbusy
 	rtnbit1 USB_STATUS_RXFULL
 	branch usb_rx_data
-	
+
 p_usb_rx:
 	fetch 1,mem_usb_status
 	rtnbit0 USB_STATUS_RXREADY
 	call usb_rx_len
 	compare 13,temp,0xff
 	branch usb_rx_ep13,true
-	
+
 	fetch 1,mem_setreport_count
 	beq 1,p_setreport_next_page_data
-	
+
 	arg mem_usb_setup,contw
 	call usb_rx_read
-p_usb_rx_next:	
+p_usb_rx_next:
 	fetch 1,mem_usb_read_len
 	beq 0x00,usb_rx_no_data
-	beq 0x01,usb_out_one_byte	// HUAWEI pad led status	
+	beq 0x01,usb_out_one_byte	// HUAWEI pad led status
 	sub pdata,7,null
 	rtn positive
 	branch p_usb_class_type
@@ -319,11 +361,11 @@
 p_setreport_next_page_data:
 	arg mem_usb0_set_report_data,contw
 	call usb_rx_read
-	
+
 	jam 0,mem_setreport_count
 	fetch 1,mem_usb_read_len
 	beq 0x01,p_usb_out_one_byte	// HUAWEI pad led status
-	
+
 	jam 1,mem_usb0_get_set_report
 	jam 0x03,core_usb_clear_nak
 	rtn
@@ -350,7 +392,7 @@
 	rshift pdata,pdata
 	and_into 0x03,pdata
 	beq STANDARD_REQ,usb_out_standard_req
-	beq CLASS_REQ,p_usb_out_class_req	
+	beq CLASS_REQ,p_usb_out_class_req
 	beq MANUFACTURER_REQ,usb_out_manufacturer_req
 	branch assert
 
@@ -367,15 +409,15 @@
 	call p_usb_rx_data
 	jam 1,mem_usb0_get_set_report
 	call usb_set_report_resume_judge
-	
+
 	fetch 1,mem_setreport_count
 	pincrease 1
 	store 1,mem_setreport_count
-	
+
 	fetch 2,mem_usb_setup_bValue
 	store 2,mem_usb_setup_bValue_temp
 	jam 0x2,core_usb_clear_nak
-	branch usb_set_report_next	
+	branch usb_set_report_next
 
 p_usb_tx:
 	fetch 1,mem_usb_tx_enable
@@ -392,7 +434,7 @@
 	nbranch usb_tx_fifo_release,blank
 	call p_usb_tx_data_ep1
 	branch p_usb_tx_data_ep2
-	
+
 p_usb_tx_data_ep1:
 	fetch 1,core_usb_txbusy
 	and_into 0x0f,pdata
@@ -408,7 +450,7 @@
 	rtn wake
 	call set_sync_on
 	arg 39,temp
-	call set_freq_rx	
+	call set_freq_rx
 	call rf_rx_enable
 	jam 0x7f,0x8a25
 	jam 0x1a,0x8a30
@@ -444,7 +486,7 @@
 	store 2,0x8984
 	jam 0x9,0x8981
 	jam 0x3,0x8981
-	jam 0x6,0x8980	
+	jam 0x6,0x8980
 	nop 60
 	arg 0,rega
 	arg 0,regb
@@ -455,7 +497,7 @@
 p_rfpll_aac_ghpc:
 	rtn wake
 	branch rfpll_aac_ghpc+1
-	
+
 p_dpll_ring_ibias_calc:
 	rtn
 
@@ -514,7 +556,7 @@
 	storet 2,mem_adc_current_value
 	jam 0x00,core_sadc_ctrl
 	rtn
-	
+
 p_set_lemode:
 	jam 0x11,0x8a82
 	jam 0x12,0x8a8d
@@ -556,9 +598,9 @@
 	rtneq LLID_RESERVED
 	beq LLID_LE_LL,le_parse_ll
 	branch le_parse_l2cap
-	
+
 p_le_init_adv:
-	set0 mark_ble_crc_fail,mark	
+	set0 mark_ble_crc_fail,mark
 	branch le_init_adv+1
 
 p_g24_bind_data_parse_next:
@@ -603,7 +645,7 @@
 	jam 1,mem_24g_device2_bind_disable
 	call g24_binding_dvc2_living	//works on auto pair only
 	branch g24_bind_dvc2_step_success+1
-	
+
 p_g24_mode_switch_bind_search:
 	fetch 1,mem_24g_work_mode
 	rtneq DONGLE_WORK
@@ -646,17 +688,17 @@
 	call p_device_hardware_init
 endif
 	call dongle_default_init+1
-	
+
 	fetch 1,mem_24g_pair_tx_power_init
 	store 1,mem_24g_pair_tx_power
-	
+
 	jam OFF,mem_24g_disable_fec1
 	call g24_enable_1M
 	fetch 1,mem_dg_sys_config
 	rtnbit0 DG_ENABLE_NEW_REVISION
 	jam ON,mem_24g_disable_fec1
 	branch g24_enable_2M
-	
+
 p_g24_receive_skip_end:
 	fetch 1,mem_dg_sys_config
 	bbit0 DG_ENABLE_NEW_REVISION,g24_receive_skip_end+1
@@ -664,7 +706,7 @@
 	nop 24
 	fetch 1,mem_24g_rxbuf+1
 	set1 bit_ack_24g,pdata
-	store 1,mem_24g_rxbuf+1	//sending ack once	
+	store 1,mem_24g_rxbuf+1	//sending ack once
 	call g24_ackpayload_prep
 	call g24_transmit_prep
 	branch g24_transmit
@@ -699,9 +741,9 @@
 ifdef UART_LOG
 	call p_24g_txpayload_print
 endif
-	branch g24_end_of_packet	
-*/	
-	
+	branch g24_end_of_packet
+*/
+
 ifdef UART_LOG
 p_device_hardware_init:
 	fetch 1,core_uart_ctrl
@@ -762,7 +804,7 @@
 	call log_bytes
 	branch log_end
 
-//input: 1 byte hex @pdata  
+//input: 1 byte hex @pdata
 //output: 4 byte  '0','x', ASCII,ASCII, @pdata
 hex2ascii:
 	rshift4 pdata,rega  //high 4bit in rega
@@ -778,7 +820,7 @@
 //	iadd regb,pdata
 	rtn
 
-//input: 1 byte hex @pdata  
+//input: 1 byte hex @pdata
 //output: 4 byte  '0','x', ASCII,ASCII, @pdata
 hex2ascii_half_byte:
 	arg 0xa,temp
@@ -792,7 +834,7 @@
 	iadd temp,pdata
 	rtn
 
-//input: loopcnt--length,regc--data ptr	
+//input: loopcnt--length,regc--data ptr
 log_bytes:
 	copy loopcnt,pdata
 	branch log_len0,blank
@@ -806,7 +848,7 @@
 	fetch 1,core_uart_status
 	bbit1 uart_status_tx_busy,uart_wait
 //	nop 12000
-	rtn	
+	rtn
 
 log_len0:
 	call uarta_prepare_tx
@@ -843,4 +885,4 @@
 	istore 1,contwu
 	branch uarta_send
 
-endif	
\ No newline at end of file
+endif
\ No newline at end of file
Index: sched/dongle.dat
===================================================================
--- /1121s/branch/dongle/1m/usb_1m/sched/dongle.dat	(revision 4130)
+++ /1121s/branch/dongle/1m/usb_1m/sched/dongle.dat	(working copy)
@@ -22,7 +22,7 @@
 01 #disable
 #mouse only#auto pair
 51 31#VID
-20 10#PID
+01 06#PID
 #mouse & keyboard
 51 31#VID
 20 30#PID
@@ -31,10 +31,10 @@
 '2.4G Receiver
 
 #pair tx
-mem_24g_pair_tx_power_init:94 #94: -20dBm  9e: -30dBm  9f: -35dBm a0: -40dBm 
+mem_24g_pair_tx_power_init:94 #94: -20dBm  9e: -30dBm  9f: -35dBm a0: -40dBm
 
 #rf config
-mem_24g_lap:36 27 83 74 12 23#low 4B used for 24g rxaddr
+mem_24g_lap:36 27 86 74 12 23#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
@@ -64,14 +64,16 @@
 
 
 
-#mem_rf_debug_rx_gpio:87
-#mem_rf_debug_tx_gpio:88
+mem_rf_debug_rx_gpio:8c
+#mem_rf_debug_tx_gpio:8c
 #uart config
 #mem_device_uart_tx_gpio:09	#08
 #mem_device_uart_rx_gpio:ff
-#mem_device_uart_baud_rate:d0 00	#115200	
+#mem_device_uart_baud_rate:d0 00
 #mem_device_uart_rx_buffer:00 1c
 #mem_device_uart_rx_buffer_end:ff 1f
 #mem_device_uart_tx_buffer:00 4f
 #mem_device_uart_tx_buffer_end:ff 4f
 
+#
+#baud rate #@115200
\ No newline at end of file