-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "scpi_usbtmc: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-
-SR_PRIV int scpi_usbtmc_open(void *priv)
+#define LOG_PREFIX "scpi_usbtmc"
+
+#define MAX_READ_LENGTH 2048
+
+struct usbtmc_scpi {
+ struct sr_usbtmc_dev_inst *usbtmc;
+ char response_buffer[MAX_READ_LENGTH];
+ int response_length;
+ int response_bytes_read;
+};
+
+static GSList *scpi_usbtmc_scan(struct drv_context *drvc)
+{
+ GSList *resources = NULL;
+ GDir *dir;
+ const char *dev_name;
+ char *resource;
+
+ (void)drvc;
+
+ if (!(dir = g_dir_open("/sys/class/usbmisc/", 0, NULL)))
+ if (!(dir = g_dir_open("/sys/class/usb/", 0, NULL)))
+ return NULL;
+ while ((dev_name = g_dir_read_name(dir))) {
+ if (strncmp(dev_name, "usbtmc", 6))
+ continue;
+ resource = g_strconcat("/dev/", dev_name, NULL);
+ resources = g_slist_append(resources, resource);
+ }
+ g_dir_close(dir);
+
+ return resources;
+}
+
+static int scpi_usbtmc_dev_inst_new(void *priv, struct drv_context *drvc,
+ const char *resource, char **params, const char *serialcomm)
+{
+ struct usbtmc_scpi *uscpi = priv;
+
+ (void)drvc;
+ (void)params;
+ (void)serialcomm;
+
+ if (!(uscpi->usbtmc = sr_usbtmc_dev_inst_new(resource)))
+ return SR_ERR;
+
+ return SR_OK;
+}
+
+static int scpi_usbtmc_open(void *priv)