X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds1xx2%2Fapi.c;h=ba59c2156af26c66e7026565617d408c76b6277f;hb=8e2da1a650dade6529668d4b22e906ccec172b17;hp=81ea66950c06a560d2868fa0ac2ef18d80913729;hpb=fa85f376301dd43232032867f8df834e746060c6;p=libsigrok.git

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 81ea6695..ba59c215 100644
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -133,8 +133,10 @@ static const char *coupling[] = {
 static const char *supported_models[] = {
 	"DS1052E",
 	"DS1102E",
+	"DS1152E",
 	"DS1052D",
 	"DS1102D",
+	"DS1152D",
 };
 
 SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info;
@@ -152,7 +154,7 @@ static void clear_helper(void *priv)
 	g_free(devc->trigger_slope);
 }
 
-static int clear_instances(void)
+static int dev_clear(void)
 {
 	return std_dev_clear(di, clear_helper);
 }
@@ -178,7 +180,7 @@ static int set_cfg(const struct sr_dev_inst *sdi, const char *format, ...)
 
 static int init(struct sr_context *sr_ctx)
 {
-	return std_hw_init(sr_ctx, di, LOG_PREFIX);
+	return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static int probe_port(const char *port, GSList **devices)
@@ -307,8 +309,9 @@ static GSList *scan(GSList *options)
 		if (probe_port(port, &devices) == SR_ERR_MALLOC)
 			return NULL;
 	} else {
-		if (!(dir = g_dir_open("/sys/class/usb/", 0, NULL)))
-			return NULL;
+		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;
@@ -364,7 +367,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
-	return clear_instances();
+	return dev_clear();
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
@@ -646,7 +649,7 @@ SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info = {
 	.cleanup = cleanup,
 	.scan = scan,
 	.dev_list = dev_list,
-	.dev_clear = clear_instances,
+	.dev_clear = dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,