X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Falsa%2Falsa.c;h=940dce993eb9fa0c25beefaa04f82c5309128420;hb=3cd3a20b350ed1e86675aee067f60ac5a2f576b1;hp=d915f05830493a53ab9f7f9b56dcafd748b7b937;hpb=1f9813eb6cf2fa3b6511af46b19270feb9484c1e;p=libsigrok.git

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index d915f058..940dce99 100644
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -63,7 +63,7 @@ struct context {
 	uint64_t limit_samples;
 	snd_pcm_t *capture_handle;
 	snd_pcm_hw_params_t *hw_params;
-	gpointer session_id;
+	void *session_dev_id;
 };
 
 static int hw_init(const char *devinfo)
@@ -293,7 +293,7 @@ static int receive_data(int fd, int revents, void *cb_data)
 	return TRUE;
 }
 
-static int hw_dev_acquisition_start(int dev_index, void *session_dev_id)
+static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 {
 	struct sr_dev_inst *sdi;
 	struct context *ctx;
@@ -368,7 +368,7 @@ static int hw_dev_acquisition_start(int dev_index, void *session_dev_id)
 		return SR_ERR;
 	}
 
-	ctx->session_id = session_dev_id;
+	ctx->session_dev_id = cb_data;
 	sr_source_add(ufds[0].fd, ufds[0].events, 10, receive_data, sdi);
 
 	packet.type = SR_DF_HEADER;
@@ -380,17 +380,18 @@ static int hw_dev_acquisition_start(int dev_index, void *session_dev_id)
 	header.num_analog_probes = NUM_PROBES;
 	header.num_logic_probes = 0;
 	header.protocol_id = SR_PROTO_RAW;
-	sr_session_send(session_dev_id, &packet);
+	sr_session_send(cb_data, &packet);
 	g_free(ufds);
 
 	return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(int dev_index, void *session_dev_id)
+/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
+static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
 {
 	/* Avoid compiler warnings. */
-	dev_index = dev_index;
-	session_dev_id = session_dev_id;
+	(void)dev_index;
+	(void)cb_data;
 
 	return SR_OK;
 }