X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fapi.c;h=bbe5acf50febe97aad26df22094cd36914604885;hb=a376ffea49411cca09b358f3677938612c79afaf;hp=4293d6354ace16ec260fd304ba1f356033925632;hpb=21a7f2692e09269edd872bca4e25a9d06b67c0e5;p=libsigrok.git

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index 4293d635..bbe5acf5 100644
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -47,21 +47,76 @@ static const char *probe_names[] = {
 	NULL,
 };
 
+SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info;
 SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info;
-static struct sr_dev_driver *di_tekpower_tp4000zc = &tekpower_tp4000zc_driver_info;
+SR_PRIV struct sr_dev_driver metex_me31_driver_info;
+SR_PRIV struct sr_dev_driver peaktech_3410_driver_info;
+SR_PRIV struct sr_dev_driver mastech_mas345_driver_info;
+SR_PRIV struct sr_dev_driver va_va18b_driver_info;
+SR_PRIV struct sr_dev_driver metex_m3640d_driver_info;
+SR_PRIV struct sr_dev_driver peaktech_4370_driver_info;
+
+static struct sr_dev_driver *di_dt4000zc = &digitek_dt4000zc_driver_info;
+static struct sr_dev_driver *di_tp4000zc = &tekpower_tp4000zc_driver_info;
+static struct sr_dev_driver *di_me31 = &metex_me31_driver_info;
+static struct sr_dev_driver *di_3410 = &peaktech_3410_driver_info;
+static struct sr_dev_driver *di_mas345 = &mastech_mas345_driver_info;
+static struct sr_dev_driver *di_va18b = &va_va18b_driver_info;
+static struct sr_dev_driver *di_m3640d = &metex_m3640d_driver_info;
+static struct sr_dev_driver *di_4370 = &peaktech_4370_driver_info;
 
 /* After hw_init() this will point to a device-specific entry (see above). */
 static struct sr_dev_driver *di = NULL;
 
 SR_PRIV struct dmm_info dmms[] = {
 	{
-		"TekPower", "TP4000ZC",
-		"2400/8n1", 2400,
-		FS9721_PACKET_SIZE,
-		sr_fs9721_packet_valid,
-		sr_fs9721_parse,
+		"Digitek", "DT4000ZC", "2400/8n1", 2400,
+		FS9721_PACKET_SIZE, NULL,
+		sr_fs9721_packet_valid, sr_fs9721_parse,
+		dmm_details_dt4000zc,
+	},
+	{
+		"TekPower", "TP4000ZC", "2400/8n1", 2400,
+		FS9721_PACKET_SIZE, NULL,
+		sr_fs9721_packet_valid, sr_fs9721_parse,
 		dmm_details_tp4000zc,
 	},
+	{
+		"Metex", "ME-31", "600/7n2/rts=0/dtr=1", 600,
+		METEX14_PACKET_SIZE, sr_metex14_packet_request,
+		sr_metex14_packet_valid, sr_metex14_parse,
+		NULL,
+	},
+	{
+		"Peaktech", "3410", "600/7n2/rts=0/dtr=1", 600,
+		METEX14_PACKET_SIZE, sr_metex14_packet_request,
+		sr_metex14_packet_valid, sr_metex14_parse,
+		NULL,
+	},
+	{
+		"MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600,
+		METEX14_PACKET_SIZE, sr_metex14_packet_request,
+		sr_metex14_packet_valid, sr_metex14_parse,
+		NULL,
+	},
+	{
+		"V&A", "VA18B", "2400/8n1", 2400,
+		FS9721_PACKET_SIZE, NULL,
+		sr_fs9721_packet_valid, sr_fs9721_parse,
+		dmm_details_va18b,
+	},
+	{
+		"Metex", "M-3640D", "1200/7n2/rts=0/dtr=1", 1200,
+		METEX14_PACKET_SIZE, sr_metex14_packet_request,
+		sr_metex14_packet_valid, sr_metex14_parse,
+		NULL,
+	},
+	{
+		"PeakTech", "4370", "1200/7n2/rts=0/dtr=1", 1200,
+		METEX14_PACKET_SIZE, sr_metex14_packet_request,
+		sr_metex14_packet_valid, sr_metex14_parse,
+		NULL,
+	},
 };
 
 /* Properly close and free all devices. */
@@ -99,8 +154,22 @@ static int hw_init(int dmm)
 		return SR_ERR_MALLOC;
 	}
 
+	if (dmm == DIGITEK_DT4000ZC)
+		di = di_dt4000zc;
 	if (dmm == TEKPOWER_TP4000ZC)
-		di = di_tekpower_tp4000zc;
+		di = di_tp4000zc;
+	if (dmm == METEX_ME31)
+		di = di_me31;
+	if (dmm == PEAKTECH_3410)
+		di = di_3410;
+	if (dmm == MASTECH_MAS345)
+		di = di_mas345;
+	if (dmm == VA_VA18B)
+		di = di_va18b;
+	if (dmm == METEX_M3640D)
+		di = di_m3640d;
+	if (dmm == PEAKTECH_4370)
+		di = di_4370;
 	sr_dbg("Selected '%s' subdriver.", di->name);
 
 	di->priv = drvc;
@@ -108,11 +177,46 @@ static int hw_init(int dmm)
 	return SR_OK;
 }
 
+static int hw_init_digitek_dt4000zc(void)
+{
+	return hw_init(DIGITEK_DT4000ZC);
+}
+
 static int hw_init_tekpower_tp4000zc(void)
 {
 	return hw_init(TEKPOWER_TP4000ZC);
 }
 
+static int hw_init_metex_me31(void)
+{
+	return hw_init(METEX_ME31);
+}
+
+static int hw_init_peaktech_3410(void)
+{
+	return hw_init(PEAKTECH_3410);
+}
+
+static int hw_init_mastech_mas345(void)
+{
+	return hw_init(MASTECH_MAS345);
+}
+
+static int hw_init_va_va18b(void)
+{
+	return hw_init(VA_VA18B);
+}
+
+static int hw_init_metex_m3640d(void)
+{
+	return hw_init(METEX_M3640D);
+}
+
+static int hw_init_peaktech_4370(void)
+{
+	return hw_init(PEAKTECH_4370);
+}
+
 static GSList *scan(const char *conn, const char *serialcomm, int dmm)
 {
 	struct sr_dev_inst *sdi;
@@ -128,10 +232,10 @@ static GSList *scan(const char *conn, const char *serialcomm, int dmm)
 	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
 		return NULL;
 
-	if (serial_open(serial, SERIAL_RDONLY | SERIAL_NONBLOCK) != SR_OK)
+	if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
 		return NULL;
 
-	sr_info("Probing port %s readonly.", conn);
+	sr_info("Probing port %s.", conn);
 
 	drvc = di->priv;
 	devices = NULL;
@@ -146,6 +250,14 @@ static GSList *scan(const char *conn, const char *serialcomm, int dmm)
 	/* Let's get a bit of data and see if we can find a packet. */
 	len = sizeof(buf);
 
+	/* Request a packet if the DMM requires this. */
+	if (dmms[dmm].packet_request) {
+		if ((ret = dmms[dmm].packet_request(serial)) < 0) {
+			sr_err("Failed to request packet: %d.", ret);
+			return FALSE;
+		}
+	}
+
 	ret = serial_stream_detect(serial, buf, &len, dmms[dmm].packet_size,
 				   dmms[dmm].packet_valid, 1000,
 				   dmms[dmm].baudrate);
@@ -212,8 +324,22 @@ static GSList *hw_scan(GSList *options)
 	if (!conn)
 		return NULL;
 
-	if (!strcmp(di->name, "tekpower-tp4000zc"))
+	if (!strcmp(di->name, "digitek-dt4000zc"))
 		dmm = 0;
+	if (!strcmp(di->name, "tekpower-tp4000zc"))
+		dmm = 1;
+	if (!strcmp(di->name, "metex-me31"))
+		dmm = 2;
+	if (!strcmp(di->name, "peaktech-3410"))
+		dmm = 3;
+	if (!strcmp(di->name, "mastech-mas345"))
+		dmm = 4;
+	if (!strcmp(di->name, "va-va18b"))
+		dmm = 5;
+	if (!strcmp(di->name, "metex-m3640d"))
+		dmm = 6;
+	if (!strcmp(di->name, "peaktech-4370"))
+		dmm = 7;
 
 	if (serialcomm) {
 		/* Use the provided comm specs. */
@@ -244,7 +370,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 		return SR_ERR_BUG;
 	}
 
-	if (serial_open(devc->serial, SERIAL_RDONLY) != SR_OK)
+	if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
 		return SR_ERR;
 
 	sdi->status = SR_ST_ACTIVE;
@@ -369,8 +495,22 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	meta.num_probes = 1;
 	sr_session_send(devc->cb_data, &packet);
 
+	if (!strcmp(di->name, "digitek-dt4000zc"))
+		receive_data = digitek_dt4000zc_receive_data;
 	if (!strcmp(di->name, "tekpower-tp4000zc"))
 		receive_data = tekpower_tp4000zc_receive_data;
+	if (!strcmp(di->name, "metex-me31"))
+		receive_data = metex_me31_receive_data;
+	if (!strcmp(di->name, "peaktech-3410"))
+		receive_data = peaktech_3410_receive_data;
+	if (!strcmp(di->name, "mastech-mas345"))
+		receive_data = mastech_mas345_receive_data;
+	if (!strcmp(di->name, "va-va18b"))
+		receive_data = va_va18b_receive_data;
+	if (!strcmp(di->name, "metex-m3640d"))
+		receive_data = metex_m3640d_receive_data;
+	if (!strcmp(di->name, "peaktech-4370"))
+		receive_data = peaktech_4370_receive_data;
 
 	/* Poll every 50ms, or whenever some data comes in. */
 	sr_source_add(devc->serial->fd, G_IO_IN, 50,
@@ -405,6 +545,24 @@ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 	return SR_OK;
 }
 
+SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info = {
+	.name = "digitek-dt4000zc",
+	.longname = "Digitek DT4000ZC",
+	.api_version = 1,
+	.init = hw_init_digitek_dt4000zc,
+	.cleanup = hw_cleanup,
+	.scan = hw_scan,
+	.dev_list = hw_dev_list,
+	.dev_clear = clear_instances,
+	.dev_open = hw_dev_open,
+	.dev_close = hw_dev_close,
+	.info_get = hw_info_get,
+	.dev_config_set = hw_dev_config_set,
+	.dev_acquisition_start = hw_dev_acquisition_start,
+	.dev_acquisition_stop = hw_dev_acquisition_stop,
+	.priv = NULL,
+};
+
 SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info = {
 	.name = "tekpower-tp4000zc",
 	.longname = "TekPower TP4000ZC",
@@ -422,3 +580,111 @@ SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info = {
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
 	.priv = NULL,
 };
+
+SR_PRIV struct sr_dev_driver metex_me31_driver_info = {
+	.name = "metex-me31",
+	.longname = "Metex ME-31",
+	.api_version = 1,
+	.init = hw_init_metex_me31,
+	.cleanup = hw_cleanup,
+	.scan = hw_scan,
+	.dev_list = hw_dev_list,
+	.dev_clear = clear_instances,
+	.dev_open = hw_dev_open,
+	.dev_close = hw_dev_close,
+	.info_get = hw_info_get,
+	.dev_config_set = hw_dev_config_set,
+	.dev_acquisition_start = hw_dev_acquisition_start,
+	.dev_acquisition_stop = hw_dev_acquisition_stop,
+	.priv = NULL,
+};
+
+SR_PRIV struct sr_dev_driver peaktech_3410_driver_info = {
+	.name = "peaktech-3410",
+	.longname = "PeakTech 3410",
+	.api_version = 1,
+	.init = hw_init_peaktech_3410,
+	.cleanup = hw_cleanup,
+	.scan = hw_scan,
+	.dev_list = hw_dev_list,
+	.dev_clear = clear_instances,
+	.dev_open = hw_dev_open,
+	.dev_close = hw_dev_close,
+	.info_get = hw_info_get,
+	.dev_config_set = hw_dev_config_set,
+	.dev_acquisition_start = hw_dev_acquisition_start,
+	.dev_acquisition_stop = hw_dev_acquisition_stop,
+	.priv = NULL,
+};
+
+SR_PRIV struct sr_dev_driver mastech_mas345_driver_info = {
+	.name = "mastech-mas345",
+	.longname = "MASTECH MAS345",
+	.api_version = 1,
+	.init = hw_init_mastech_mas345,
+	.cleanup = hw_cleanup,
+	.scan = hw_scan,
+	.dev_list = hw_dev_list,
+	.dev_clear = clear_instances,
+	.dev_open = hw_dev_open,
+	.dev_close = hw_dev_close,
+	.info_get = hw_info_get,
+	.dev_config_set = hw_dev_config_set,
+	.dev_acquisition_start = hw_dev_acquisition_start,
+	.dev_acquisition_stop = hw_dev_acquisition_stop,
+	.priv = NULL,
+};
+
+SR_PRIV struct sr_dev_driver va_va18b_driver_info = {
+	.name = "va-va18b",
+	.longname = "V&A VA18B",
+	.api_version = 1,
+	.init = hw_init_va_va18b,
+	.cleanup = hw_cleanup,
+	.scan = hw_scan,
+	.dev_list = hw_dev_list,
+	.dev_clear = clear_instances,
+	.dev_open = hw_dev_open,
+	.dev_close = hw_dev_close,
+	.info_get = hw_info_get,
+	.dev_config_set = hw_dev_config_set,
+	.dev_acquisition_start = hw_dev_acquisition_start,
+	.dev_acquisition_stop = hw_dev_acquisition_stop,
+	.priv = NULL,
+};
+
+SR_PRIV struct sr_dev_driver metex_m3640d_driver_info = {
+	.name = "metex-m3640d",
+	.longname = "Metex M-3640D",
+	.api_version = 1,
+	.init = hw_init_metex_m3640d,
+	.cleanup = hw_cleanup,
+	.scan = hw_scan,
+	.dev_list = hw_dev_list,
+	.dev_clear = clear_instances,
+	.dev_open = hw_dev_open,
+	.dev_close = hw_dev_close,
+	.info_get = hw_info_get,
+	.dev_config_set = hw_dev_config_set,
+	.dev_acquisition_start = hw_dev_acquisition_start,
+	.dev_acquisition_stop = hw_dev_acquisition_stop,
+	.priv = NULL,
+};
+
+SR_PRIV struct sr_dev_driver peaktech_4370_driver_info = {
+	.name = "peaktech-4370",
+	.longname = "PeakTech 4370",
+	.api_version = 1,
+	.init = hw_init_peaktech_4370,
+	.cleanup = hw_cleanup,
+	.scan = hw_scan,
+	.dev_list = hw_dev_list,
+	.dev_clear = clear_instances,
+	.dev_open = hw_dev_open,
+	.dev_close = hw_dev_close,
+	.info_get = hw_info_get,
+	.dev_config_set = hw_dev_config_set,
+	.dev_acquisition_start = hw_dev_acquisition_start,
+	.dev_acquisition_stop = hw_dev_acquisition_stop,
+	.priv = NULL,
+};