BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rigol-ds: Support RS232 connection. 

Probing tested OK over RS232 for DS1052E and DS1102D. Capture needs work.
This commit is contained in:
Martin Ling 2013-12-04 12:49:38 +00:00
parent 4d7a9a14a3
commit 0dc7b43eb7
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hardware/rigol-ds/api.c
View File

@ -30,6 +30,7 @@
static const int32_t hwopts[] = { static const int32_t hwopts[] = {
SR_CONF_CONN, SR_CONF_CONN,
SR_CONF_SERIALCOMM
}; };
static const int32_t hwcaps[] = { static const int32_t hwcaps[] = {
@ -214,10 +215,11 @@ static int init(struct sr_context *sr_ctx)
return std_init(sr_ctx, di, LOG_PREFIX); return std_init(sr_ctx, di, LOG_PREFIX);
} }
static int probe_port(const char *port, GSList **devices) static int probe_port(const char *port, const char *serialcomm, GSList **devices)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
const char *usbtmc_prefix = "/dev/usbtmc";
struct sr_scpi_dev_inst *scpi; struct sr_scpi_dev_inst *scpi;
struct sr_scpi_hw_info *hw_info; struct sr_scpi_hw_info *hw_info;
struct sr_probe *probe; struct sr_probe *probe;
@ -226,8 +228,15 @@ static int probe_port(const char *port, GSList **devices)
gchar *channel_name; gchar *channel_name;
*devices = NULL; *devices = NULL;
if (strncmp(port, usbtmc_prefix, strlen(usbtmc_prefix)) == 0) {
if (!(scpi = scpi_usbtmc_dev_inst_new(port))) if (!(scpi = scpi_usbtmc_dev_inst_new(port)))
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
} else {
if (!(scpi = scpi_serial_dev_inst_new(port, serialcomm)))
return SR_ERR_MALLOC;
}
if (sr_scpi_open(scpi) != SR_OK) { if (sr_scpi_open(scpi) != SR_OK) {
sr_scpi_free(scpi); sr_scpi_free(scpi);
@ -340,21 +349,30 @@ static GSList *scan(GSList *options)
int ret; int ret;
const gchar *dev_name; const gchar *dev_name;
gchar *port = NULL; gchar *port = NULL;
gchar *serialcomm = NULL;
drvc = di->priv; drvc = di->priv;
for (l = options; l; l = l->next) { for (l = options; l; l = l->next) {
src = l->data; src = l->data;
if (src->key == SR_CONF_CONN) { switch (src->key) {
case SR_CONF_CONN:
port = (char *)g_variant_get_string(src->data, NULL); port = (char *)g_variant_get_string(src->data, NULL);
break; break;
case SR_CONF_SERIALCOMM:
serialcomm = (char *)g_variant_get_string(src->data, NULL);
break;
} }
} }
devices = NULL; devices = NULL;
if (port) { if (port) {
if (probe_port(port, &devices) == SR_ERR_MALLOC) if (probe_port(port, serialcomm, &devices) == SR_ERR_MALLOC) {
g_free(port);
if (serialcomm)
g_free(serialcomm);
return NULL; return NULL;
}
} else { } else {
if (!(dir = g_dir_open("/sys/class/usbmisc/", 0, NULL))) if (!(dir = g_dir_open("/sys/class/usbmisc/", 0, NULL)))
if (!(dir = g_dir_open("/sys/class/usb/", 0, NULL))) if (!(dir = g_dir_open("/sys/class/usb/", 0, NULL)))
@ -363,8 +381,10 @@ static GSList *scan(GSList *options)
if (strncmp(dev_name, "usbtmc", 6)) if (strncmp(dev_name, "usbtmc", 6))
continue; continue;
port = g_strconcat("/dev/", dev_name, NULL); port = g_strconcat("/dev/", dev_name, NULL);
ret = probe_port(port, &devices); ret = probe_port(port, serialcomm, &devices);
g_free(port); g_free(port);
if (serialcomm)
g_free(serialcomm);
if (ret == SR_ERR_MALLOC) { if (ret == SR_ERR_MALLOC) {
g_dir_close(dir); g_dir_close(dir);
return NULL; return NULL;