README.devices: Various updates and fixes.

[libsigrok.git] / hardware / common / scpi_usbtmc.c

diff --git a/hardware/common/scpi_usbtmc.c b/hardware/common/scpi_usbtmc.c
index 6cd79641b90b9ca71dd3447a9cc856b0baf18bf7..8254f8019be990ceee5bf874635b8b77be1c1456 100644 (file)
--- a/hardware/common/scpi_usbtmc.c
+++ b/hardware/common/scpi_usbtmc.c
@@ -37,6 +37,29 @@ struct usbtmc_scpi {
        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)
 {
@@ -64,7 +87,7 @@ static int scpi_usbtmc_open(void *priv)
 }
 
 static int scpi_usbtmc_source_add(void *priv, int events, int timeout,
-                       sr_receive_data_callback_t cb, void *cb_data)
+                       sr_receive_data_callback cb, void *cb_data)
 {
        struct usbtmc_scpi *uscpi = priv;
        struct sr_usbtmc_dev_inst *usbtmc = uscpi->usbtmc;
@@ -190,6 +213,7 @@ SR_PRIV const struct sr_scpi_dev_inst scpi_usbtmc_dev = {
        .name          = "USBTMC",
        .prefix        = "/dev/usbtmc",
        .priv_size     = sizeof(struct usbtmc_scpi),
+       .scan          = scpi_usbtmc_scan,
        .dev_inst_new  = scpi_usbtmc_dev_inst_new,
        .open          = scpi_usbtmc_open,
        .source_add    = scpi_usbtmc_source_add,