X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Ftondaj-sl-814%2Fapi.c;h=5b7ed363bc3b4b195cf20ae11a113d02de969796;hb=388f9d3e25da89df1fb01412688339b6de54e14e;hp=8962437069de2147ee8b55816148faa1802ac058;hpb=34f06b903e3529a73feb7a6e74fae934a999f821;p=libsigrok.git

diff --git a/hardware/tondaj-sl-814/api.c b/hardware/tondaj-sl-814/api.c
index 89624370..5b7ed363 100644
--- a/hardware/tondaj-sl-814/api.c
+++ b/hardware/tondaj-sl-814/api.c
@@ -39,11 +39,6 @@ static const int hwcaps[] = {
 	0,
 };
 
-static const char *probe_names[] = {
-	"P1",
-	NULL,
-};
-
 SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
 static struct sr_dev_driver *di = &tondaj_sl_814_driver_info;
 
@@ -82,6 +77,7 @@ static int hw_init(struct sr_context *sr_ctx)
 		return SR_ERR_MALLOC;
 	}
 
+	drvc->sr_ctx = sr_ctx;
 	di->priv = drvc;
 
 	return SR_OK;
@@ -119,10 +115,8 @@ static GSList *hw_scan(GSList *options)
 			break;
 		}
 	}
-	if (!conn) {
-		sr_dbg("Couldn't determine connection options.");
+	if (!conn)
 		return NULL;
-	}
 	if (!serialcomm)
 		serialcomm = SERIALCOMM;
 
@@ -145,7 +139,7 @@ static GSList *hw_scan(GSList *options)
 
 	sdi->priv = devc;
 	sdi->driver = di;
-	probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, probe_names[0]);
+	probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1");
 	if (!probe) {
 		sr_err("Failed to create probe.");
 		return NULL;
@@ -213,14 +207,7 @@ static int hw_info_get(int info_id, const void **data,
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
-	case SR_DI_NUM_PROBES:
-		*data = GINT_TO_POINTER(1);
-		break;
-	case SR_DI_PROBE_NAMES:
-		*data = probe_names;
-		break;
 	default:
-		sr_err("Unknown info_id: %d.", info_id);
 		return SR_ERR_ARG;
 	}