X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=sainsmart_dds120.c;h=cd2de1afce023dc04ec95d4780d19e7de17dcaf9;hb=2c57c00b18c085fb72579470368bc18a5985ef37;hp=1ea478087ed6307841057356e7feb6626b7c25c4;hpb=65b34f7ea6d5f250a09c878d929e5c5312093e54;p=sigrok-firmware-fx2lafw.git

diff --git a/sainsmart_dds120.c b/sainsmart_dds120.c
index 1ea47808..cd2de1af 100644
--- a/sainsmart_dds120.c
+++ b/sainsmart_dds120.c
@@ -26,6 +26,10 @@
 
 #define SET_ANALOG_MODE() PA7 = 1
 
+#define SET_COUPLING(x) set_coupling(x)
+
+#define SET_CALIBRATION_PULSE(x) set_calibration_pulse(x)
+
 /* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
 /* Note: There's no PE2 as IOE is not bit-addressable (see TRM 15.2). */
 #define TOGGLE_CALIBRATION_PIN() IOE = IOE ^ 0x04
@@ -34,6 +38,14 @@
 #define LED_GREEN() NOP
 #define LED_RED()   NOP
 
+#define TIMER2_VAL 1000
+
+/* 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;
 
@@ -280,21 +292,21 @@ 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, 0xea },
-	{ 16,    1,   1, 2, 0, 0x40, 0xea },
-	{ 15,    1,   0, 2, 1, 0x40, 0xaa },
-	{ 12,    2,   1, 2, 0, 0x40, 0xea },
-	{ 11,    1,   1, 2, 0, 0x40, 0xaa },
-	{  8,    3,   2, 2, 0, 0x40, 0xea },
-	{  6,    2,   2, 2, 0, 0x40, 0xaa },
-	{  5,    3,   2, 2, 0, 0x40, 0xaa },
-	{  4,    6,   5, 2, 0, 0x40, 0xea },
-	{  3,    5,   4, 2, 0, 0x40, 0xaa },
-	{  2,   12,  11, 2, 0, 0x40, 0xea },
-	{  1,   24,  23, 2, 0, 0x40, 0xea },
-	{ 50,   48,  47, 2, 0, 0x40, 0xea },
-	{ 20,  120, 119, 2, 0, 0x40, 0xea },
-	{ 10,  240, 239, 2, 0, 0x40, 0xea },
+	{ 24,    1,   0, 2, 1, OUT0, 0xea },
+	{ 16,    1,   1, 2, 0, OUT0, 0xea },
+	{ 15,    1,   0, 2, 1, OUT0, 0xaa },
+	{ 12,    2,   1, 2, 0, OUT0, 0xea },
+	{ 11,    1,   1, 2, 0, OUT0, 0xaa },
+	{  8,    3,   2, 2, 0, OUT0, 0xea },
+	{  6,    2,   2, 2, 0, OUT0, 0xaa },
+	{  5,    3,   2, 2, 0, OUT0, 0xaa },
+	{  4,    6,   5, 2, 0, OUT0, 0xea },
+	{  3,    5,   4, 2, 0, OUT0, 0xaa },
+	{  2,   12,  11, 2, 0, OUT0, 0xea },
+	{  1,   24,  23, 2, 0, OUT0, 0xea },
+	{ 50,   48,  47, 2, 0, OUT0, 0xea },
+	{ 20,  120, 119, 2, 0, OUT0, 0xea },
+	{ 10,  240, 239, 2, 0, OUT0, 0xea },
 };
 
 static BOOL set_samplerate(BYTE rate)
@@ -351,8 +363,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;
@@ -468,10 +480,10 @@ BOOL handle_vendorcommand(BYTE cmd)
 		set_numchannels(EP0BUF[0]);
 		return TRUE;
 	case 0xe5:
-		set_coupling(EP0BUF[0]);
+		SET_COUPLING(EP0BUF[0]);
 		return TRUE;
 	case 0xe6:
-		set_calibration_pulse(EP0BUF[0]);
+		SET_CALIBRATION_PULSE(EP0BUF[0]);
 		return TRUE;
 	}
 
@@ -520,20 +532,20 @@ static void main(void)
 	EA = 1;
 
 	/* Init timer2. */
-	RCAP2L = -1000 & 0xff;
-	RCAP2H = (-1000 & 0xff00) >> 8;
+	RCAP2L = -TIMER2_VAL & 0xff;
+	RCAP2H = (-TIMER2_VAL & 0xff00) >> 8;
 	T2CON = 0;
 	ET2 = 1;
 	TR2 = 1;
 
 	RENUMERATE_UNCOND();
 
+	PORTECFG = 0;
 	PORTCCFG = 0;
 	PORTACFG = 0;
-	PORTECFG = 0;
-	OEE = 0xFF;
+	OEE = 0xff;
 	OEC = 0xff;
-	OEA = 0x80;
+	OEA = 0xff;
 
 	SET_ANALOG_MODE();