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_digitek_dt4000zc = &digitek_dt4000zc_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;
+SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info;
+SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info;
+SR_PRIV struct sr_dev_driver radioshack_22_812_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;
+static struct sr_dev_driver *di_pce_dm32 = &pce_pce_dm32_driver_info;
+static struct sr_dev_driver *di_22_168 = &radioshack_22_168_driver_info;
+static struct sr_dev_driver *di_22_812 = &radioshack_22_812_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[] = {
{
- "Digitek", "DT4000ZC",
- "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,
- sr_fs9721_packet_valid,
- sr_fs9721_parse,
+ "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,
+ },
+ {
+ "PCE", "PCE-DM32", "2400/8n1", 2400,
+ FS9721_PACKET_SIZE, NULL,
+ sr_fs9721_packet_valid, sr_fs9721_parse,
+ dmm_details_pce_dm32,
+ },
+ {
+ "RadioShack", "22-168", "1200/7n2/rts=0/dtr=1", 1200,
+ METEX14_PACKET_SIZE, sr_metex14_packet_request,
+ sr_metex14_packet_valid, sr_metex14_parse,
+ NULL,
+ },
+ {
+ "RadioShack", "22-812", "4800/8n1/rts=0/dtr=1", 4800,
+ RS9LCD_PACKET_SIZE, NULL,
+ sr_rs9lcd_packet_valid, sr_rs9lcd_parse,
+ NULL,
+ },
};
/* Properly close and free all devices. */
return SR_OK;
}
-static int hw_init(int dmm)
+static int hw_init(struct sr_context *sr_ctx, int dmm)
{
struct drv_context *drvc;
}
if (dmm == DIGITEK_DT4000ZC)
- di = di_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;
+ if (dmm == PCE_PCE_DM32)
+ di = di_pce_dm32;
+ if (dmm == RADIOSHACK_22_168)
+ di = di_22_168;
+ if (dmm == RADIOSHACK_22_812)
+ di = di_22_812;
sr_dbg("Selected '%s' subdriver.", di->name);
+ drvc->sr_ctx = sr_ctx;
di->priv = drvc;
return SR_OK;
}
-static int hw_init_digitek_dt4000zc(void)
+static int hw_init_digitek_dt4000zc(struct sr_context *sr_ctx)
+{
+ return hw_init(sr_ctx, DIGITEK_DT4000ZC);
+}
+
+static int hw_init_tekpower_tp4000zc(struct sr_context *sr_ctx)
+{
+ return hw_init(sr_ctx, TEKPOWER_TP4000ZC);
+}
+
+static int hw_init_metex_me31(struct sr_context *sr_ctx)
+{
+ return hw_init(sr_ctx, METEX_ME31);
+}
+
+static int hw_init_peaktech_3410(struct sr_context *sr_ctx)
+{
+ return hw_init(sr_ctx, PEAKTECH_3410);
+}
+
+static int hw_init_mastech_mas345(struct sr_context *sr_ctx)
+{
+ return hw_init(sr_ctx, MASTECH_MAS345);
+}
+
+static int hw_init_va_va18b(struct sr_context *sr_ctx)
+{
+ return hw_init(sr_ctx, VA_VA18B);
+}
+
+static int hw_init_metex_m3640d(struct sr_context *sr_ctx)
+{
+ return hw_init(sr_ctx, METEX_M3640D);
+}
+
+static int hw_init_peaktech_4370(struct sr_context *sr_ctx)
+{
+ return hw_init(sr_ctx, PEAKTECH_4370);
+}
+
+static int hw_init_pce_pce_dm32(struct sr_context *sr_ctx)
+{
+ return hw_init(sr_ctx, PCE_PCE_DM32);
+}
+
+static int hw_init_radioshack_22_168(struct sr_context *sr_ctx)
{
- return hw_init(DIGITEK_DT4000ZC);
+ return hw_init(sr_ctx, RADIOSHACK_22_168);
}
-static int hw_init_tekpower_tp4000zc(void)
+static int hw_init_radioshack_22_812(struct sr_context *sr_ctx)
{
- return hw_init(TEKPOWER_TP4000ZC);
+ return hw_init(sr_ctx, RADIOSHACK_22_812);
}
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;
/* 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);
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 (!strcmp(di->name, "pce-pce-dm32"))
+ dmm = 8;
+ if (!strcmp(di->name, "radioshack-22-168"))
+ dmm = 9;
+ if (!strcmp(di->name, "radioshack-22-812"))
+ dmm = 10;
if (serialcomm) {
/* Use the provided comm specs. */
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;
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;
+ if (!strcmp(di->name, "pce-pce-dm32"))
+ receive_data = pce_pce_dm32_receive_data;
+ if (!strcmp(di->name, "radioshack-22-168"))
+ receive_data = radioshack_22_168_receive_data;
+ if (!strcmp(di->name, "radioshack-22-812"))
+ receive_data = radioshack_22_812_receive_data;
/* Poll every 50ms, or whenever some data comes in. */
sr_source_add(devc->serial->fd, G_IO_IN, 50,
.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,
+};
+
+SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info = {
+ .name = "pce-pce-dm32",
+ .longname = "PCE PCE-DM32",
+ .api_version = 1,
+ .init = hw_init_pce_pce_dm32,
+ .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 radioshack_22_168_driver_info = {
+ .name = "radioshack-22-168",
+ .longname = "RadioShack 22-168",
+ .api_version = 1,
+ .init = hw_init_radioshack_22_168,
+ .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 radioshack_22_812_driver_info = {
+ .name = "radioshack-22-812",
+ .longname = "RadioShack 22-812",
+ .api_version = 1,
+ .init = hw_init_radioshack_22_812,
+ .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,
+};
projects / libsigrok.git / blobdiff