X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hantek_6022bl.c;h=66fc1de7d20d972f243cefdc08e1ac4c084931a6;hb=e1c5ba21853765725d723efdef22bedef7cfecc6;hp=fa595b4a25acd45cef7d61c5a66ed1f292df4a25;hpb=4d971e019068b5747fe439b177c57cd635f3b9dd;p=sigrok-firmware-fx2lafw.git

diff --git a/hantek_6022bl.c b/hantek_6022bl.c
index fa595b4a..66fc1de7 100644
--- a/hantek_6022bl.c
+++ b/hantek_6022bl.c
@@ -33,6 +33,12 @@
 #define LED_GREEN() PC0 = 1; PC1 = 0;
 #define LED_RED()   PC0 = 0; PC1 = 1;
 
+/* CTLx pin index (IFCLK, ADC clock input). */
+#define CTL_BIT 0
+
+#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;
 
@@ -225,16 +231,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, 0x10, 0xca },
-	{ 16,    1,   1, 2, 0, 0x10, 0xca },
-	{ 12,    2,   1, 2, 0, 0x10, 0xca },
-	{  8,    3,   2, 2, 0, 0x10, 0xca },
-	{  4,    6,   5, 2, 0, 0x10, 0xca },
-	{  2,   12,  11, 2, 0, 0x10, 0xca },
-	{  1,   24,  23, 2, 0, 0x10, 0xca },
-	{ 50,   48,  47, 2, 0, 0x10, 0xca },
-	{ 20,  120, 119, 2, 0, 0x10, 0xca },
-	{ 10,  240, 239, 2, 0, 0x10, 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)
@@ -291,8 +297,8 @@ static BOOL set_samplerate(BYTE rate)
 
 	/* OUTPUT 0-7 */
 	EXTAUTODAT2 = samplerates[i].out0;
-	EXTAUTODAT2 = 0x11; /* OE0=1, CTL0=1 */
-	EXTAUTODAT2 = 0x11; /* OE0=1, CTL0=1 */
+	EXTAUTODAT2 = OE_CTL;
+	EXTAUTODAT2 = OE_CTL;
 	EXTAUTODAT2 = 0;
 	EXTAUTODAT2 = 0;
 	EXTAUTODAT2 = 0;
@@ -436,7 +442,7 @@ static void main(void)
 	ET2 = 1;
 	TR2 = 1;
 
-	RENUMERATE();
+	RENUMERATE_UNCOND();
 
 	PORTECFG = 0;
 	PORTCCFG = 0;