X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Falsa%2Fapi.c;h=dd5588dd4ff11c10d92e5ec6c96eb7f7db0bbad0;hb=df03552894dc80e2de6f818622936663c5b05946;hp=d55b50e74e70653ca037013dd6356f5e42645f88;hpb=29a27196a13de2ffd9b671185e4b464b9db9b549;p=libsigrok.git

diff --git a/hardware/alsa/api.c b/hardware/alsa/api.c
index d55b50e7..dd5588dd 100644
--- a/hardware/alsa/api.c
+++ b/hardware/alsa/api.c
@@ -36,35 +36,37 @@ static const int32_t hwcaps[] = {
 SR_PRIV struct sr_dev_driver alsa_driver_info;
 static struct sr_dev_driver *di = &alsa_driver_info;
 
-static int clear_instances(void)
+static void clear_helper(void *priv)
 {
-	struct drv_context *drvc;
+	struct dev_context *devc;
 
-	if (!(drvc = di->priv))
-		return SR_OK;
+	devc = priv;
 
-	g_slist_free_full(drvc->instances, (GDestroyNotify)alsa_dev_inst_clear);
-	drvc->instances = NULL;
+	snd_pcm_hw_params_free(devc->hw_params);
+	g_free((void *)devc->samplerates);
+}
 
-	return SR_OK;
+static int dev_clear(void)
+{
+	return std_dev_clear(di, clear_helper);
 }
 
-static int hw_init(struct sr_context *sr_ctx)
+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 GSList *hw_scan(GSList *options)
+static GSList *scan(GSList *options)
 {
 	return alsa_scan(options, di);
 }
 
-static GSList *hw_dev_list(void)
+static GSList *dev_list(void)
 {
 	return ((struct drv_context *)(di->priv))->instances;
 }
 
-static int hw_dev_open(struct sr_dev_inst *sdi)
+static int dev_open(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	int ret;
@@ -97,7 +99,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int hw_dev_close(struct sr_dev_inst *sdi)
+static int dev_close(struct sr_dev_inst *sdi)
 {
 	int ret;
 	struct dev_context *devc;
@@ -119,11 +121,9 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int hw_cleanup(void)
+static int cleanup(void)
 {
-	clear_instances();
-
-	return SR_OK;
+	return dev_clear();
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
@@ -172,8 +172,6 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 	GVariantBuilder gvb;
 	int i;
 
-	(void)sdi;
-
 	switch (key) {
 	case SR_CONF_DEVICE_OPTIONS:
 		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
@@ -202,8 +200,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
-				    void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
 	struct dev_context *devc;
 	int count, ret;
@@ -302,7 +299,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
 	struct sr_datafeed_packet packet;
 	struct dev_context *devc;
@@ -324,17 +321,17 @@ SR_PRIV struct sr_dev_driver alsa_driver_info = {
 	.name = "alsa",
 	.longname = "ALSA driver",
 	.api_version = 1,
-	.init = hw_init,
-	.cleanup = hw_cleanup,
-	.scan = hw_scan,
-	.dev_list = hw_dev_list,
-	.dev_clear = clear_instances,
+	.init = init,
+	.cleanup = cleanup,
+	.scan = scan,
+	.dev_list = dev_list,
+	.dev_clear = dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,
-	.dev_open = hw_dev_open,
-	.dev_close = hw_dev_close,
-	.dev_acquisition_start = hw_dev_acquisition_start,
-	.dev_acquisition_stop = hw_dev_acquisition_stop,
+	.dev_open = dev_open,
+	.dev_close = dev_close,
+	.dev_acquisition_start = dev_acquisition_start,
+	.dev_acquisition_stop = dev_acquisition_stop,
 	.priv = NULL,
 };