- const char *usbtmc_prefix = "/dev/usbtmc";
- const char *tcp_prefix = "tcp/";
- const char *vxi_prefix = "vxi/";
- gchar **tokens, *address, *port, *instrument;
-
- if (strncmp(resource, usbtmc_prefix, strlen(usbtmc_prefix)) == 0) {
- sr_dbg("Opening USBTMC device %s.", resource);
- scpi = scpi_usbtmc_dev_inst_new(resource);
- } else if (strncmp(resource, tcp_prefix, strlen(tcp_prefix)) == 0) {
- sr_dbg("Opening TCP connection %s.", resource);
- tokens = g_strsplit(resource + strlen(tcp_prefix), "/", 0);
- address = tokens[0];
- port = tokens[1];
- if (address && port && !tokens[2])
- scpi = scpi_tcp_dev_inst_new(address, port);
- else
- sr_err("Invalid parameters.");
- g_strfreev(tokens);
- } else if (HAVE_RPC && !strncmp(resource, vxi_prefix, strlen(vxi_prefix))) {
- sr_dbg("Opening VXI connection %s.", resource);
- tokens = g_strsplit(resource + strlen(tcp_prefix), "/", 0);
- address = tokens[0];
- instrument = tokens[1];
- if (address && (!instrument || !tokens[2]))
- scpi = scpi_vxi_dev_inst_new(address, instrument);
- else
- sr_err("Invalid parameters.");
- g_strfreev(tokens);
- } else {
- sr_dbg("Opening serial device %s.", resource);
- scpi = scpi_serial_dev_inst_new(resource, serialcomm);
+ const struct sr_scpi_dev_inst *scpi_dev;
+ gchar **params;
+ unsigned i;
+
+ for (i = 0; i < ARRAY_SIZE(scpi_devs); i++) {
+ scpi_dev = scpi_devs[i];
+ if (!strncmp(resource, scpi_dev->prefix, strlen(scpi_dev->prefix))) {
+ sr_dbg("Opening %s device %s.", scpi_dev->name, resource);
+ scpi = g_malloc(sizeof(*scpi));
+ *scpi = *scpi_dev;
+ scpi->priv = g_malloc0(scpi->priv_size);
+ params = g_strsplit(resource, "/", 0);
+ if (scpi->dev_inst_new(scpi->priv, resource,
+ params, serialcomm) != SR_OK) {
+ sr_scpi_free(scpi);
+ scpi = NULL;
+ }
+ g_strfreev(params);
+ break;
+ }