X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hantek_6022be.c;h=93665b8d41879ec3a5fc022ad37e8c38b7d3cb32;hb=e1c5ba21853765725d723efdef22bedef7cfecc6;hp=84e37876e1d485bba87e4fbf150311cdcdf70bf7;hpb=be6d306de12082c887c30e364dcf66438acc6183;p=sigrok-firmware-fx2lafw.git

diff --git a/hantek_6022be.c b/hantek_6022be.c
index 84e37876..93665b8d 100644
--- a/hantek_6022be.c
+++ b/hantek_6022be.c
@@ -26,6 +26,19 @@
 
 #define SET_ANALOG_MODE()
 
+/* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
+#define TOGGLE_CALIBRATION_PIN() PA7 = !PA7
+
+#define LED_CLEAR() PC0 = 1; PC1 = 1;
+#define LED_GREEN() PC0 = 1; PC1 = 0;
+#define LED_RED()   PC0 = 0; PC1 = 1;
+
+/* CTLx pin index (IFCLK, ADC clock input). */
+#define CTL_BIT 2
+
+#define OUT0 ((1 << CTL_BIT) << 4) /* OEx = 1, CTLx = 0 */
+#define OE_CTL (((1 << CTL_BIT) << 4) | (1 << CTL_BIT)) /* OEx = CTLx = 1 */
+
 /* Change to support as many interfaces as you need. */
 static BYTE altiface = 0;
 
@@ -68,16 +81,10 @@ void suspend_isr(void) __interrupt SUSPEND_ISR
 
 void timer2_isr(void) __interrupt TF2_ISR
 {
-	/* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
-	PA7 = !PA7;
-
-	if (ledcounter) {
-		if (--ledcounter == 0) {
-			/* Clear LED. */
-			PC0 = 1;
-			PC1 = 1;
-		}
-	}
+	TOGGLE_CALIBRATION_PIN();
+
+	if (ledcounter && (--ledcounter == 0))
+		LED_CLEAR();
 
 	TF2 = 0;
 }
@@ -181,10 +188,9 @@ static void start_sampling(void)
 	GPIFTCB0 = 0;
 	GPIFTRIG = (altiface == 0) ? 6 : 4;
 
-	/* Set green LED, don't clear LED. */
+	/* Set green LED, don't clear LED afterwards (ledcounter = 0). */
+	LED_GREEN();
 	ledcounter = 0;
-	PC0 = 1;
-	PC1 = 0;
 }
 
 static void select_interface(BYTE alt)
@@ -224,16 +230,16 @@ static const struct samplerate_info {
 } samplerates[] = {
 	{ 48, 0x80,   0, 3, 0, 0x00, 0xea },
 	{ 30, 0x80,   0, 3, 0, 0x00, 0xaa },
-	{ 24,    1,   0, 2, 1, 0x40, 0xca },
-	{ 16,    1,   1, 2, 0, 0x40, 0xca },
-	{ 12,    2,   1, 2, 0, 0x40, 0xca },
-	{  8,    3,   2, 2, 0, 0x40, 0xca },
-	{  4,    6,   5, 2, 0, 0x40, 0xca },
-	{  2,   12,  11, 2, 0, 0x40, 0xca },
-	{  1,   24,  23, 2, 0, 0x40, 0xca },
-	{ 50,   48,  47, 2, 0, 0x40, 0xca },
-	{ 20,  120, 119, 2, 0, 0x40, 0xca },
-	{ 10,  240, 239, 2, 0, 0x40, 0xca },
+	{ 24,    1,   0, 2, 1, OUT0, 0xca },
+	{ 16,    1,   1, 2, 0, OUT0, 0xca },
+	{ 12,    2,   1, 2, 0, OUT0, 0xca },
+	{  8,    3,   2, 2, 0, OUT0, 0xca },
+	{  4,    6,   5, 2, 0, OUT0, 0xca },
+	{  2,   12,  11, 2, 0, OUT0, 0xca },
+	{  1,   24,  23, 2, 0, OUT0, 0xca },
+	{ 50,   48,  47, 2, 0, OUT0, 0xca },
+	{ 20,  120, 119, 2, 0, OUT0, 0xca },
+	{ 10,  240, 239, 2, 0, OUT0, 0xca },
 };
 
 static BOOL set_samplerate(BYTE rate)
@@ -290,8 +296,8 @@ static BOOL set_samplerate(BYTE rate)
 
 	/* OUTPUT 0-7 */
 	EXTAUTODAT2 = samplerates[i].out0;
-	EXTAUTODAT2 = 0x44; /* OE2=1, CTL2=1 */
-	EXTAUTODAT2 = 0x44; /* OE2=1, CTL2=1 */
+	EXTAUTODAT2 = OE_CTL;
+	EXTAUTODAT2 = OE_CTL;
 	EXTAUTODAT2 = 0;
 	EXTAUTODAT2 = 0;
 	EXTAUTODAT2 = 0;
@@ -356,9 +362,8 @@ BOOL handle_vendorcommand(BYTE cmd)
 {
 	stop_sampling();
 
-	/* Set red LED. */
-	PC0 = 0;
-	PC1 = 1;
+	/* Set red LED, clear after timeout. */
+	LED_RED();
 	ledcounter = 1000;
 
 	/* Clear EP0BCH/L for each valid command. */
@@ -436,12 +441,14 @@ static void main(void)
 	ET2 = 1;
 	TR2 = 1;
 
-	RENUMERATE();
+	RENUMERATE_UNCOND();
 
+	PORTECFG = 0;
 	PORTCCFG = 0;
 	PORTACFG = 0;
+	OEE = 0xff;
 	OEC = 0xff;
-	OEA = 0x80;
+	OEA = 0xff;
 
 	while (TRUE) {
 		if (dosud) {