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

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index 56227f8d..bbe5acf5 100644
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -52,12 +52,18 @@ SR_PRIV struct sr_dev_driver 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;
@@ -93,6 +99,24 @@ SR_PRIV struct dmm_info dmms[] = {
 		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. */
@@ -140,6 +164,12 @@ static int hw_init(int dmm)
 		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;
@@ -172,6 +202,21 @@ 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;
@@ -289,6 +334,12 @@ static GSList *hw_scan(GSList *options)
 		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. */
@@ -454,6 +505,12 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 		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,
@@ -577,3 +634,57 @@ SR_PRIV struct sr_dev_driver mastech_mas345_driver_info = {
 	.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,
+};