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;
-
-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;
+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;
FS9721_PACKET_SIZE, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
dmm_details_dt4000zc,
+ &digitek_dt4000zc_driver_info, receive_data_DIGITEK_DT4000ZC,
},
{
"TekPower", "TP4000ZC", "2400/8n1", 2400,
FS9721_PACKET_SIZE, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
dmm_details_tp4000zc,
+ &tekpower_tp4000zc_driver_info, receive_data_TEKPOWER_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,
+ &metex_me31_driver_info, receive_data_METEX_ME31,
},
{
"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, receive_data_PEAKTECH_3410,
},
{
"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, receive_data_MASTECH_MAS345,
},
{
"V&A", "VA18B", "2400/8n1", 2400,
FS9721_PACKET_SIZE, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
dmm_details_va18b,
+ &va_va18b_driver_info, receive_data_VA_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,
+ &metex_m3640d_driver_info, receive_data_METEX_M3640D,
},
{
"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, receive_data_PEAKTECH_4370,
},
{
"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, receive_data_PCE_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_168_driver_info, receive_data_RADIOSHACK_22_168,
+ },
+ {
+ "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, receive_data_RADIOSHACK_22_812,
},
};
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 == DIGITEK_DT4000ZC)
- di = di_dt4000zc;
- if (dmm == 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;
- sr_dbg("Selected '%s' subdriver.", di->name);
-
- di->priv = drvc;
-
- 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);
-}
+ di = dmms[dmm].di;
+ sr_dbg("Selected '%s' subdriver.", dmms[dmm].di->name);
-static int hw_init_metex_m3640d(void)
-{
- return hw_init(METEX_M3640D);
-}
+ drvc->sr_ctx = sr_ctx;
+ //// di->priv = drvc;
+ dmms[dmm].di->priv = drvc;
-static int hw_init_peaktech_4370(void)
-{
- return hw_init(PEAKTECH_4370);
+ return SR_OK;
}
-static int hw_init_pce_pce_dm32(void)
-{
- return hw_init(PCE_PCE_DM32);
-}
+/* 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)
{
sr_info("Probing port %s.", conn);
- drvc = di->priv;
+ //// drvc = di->priv;
+ drvc = dmms[dmm].di->priv;
devices = NULL;
serial_flush(serial);
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);
return devices;
}
-static GSList *hw_scan(GSList *options)
+static GSList *hw_scan(GSList *options, int dmm)
{
struct sr_hwopt *opt;
GSList *l, *devices;
const char *conn, *serialcomm;
- int dmm;
conn = serialcomm = NULL;
for (l = options; l; l = l->next) {
if (!conn)
return NULL;
- 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 (serialcomm) {
/* Use the provided comm specs. */
devices = scan(conn, serialcomm, dmm);
return devices;
}
-static GSList *hw_dev_list(void)
+/* Driver-specific hw_scan() function wrappers */
+#define HW_SCAN(X) static GSList *hw_scan_##X(GSList *options) \
+ { return hw_scan(options, X); }
+HW_SCAN(DIGITEK_DT4000ZC)
+HW_SCAN(TEKPOWER_TP4000ZC)
+HW_SCAN(METEX_ME31)
+HW_SCAN(PEAKTECH_3410)
+HW_SCAN(MASTECH_MAS345)
+HW_SCAN(VA_VA18B)
+HW_SCAN(METEX_M3640D)
+HW_SCAN(PEAKTECH_4370)
+HW_SCAN(PCE_PCE_DM32)
+HW_SCAN(RADIOSHACK_22_168)
+HW_SCAN(RADIOSHACK_22_812)
+
+static GSList *hw_dev_list(int dmm)
{
struct drv_context *drvc;
- drvc = di->priv;
+ drvc = dmms[dmm].di->priv;
return drvc->instances;
}
+/* Driver-specific hw_dev_list() function wrappers */
+#define HW_DEV_LIST(X) static GSList *hw_dev_list_##X(void) \
+ { return hw_dev_list(X); }
+HW_DEV_LIST(DIGITEK_DT4000ZC)
+HW_DEV_LIST(TEKPOWER_TP4000ZC)
+HW_DEV_LIST(METEX_ME31)
+HW_DEV_LIST(PEAKTECH_3410)
+HW_DEV_LIST(MASTECH_MAS345)
+HW_DEV_LIST(VA_VA18B)
+HW_DEV_LIST(METEX_M3640D)
+HW_DEV_LIST(PEAKTECH_4370)
+HW_DEV_LIST(PCE_PCE_DM32)
+HW_DEV_LIST(RADIOSHACK_22_168)
+HW_DEV_LIST(RADIOSHACK_22_812)
+
static int hw_dev_open(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
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, "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;
- if (!strcmp(di->name, "pce-pce-dm32"))
- receive_data = pce_pce_dm32_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,
-};
-
-SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info = {
- .name = "tekpower-tp4000zc",
- .longname = "TekPower TP4000ZC",
- .api_version = 1,
- .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,
+/* Driver structs */
+#define DRV(ID, ID_UPPER, NAME, LONGNAME) \
+SR_PRIV struct sr_dev_driver ID##_driver_info = { \
+ .name = NAME, \
+ .longname = LONGNAME, \
+ .api_version = 1, \
+ .init = hw_init_##ID_UPPER, \
+ .cleanup = hw_cleanup, \
+ .scan = hw_scan_##ID_UPPER, \
+ .dev_list = hw_dev_list_##ID_UPPER, \
+ .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 = ID_UPPER, \
};
-
-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,
-};
-
+DRV(digitek_dt4000zc, DIGITEK_DT4000ZC, "digitek-dt4000zc", "Digitek DT4000ZC")
+DRV(tekpower_tp4000zc, TEKPOWER_TP4000ZC, "tekpower-tp4000zc", "TekPower TP4000ZC")
+DRV(metex_me31, METEX_ME31, "metex-me31", "Metex ME-31")
+DRV(peaktech_3410, PEAKTECH_3410, "peaktech-3410", "PeakTech 3410")
+DRV(mastech_mas345, MASTECH_MAS345, "mastech-mas345", "MASTECH MAS345")
+DRV(va_va18b, VA_VA18B, "va-va18b", "V&A VA18B")
+DRV(metex_m3640d, METEX_M3640D, "metex-m3640d", "Metex M-3640D")
+DRV(peaktech_4370, PEAKTECH_4370, "peaktech-4370", "PeakTech 4370")
+DRV(pce_pce_dm32, PCE_PCE_DM32, "pce-pce-dm32", "PCE PCE-DM32")
+DRV(radioshack_22_168, RADIOSHACK_22_168, "radioshack-22-168", "RadioShack 22-168")
+DRV(radioshack_22_812, RADIOSHACK_22_812, "radioshack-22-812", "RadioShack 22-812")