X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Falsa%2Fapi.c;h=4349bc813196660fc64d4118b4004125806ab798;hb=035a1078fda93cf1da37d19b3a1d95311b99b00f;hp=227132474ae79ea8c473858131b327f2abf43ea1;hpb=69e19dd7691f86ac001469d1b319e1358e0d9778;p=libsigrok.git

diff --git a/hardware/alsa/api.c b/hardware/alsa/api.c
index 22713247..4349bc81 100644
--- a/hardware/alsa/api.c
+++ b/hardware/alsa/api.c
@@ -140,15 +140,14 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static int hw_info_get(int info_id, const void **data,
-		       const struct sr_dev_inst *sdi)
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 
-	if (info_id != SR_DI_HWCAPS) /* For SR_DI_HWCAPS sdi will be NULL. */
+	if (id != SR_DI_HWCAPS) /* For SR_DI_HWCAPS sdi will be NULL. */
 		devc = sdi->priv;
 
-	switch (info_id) {
+	switch (id) {
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
@@ -169,14 +168,13 @@ static int hw_info_get(int info_id, const void **data,
 	return SR_OK;
 }
 
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-			     const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 
 	devc = sdi->priv;
 
-	switch (hwcap) {
+	switch (id) {
 	case SR_CONF_SAMPLERATE:
 		alsa_set_samplerate(sdi, *(const uint64_t *)value);
 		break;
@@ -184,7 +182,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		devc->limit_samples = *(const uint64_t *)value;
 		break;
 	default:
-		sr_err("Unknown capability: %d.", hwcap);
+		sr_err("Unknown capability: %d.", id);
 		return SR_ERR;
 	}
 
@@ -322,10 +320,10 @@ SR_PRIV struct sr_dev_driver alsa_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = clear_instances,
+	.config_get = config_get,
+	.config_set = config_set,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
-	.info_get = hw_info_get,
-	.dev_config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
 	.priv = NULL,