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;
+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;
/* 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,
+ &digitek_dt4000zc_driver_info, digitek_dt4000zc_receive_data,
+ },
+ {
+ "TekPower", "TP4000ZC", "2400/8n1", 2400,
+ FS9721_PACKET_SIZE, NULL,
+ sr_fs9721_packet_valid, sr_fs9721_parse,
dmm_details_tp4000zc,
+ &tekpower_tp4000zc_driver_info, tekpower_tp4000zc_receive_data,
+ },
+ {
+ "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,
+ &metex_me31_driver_info, metex_me31_receive_data,
+ },
+ {
+ "Peaktech", "3410", "600/7n2/rts=0/dtr=1", 600,
+ METEX14_PACKET_SIZE, sr_metex14_packet_request,
+ sr_metex14_packet_valid, sr_metex14_parse,
+ NULL,
+ &peaktech_3410_driver_info, peaktech_3410_receive_data,
+ },
+ {
+ "MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600,
+ METEX14_PACKET_SIZE, sr_metex14_packet_request,
+ sr_metex14_packet_valid, sr_metex14_parse,
+ NULL,
+ &mastech_mas345_driver_info, mastech_mas345_receive_data,
+ },
+ {
+ "V&A", "VA18B", "2400/8n1", 2400,
+ FS9721_PACKET_SIZE, NULL,
+ sr_fs9721_packet_valid, sr_fs9721_parse,
+ dmm_details_va18b,
+ &va_va18b_driver_info, va_va18b_receive_data,
+ },
+ {
+ "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,
+ &metex_m3640d_driver_info, metex_m3640d_receive_data,
+ },
+ {
+ "PeakTech", "4370", "1200/7n2/rts=0/dtr=1", 1200,
+ METEX14_PACKET_SIZE, sr_metex14_packet_request,
+ sr_metex14_packet_valid, sr_metex14_parse,
+ NULL,
+ &peaktech_4370_driver_info, peaktech_4370_receive_data,
+ },
+ {
+ "PCE", "PCE-DM32", "2400/8n1", 2400,
+ FS9721_PACKET_SIZE, NULL,
+ sr_fs9721_packet_valid, sr_fs9721_parse,
+ dmm_details_pce_dm32,
+ &pce_pce_dm32_driver_info, pce_pce_dm32_receive_data,
+ },
+ {
+ "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_168_driver_info, radioshack_22_168_receive_data,
+ },
+ {
+ "RadioShack", "22-812", "4800/8n1/rts=0/dtr=1", 4800,
+ RS9LCD_PACKET_SIZE, NULL,
+ sr_rs9lcd_packet_valid, sr_rs9lcd_parse,
+ NULL,
+ &radioshack_22_812_driver_info, radioshack_22_812_receive_data,
},
};
struct dev_context *devc;
GSList *l;
+ /* di is not necessarily initialized */
+ if (!di)
+ return SR_OK;
+
if (!(drvc = di->priv))
return SR_OK;
return SR_OK;
}
-static int hw_init(int dmm)
+static int hw_init(struct sr_context *sr_ctx, int dmm)
{
struct drv_context *drvc;
return SR_ERR_MALLOC;
}
- if (dmm == TEKPOWER_TP4000ZC)
- di = di_tekpower_tp4000zc;
- sr_dbg("Selected '%s' subdriver.", di->name);
+ di = dmms[dmm].di;
+ sr_dbg("Selected '%s' subdriver.", dmms[dmm].di->name);
- di->priv = drvc;
+ drvc->sr_ctx = sr_ctx;
+ //// di->priv = drvc;
+ dmms[dmm].di->priv = drvc;
return SR_OK;
}
-static int hw_init_tekpower_tp4000zc(void)
-{
- return hw_init(TEKPOWER_TP4000ZC);
-}
+/* Driver-specific hw_init() function wrappers */
+#define HW_INIT(X) static int hw_init_##X(struct sr_context *sr_ctx) \
+ { return hw_init(sr_ctx, X); }
+HW_INIT(DIGITEK_DT4000ZC)
+HW_INIT(TEKPOWER_TP4000ZC)
+HW_INIT(METEX_ME31)
+HW_INIT(PEAKTECH_3410)
+HW_INIT(MASTECH_MAS345)
+HW_INIT(VA_VA18B)
+HW_INIT(METEX_M3640D)
+HW_INIT(PEAKTECH_4370)
+HW_INIT(PCE_PCE_DM32)
+HW_INIT(RADIOSHACK_22_168)
+HW_INIT(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;
+ //// drvc = di->priv;
+ drvc = dmms[dmm].di->priv;
devices = NULL;
serial_flush(serial);
/* 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);
devc->serial = serial;
sdi->priv = devc;
- sdi->driver = di;
+ sdi->driver = dmms[dmm].di;
if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
goto scan_cleanup;
sdi->probes = g_slist_append(sdi->probes, probe);
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 (!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;
struct sr_datafeed_header header;
struct sr_datafeed_meta_analog meta;
struct dev_context *devc;
- int (*receive_data)(int, int, void *) = NULL;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
meta.num_probes = 1;
sr_session_send(devc->cb_data, &packet);
- if (!strcmp(di->name, "tekpower-tp4000zc"))
- receive_data = tekpower_tp4000zc_receive_data;
-
/* Poll every 50ms, or whenever some data comes in. */
sr_source_add(devc->serial->fd, G_IO_IN, 50,
- receive_data, (void *)sdi);
+ dmms[sdi->driver->subdriver].receive_data, (void *)sdi);
return SR_OK;
}
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,
+ .subdriver = DIGITEK_DT4000ZC,
+};
+
SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info = {
.name = "tekpower-tp4000zc",
.longname = "TekPower TP4000ZC",
.api_version = 1,
- .init = hw_init_tekpower_tp4000zc,
+ .init = hw_init_TEKPOWER_TP4000ZC,
+ .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,
+ .subdriver = TEKPOWER_TP4000ZC,
+};
+
+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,
+ .subdriver = METEX_ME31,
+};
+
+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,
+ .subdriver = PEAKTECH_3410,
+};
+
+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,
+ .subdriver = MASTECH_MAS345,
+};
+
+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,
+ .subdriver = VA_VA18B,
+};
+
+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,
+ .subdriver = METEX_M3640D,
+};
+
+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,
+ .subdriver = PEAKTECH_4370,
+};
+
+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,
+ .subdriver = PCE_PCE_DM32,
+};
+
+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,
+ .subdriver = RADIOSHACK_22_168,
+};
+
+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_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop,
.priv = NULL,
+ .subdriver = RADIOSHACK_22_812,
};
projects / libsigrok.git / blobdiff