X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Falsa%2Falsa.c;h=c985e6be90630a3ba1718462697ae99a6237afe7;hb=809c5f2011198a064a2e5e4028f19e63eb532ec1;hp=7abdd56ef01ea545a1f7058bba0c37d23d1b7192;hpb=da6923732120b9f169c5991000ecabd15c05ffc0;p=libsigrok.git

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index 7abdd56e..c985e6be 100644
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -30,9 +30,9 @@
 #define AUDIO_DEV "plughw:0,0"
 
 static int capabilities[] = {
-	HWCAP_SAMPLERATE,
-	HWCAP_LIMIT_SAMPLES,
-	HWCAP_CONTINUOUS,
+	SR_HWCAP_SAMPLERATE,
+	SR_HWCAP_LIMIT_SAMPLES,
+	SR_HWCAP_CONTINUOUS,
 };
 
 static GSList *device_instances = NULL;
@@ -47,7 +47,7 @@ struct alsa {
 
 static int hw_init(char *deviceinfo)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	struct alsa *alsa;
 
 	/* Avoid compiler warnings. */
@@ -58,7 +58,7 @@ static int hw_init(char *deviceinfo)
 		return 0;
 	memset(alsa, 0, sizeof(struct alsa));
 
-	sdi = sigrok_device_instance_new(0, ST_ACTIVE, "alsa", NULL, NULL);
+	sdi = sr_device_instance_new(0, SR_ST_ACTIVE, "alsa", NULL, NULL);
 	if (!sdi)
 		goto free_alsa;
 
@@ -74,12 +74,12 @@ free_alsa:
 
 static int hw_opendev(int device_index)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	struct alsa *alsa;
 	int err;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
-		return SIGROK_ERR;
+	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+		return SR_ERR;
 	alsa = sdi->priv;
 
 	err = snd_pcm_open(&alsa->capture_handle, AUDIO_DEV,
@@ -87,32 +87,32 @@ static int hw_opendev(int device_index)
 	if (err < 0) {
 		g_warning("cannot open audio device %s (%s)", AUDIO_DEV,
 				snd_strerror(err));
-		return SIGROK_ERR;
+		return SR_ERR;
 	}
 
 	err = snd_pcm_hw_params_malloc(&alsa->hw_params);
 	if (err < 0) {
 		g_warning("cannot allocate hardware parameter structure (%s)",
 				snd_strerror(err));
-		return SIGROK_ERR;
+		return SR_ERR;
 	}
 
 	err = snd_pcm_hw_params_any(alsa->capture_handle, alsa->hw_params);
 	if (err < 0) {
 		g_warning("cannot initialize hardware parameter structure (%s)",
 				snd_strerror(err));
-		return SIGROK_ERR;
+		return SR_ERR;
 	}
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
 static void hw_closedev(int device_index)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	struct alsa *alsa;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
 		return;
 	alsa = sdi->priv;
 	if (!alsa)
@@ -126,37 +126,37 @@ static void hw_closedev(int device_index)
 
 static void hw_cleanup(void)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, 0)))
+	if (!(sdi = sr_get_device_instance(device_instances, 0)))
 		return;
 
 	free(sdi->priv);
-	sigrok_device_instance_free(sdi);
+	sr_device_instance_free(sdi);
 }
 
 static void *hw_get_device_info(int device_index, int device_info_id)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	struct alsa *alsa;
 	void *info = NULL;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
 		return NULL;
 	alsa = sdi->priv;
 
 	switch (device_info_id) {
-	case DI_INSTANCE:
+	case SR_DI_INSTANCE:
 		info = sdi;
 		break;
-	case DI_NUM_PROBES:
+	case SR_DI_NUM_PROBES:
 		info = GINT_TO_POINTER(NUM_PROBES);
 		break;
-	case DI_CUR_SAMPLERATE:
+	case SR_DI_CUR_SAMPLERATE:
 		info = &alsa->cur_rate;
 		break;
-	// case DI_PROBE_TYPE:
-	// 	info = GINT_TO_POINTER(PROBE_TYPE_ANALOG);
+	// case SR_DI_PROBE_TYPE:
+	// 	info = GINT_TO_POINTER(SR_PROBE_TYPE_ANALOG);
 	// 	break;
 	}
 
@@ -168,7 +168,7 @@ static int hw_get_status(int device_index)
 	/* Avoid compiler warnings. */
 	device_index = device_index;
 
-	return ST_ACTIVE;
+	return SR_ST_ACTIVE;
 }
 
 static int *hw_get_capabilities(void)
@@ -178,35 +178,35 @@ static int *hw_get_capabilities(void)
 
 static int hw_set_configuration(int device_index, int capability, void *value)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	struct alsa *alsa;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
-		return SIGROK_ERR;
+	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+		return SR_ERR;
 	alsa = sdi->priv;
 
 	switch (capability) {
-	case HWCAP_PROBECONFIG:
-		return SIGROK_OK;
-	case HWCAP_SAMPLERATE:
+	case SR_HWCAP_PROBECONFIG:
+		return SR_OK;
+	case SR_HWCAP_SAMPLERATE:
 		alsa->cur_rate = *(uint64_t *) value;
-		return SIGROK_OK;
-	case HWCAP_LIMIT_SAMPLES:
+		return SR_OK;
+	case SR_HWCAP_LIMIT_SAMPLES:
 		alsa->limit_samples = *(uint64_t *) value;
-		return SIGROK_OK;
+		return SR_OK;
 	default:
-		return SIGROK_ERR;
+		return SR_ERR;
 	}
 }
 
 static int receive_data(int fd, int revents, void *user_data)
 {
-	struct sigrok_device_instance *sdi = user_data;
+	struct sr_device_instance *sdi = user_data;
 	struct alsa *alsa = sdi->priv;
-	struct datafeed_packet packet;
-	struct analog_sample *sample;
-	unsigned int sample_size = sizeof(struct analog_sample) +
-		(NUM_PROBES * sizeof(struct analog_probe));
+	struct sr_datafeed_packet packet;
+	struct sr_analog_sample *sample;
+	unsigned int sample_size = sizeof(struct sr_analog_sample) +
+		(NUM_PROBES * sizeof(struct sr_analog_probe));
 	char *outb;
 	char inb[4096];
 	int i, x, count;
@@ -228,7 +228,7 @@ static int receive_data(int fd, int revents, void *user_data)
 			return FALSE;
 
 		for (i = 0; i < count; i++) {
-			sample = (struct analog_sample *)
+			sample = (struct sr_analog_sample *)
 						(outb + (i * sample_size));
 			sample->num_probes = NUM_PROBES;
 
@@ -240,41 +240,41 @@ static int receive_data(int fd, int revents, void *user_data)
 			}
 		}
 
-		packet.type = DF_ANALOG;
+		packet.type = SR_DF_ANALOG;
 		packet.length = count * sample_size;
 		packet.unitsize = sample_size;
 		packet.payload = outb;
-		session_bus(user_data, &packet);
+		sr_session_bus(user_data, &packet);
 		free(outb);
 		alsa->limit_samples -= count;
 
 	} while (alsa->limit_samples > 0);
 
-	packet.type = DF_END;
-	session_bus(user_data, &packet);
+	packet.type = SR_DF_END;
+	sr_session_bus(user_data, &packet);
 
 	return TRUE;
 }
 
 static int hw_start_acquisition(int device_index, gpointer session_device_id)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	struct alsa *alsa;
-	struct datafeed_packet packet;
-	struct datafeed_header header;
+	struct sr_datafeed_packet packet;
+	struct sr_datafeed_header header;
 	struct pollfd *ufds;
 	int count;
 	int err;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
-		return SIGROK_ERR;
+	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+		return SR_ERR;
 	alsa = sdi->priv;
 
 	err = snd_pcm_hw_params_set_access(alsa->capture_handle,
 			alsa->hw_params, SND_PCM_ACCESS_RW_INTERLEAVED);
 	if (err < 0) {
 		g_warning("cannot set access type (%s)", snd_strerror(err));
-		return SIGROK_ERR;
+		return SR_ERR;
 	}
 
 	/* FIXME: Hardcoded for 16bits */
@@ -282,70 +282,70 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 			alsa->hw_params, SND_PCM_FORMAT_S16_LE);
 	if (err < 0) {
 		g_warning("cannot set sample format (%s)", snd_strerror(err));
-		return SIGROK_ERR;
+		return SR_ERR;
 	}
 
 	err = snd_pcm_hw_params_set_rate_near(alsa->capture_handle,
 			alsa->hw_params, (unsigned int *) &alsa->cur_rate, 0);
 	if (err < 0) {
 		g_warning("cannot set sample rate (%s)", snd_strerror(err));
-		return SIGROK_ERR;
+		return SR_ERR;
 	}
 
 	err = snd_pcm_hw_params_set_channels(alsa->capture_handle,
 			alsa->hw_params, NUM_PROBES);
 	if (err < 0) {
 		g_warning("cannot set channel count (%s)", snd_strerror(err));
-		return SIGROK_ERR;
+		return SR_ERR;
 	}
 
 	err = snd_pcm_hw_params(alsa->capture_handle, alsa->hw_params);
 	if (err < 0) {
 		g_warning("cannot set parameters (%s)", snd_strerror(err));
-		return SIGROK_ERR;
+		return SR_ERR;
 	}
 
 	err = snd_pcm_prepare(alsa->capture_handle);
 	if (err < 0) {
 		g_warning("cannot prepare audio interface for use (%s)",
 				snd_strerror(err));
-		return SIGROK_ERR;
+		return SR_ERR;
 	}
 
 	count = snd_pcm_poll_descriptors_count(alsa->capture_handle);
 	if (count < 1) {
 		g_warning("Unable to obtain poll descriptors count");
-		return SIGROK_ERR;
+		return SR_ERR;
 	}
 
 	ufds = malloc(count * sizeof(struct pollfd));
 	if (!ufds)
-		return SIGROK_ERR_MALLOC;
+		return SR_ERR_MALLOC;
 
 	err = snd_pcm_poll_descriptors(alsa->capture_handle, ufds, count);
 	if (err < 0) {
 		g_warning("Unable to obtain poll descriptors (%s)",
 				snd_strerror(err));
 		free(ufds);
-		return SIGROK_ERR;
+		return SR_ERR;
 	}
 
 	alsa->session_id = session_device_id;
-	source_add(ufds[0].fd, ufds[0].events, 10, receive_data, sdi);
+	sr_source_add(ufds[0].fd, ufds[0].events, 10, receive_data, sdi);
 
-	packet.type = DF_HEADER;
-	packet.length = sizeof(struct datafeed_header);
+	packet.type = SR_DF_HEADER;
+	packet.length = sizeof(struct sr_datafeed_header);
 	packet.payload = (unsigned char *) &header;
 	header.feed_version = 1;
 	gettimeofday(&header.starttime, NULL);
 	header.samplerate = alsa->cur_rate;
 	header.num_analog_probes = NUM_PROBES;
 	header.num_logic_probes = 0;
-	header.protocol_id = PROTO_RAW;
-	session_bus(session_device_id, &packet);
+	header.protocol_id = SR_PROTO_RAW;
+	sr_session_bus(session_device_id, &packet);
 	free(ufds);
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
 static void hw_stop_acquisition(int device_index, gpointer session_device_id)
@@ -355,8 +355,9 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 	session_device_id = session_device_id;
 }
 
-struct device_plugin alsa_plugin_info = {
+struct sr_device_plugin alsa_plugin_info = {
 	"alsa",
+	"ALSA driver",
 	1,
 	hw_init,
 	hw_cleanup,