Prefix device structs with sr_.

[libsigrok.git] / hardware / alsa / alsa.c

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index 2ff25f2b5a1eba08d6959428f6637ca4b35d0eb9..cef1814b068df415c686d323518e91b0ebcfb7a1 100644 (file)
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -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, ST_ACTIVE, "alsa", NULL, NULL);
        if (!sdi)
                goto free_alsa;
 
@@ -74,11 +74,11 @@ 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)))
+       if (!(sdi = sr_get_device_instance(device_instances, device_index)))
                return SR_ERR;
        alsa = sdi->priv;
 
@@ -109,10 +109,10 @@ static int hw_opendev(int device_index)
 
 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,22 +126,22 @@ 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;
 
@@ -178,10 +178,10 @@ 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)))
+       if (!(sdi = sr_get_device_instance(device_instances, device_index)))
                return SR_ERR;
        alsa = sdi->priv;
 
@@ -201,9 +201,9 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 
 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 sr_datafeed_packet packet;
        struct analog_sample *sample;
        unsigned int sample_size = sizeof(struct analog_sample) +
                (NUM_PROBES * sizeof(struct analog_probe));
@@ -258,15 +258,15 @@ static int receive_data(int fd, int revents, void *user_data)
 
 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)))
+       if (!(sdi = sr_get_device_instance(device_instances, device_index)))
                return SR_ERR;
        alsa = sdi->priv;
 
@@ -334,7 +334,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        source_add(ufds[0].fd, ufds[0].events, 10, receive_data, sdi);
 
        packet.type = DF_HEADER;
-       packet.length = sizeof(struct datafeed_header);
+       packet.length = sizeof(struct sr_datafeed_header);
        packet.payload = (unsigned char *) &header;
        header.feed_version = 1;
        gettimeofday(&header.starttime, NULL);
@@ -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,