firmware: type III faster scanning. code cleanup.

git-svn-id: https://dedected.org/svn/trunk@84 8d8ab74c-27aa-4a3d-9bde-523a2bc1f624

2 files changed, 41 insertions, 57 deletions

diff --git a/com-on-air_cs-linux/firmware/sc14421_III_sniff_scan.asm b/com-on-air_cs-linux/firmware/sc14421_III_sniff_scan.asm
index fb3cdff..68c1c34 100644
--- a/com-on-air_cs-linux/firmware/sc14421_III_sniff_scan.asm
+++ b/com-on-air_cs-linux/firmware/sc14421_III_sniff_scan.asm
@@ -27,24 +27,25 @@ Start:
 		P_LD	0x00
 		RCK_INT
 		RFEN
+		MEN1N
 ;-------------------------------------------------------------	
 
 		BK_C	0x20
 TryAgain:
-		JMP	RFInit
-		JMP	RFDKnow1
+		JMP	RFInit1
+;		JMP	RFInit2
+;		JMP	RFInit3
+		JMP	RFDKnow
 		MEN2N
 		WT	250
 		P_SC	0x60
 		P_LDH	PB_RX_ON|PB_DCTHRESHOLD
 		UNLCK
-		WT	64
 		B_XOFF
 		B_SR
-		WNT	20
+		WNT	2
 		JMP1	SFieldFound
 		B_RST
-		WT	22
 		BR	TryAgain
 ;-------------------------------------------------------------
 
@@ -57,7 +58,7 @@ SFieldFound:
 ;-------------------------------------------------------------
 
 RecvSlot:
-		JMP	RFDKnow1
+		JMP	RFDKnow
 		JMP	RecvPP
 		WT	1
 		B_BRFU	0x0E
@@ -68,8 +69,6 @@ RecvSlot:
 		B_WRS	0x00
 		WT	7
 		B_RST
-		MEN1N
-		WNT	1
 		RTN
 ;-------------------------------------------------------------
 
@@ -92,32 +91,29 @@ RecvPP:
 		RTN
 ;-------------------------------------------------------------
 
-RFInit:
+RFInit1:
 		RFEN
-		WT		1
-		WT		1
-		M_WR	0x4A
+		M_WR		0x4A
 		WT		9
 		M_RST
-		JMP		label_C0
-		M_WR	0x4B
+		MEN1
+;		RTN
+;RFInit2:
+		MEN1N
+		M_WR		0x4B
 		WT		17
 		M_RST
-		JMP		label_C0
-		M_WR	0x4D
+		MEN1
+;		RTN
+;RFInit3:
+		MEN1N
+		M_WR		0x4D
 		WT		25
 		M_RST
 		RTN
 ;-------------------------------------------------------------
 
-RFDKnow1:
-		JMP		label_C0
-		BR		RFDKnow3
-;-------------------------------------------------------------
-
-RFDKnow2:
-		JMP		label_C3
-RFDKnow3:
+RFDKnow:
 		B_RST
 		B_RC		0x58
 		WT		8
@@ -126,15 +122,3 @@ RFDKnow3:
 		WT		208
 		RTN
 ;-------------------------------------------------------------
-
-label_C0:
-		MEN1
-		MEN1N
-		RTN
-;-------------------------------------------------------------
-
-label_C3:
-		MEN1
-		RTN
-;-------------------------------------------------------------
-
diff --git a/com-on-air_cs-linux/sc14421_firmware.c b/com-on-air_cs-linux/sc14421_firmware.c
index 52177d2..6839f49 100644
--- a/com-on-air_cs-linux/sc14421_firmware.c
+++ b/com-on-air_cs-linux/sc14421_firmware.c
@@ -150,27 +150,27 @@ unsigned char sc14421_III_sniff_scan_fw[] = {
 	0x01, 0x01, 0x20, 0x00, 0x0f, 0x00, 0xfa, 0x10,
 	0x09, 0x0a, 0x33, 0x00, 0x09, 0x08, 0x20, 0x00,
 	0xee, 0x00, 0x09, 0x0a, 0xe9, 0x00, 0xe8, 0x00,
-	0x62, 0x00, 0x0b, 0x00, 0x0f, 0x20, 0x02, 0x41,
-	0x02, 0x50, 0xa6, 0x00, 0x09, 0xfa, 0xea, 0x60,
-	0xed, 0x42, 0x28, 0x00, 0x09, 0x40, 0x26, 0x00,
-	0x29, 0x00, 0x08, 0x14, 0x03, 0x1e, 0x20, 0x00,
-	0x09, 0x16, 0x01, 0x0f, 0x08, 0x17, 0xea, 0x00,
-	0x02, 0x23, 0x61, 0x00, 0x01, 0x0f, 0x02, 0x50,
-	0x02, 0x31, 0x09, 0x01, 0x2d, 0x0e, 0x09, 0xff,
-	0x09, 0x49, 0xed, 0x01, 0xec, 0x22, 0x39, 0x00,
-	0x09, 0x07, 0x20, 0x00, 0xa4, 0x00, 0x08, 0x01,
-	0x04, 0x00, 0xa7, 0x00, 0xec, 0x01, 0x09, 0x01,
-	0x0a, 0x00, 0x08, 0x01, 0x09, 0x05, 0x27, 0x00,
-	0x09, 0x0e, 0x29, 0x00, 0x2c, 0x00, 0x09, 0x0d,
-	0xed, 0x02, 0x09, 0x20, 0x3f, 0x06, 0x09, 0x3d,
-	0x04, 0x00, 0x0b, 0x00, 0x09, 0x01, 0x09, 0x01,
-	0xb9, 0x4a, 0x09, 0x09, 0xa9, 0x00, 0x02, 0x5a,
-	0xb9, 0x4b, 0x09, 0x11, 0xa9, 0x00, 0x02, 0x5a,
-	0xb9, 0x4d, 0x09, 0x19, 0xa9, 0x00, 0x04, 0x00,
-	0x02, 0x5a, 0x01, 0x53, 0x02, 0x5d, 0x20, 0x00,
-	0x33, 0x58, 0x09, 0x08, 0xa6, 0x00, 0xed, 0x04,
-	0x09, 0xd0, 0x04, 0x00, 0xa5, 0x00, 0xa4, 0x00,
-	0x04, 0x00, 0xa5, 0x00, 0x04, 0x00, 0xff, 0xff,
+	0x62, 0x00, 0x0b, 0x00, 0xa4, 0x00, 0x0f, 0x20,
+	0x02, 0x3e, 0x02, 0x4d, 0xa6, 0x00, 0x09, 0xfa,
+	0xea, 0x60, 0xed, 0x42, 0x28, 0x00, 0x26, 0x00,
+	0x29, 0x00, 0x08, 0x02, 0x03, 0x1d, 0x20, 0x00,
+	0x01, 0x10, 0x08, 0x17, 0xea, 0x00, 0x02, 0x22,
+	0x61, 0x00, 0x01, 0x10, 0x02, 0x4d, 0x02, 0x2e,
+	0x09, 0x01, 0x2d, 0x0e, 0x09, 0xff, 0x09, 0x49,
+	0xed, 0x01, 0xec, 0x22, 0x39, 0x00, 0x09, 0x07,
+	0x20, 0x00, 0x04, 0x00, 0xa7, 0x00, 0xec, 0x01,
+	0x09, 0x01, 0x0a, 0x00, 0x08, 0x01, 0x09, 0x05,
+	0x27, 0x00, 0x09, 0x0e, 0x29, 0x00, 0x2c, 0x00,
+	0x09, 0x0d, 0xed, 0x02, 0x09, 0x20, 0x3f, 0x06,
+	0x09, 0x3d, 0x04, 0x00, 0x0b, 0x00, 0xb9, 0x4a,
+	0x09, 0x09, 0xa9, 0x00, 0xa5, 0x00, 0xa4, 0x00,
+	0xb9, 0x4b, 0x09, 0x11, 0xa9, 0x00, 0xa5, 0x00,
+	0xa4, 0x00, 0xb9, 0x4d, 0x09, 0x19, 0xa9, 0x00,
+	0x04, 0x00, 0x20, 0x00, 0x33, 0x58, 0x09, 0x08,
+	0xa6, 0x00, 0xed, 0x04, 0x09, 0xd0, 0x04, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,