X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcolead-slm%2Fapi.c;h=39e557a676ee2106fd9d232e82e6c154f0edcab7;hb=4b97c74e0b5c19ad0ee04620b618461248ab69d7;hp=4047a319995128450bdc0999ffd00ed6f68755ce;hpb=a1c743fc51d7b49c769fb525fe4b89985a9468c9;p=libsigrok.git

diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c
index 4047a319..39e557a6 100644
--- a/hardware/colead-slm/api.c
+++ b/hardware/colead-slm/api.c
@@ -78,7 +78,7 @@ static int hw_init(struct sr_context *sr_ctx)
 
 	if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
 		sr_err("Driver context malloc failed.");
-		return SR_ERR;
+		return SR_ERR_MALLOC;
 	}
 
 	drvc->sr_ctx = sr_ctx;
@@ -97,10 +97,11 @@ static GSList *hw_scan(GSList *options)
 	GSList *devices, *l;
 	const char *conn, *serialcomm;
 
-	devices = NULL;
 	drvc = di->priv;
 	drvc->instances = NULL;
 
+	devices = NULL;
+
 	conn = serialcomm = NULL;
 	for (l = options; l; l = l->next) {
 		src = l->data;
@@ -123,7 +124,7 @@ static GSList *hw_scan(GSList *options)
 		return NULL;
 
 	if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-		sr_dbg("failed to malloc devc");
+		sr_dbg("Device context malloc failed.");
 		return NULL;
 	}
 
@@ -191,24 +192,6 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-	(void)sdi;
-
-	switch (id) {
-	case SR_DI_HWOPTS:
-		*data = hwopts;
-		break;
-	case SR_DI_HWCAPS:
-		*data = hwcaps;
-		break;
-	default:
-		return SR_ERR_ARG;
-	}
-
-	return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
@@ -252,6 +235,12 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
 	(void)sdi;
 
 	switch (key) {
+	case SR_CONF_SCAN_OPTIONS:
+		*data = hwopts;
+		break;
+	case SR_CONF_DEVICE_OPTIONS:
+		*data = hwcaps;
+		break;
 	default:
 		return SR_ERR_ARG;
 	}
@@ -325,7 +314,6 @@ SR_PRIV struct sr_dev_driver colead_slm_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = clear_instances,
-	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,
 	.dev_open = hw_dev_open,