X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fnexus-osciprime%2Fapi.c;h=f28069860c25ad74663e3ac5feb5f14678ca51f2;hb=refs%2Ftags%2Fdsupstream;hp=b81b9e88c5f440d79246c35fc1ba6473069c8e69;hpb=e73ffd4238c6d1be58d3fcdcf7f100200f033856;p=libsigrok.git

diff --git a/hardware/nexus-osciprime/api.c b/hardware/nexus-osciprime/api.c
index b81b9e88..f2806986 100644
--- a/hardware/nexus-osciprime/api.c
+++ b/hardware/nexus-osciprime/api.c
@@ -42,7 +42,7 @@ static const int32_t hwcaps[] = {
 	SR_CONF_VDIV,
 };
 
-static const struct sr_rational timebases[] = {
+static const uint64_t timebases[][2] = {
 	/* 24 MHz */
 	{ 42, 1e9 },
 	/* 12 MHz */
@@ -94,7 +94,7 @@ static const char *probe_names[] = {
 	NULL,
 };
 
-static const struct sr_rational vdivs[] = {
+static const uint64_t vdivs[][2] = {
 	{ 1, 1 },
 	{ 2, 1 },
 	{ 5, 2 },
@@ -137,7 +137,7 @@ static int clear_instances(void)
 
 static int hw_init(struct sr_context *sr_ctx)
 {
-	return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
+	return std_hw_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *hw_scan(GSList *options)
@@ -157,9 +157,6 @@ static GSList *hw_scan(GSList *options)
 
 	drvc = di->priv;
 
-	/* USB scan is always authoritative. */
-	clear_instances();
-
 	conn = NULL;
 	for (l = options; l; l = l->next) {
 		src = l->data;