Constify some more 'char *' parameters.

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

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index 3ddadcb937f6838919d439bae547eadd5916db52..4ec98a9e5a384b8f630b40f7699a4d151e8fe510 100644 (file)
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -45,7 +45,7 @@ struct alsa {
        gpointer session_id;
 };
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
        struct sr_device_instance *sdi;
        struct alsa *alsa;
@@ -204,9 +204,9 @@ static int receive_data(int fd, int revents, void *user_data)
        struct sr_device_instance *sdi = user_data;
        struct alsa *alsa = sdi->priv;
        struct sr_datafeed_packet packet;
-       struct analog_sample *sample;
-       unsigned int sample_size = sizeof(struct analog_sample) +
-               (NUM_PROBES * sizeof(struct analog_probe));
+       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;
 
@@ -244,14 +244,14 @@ static int receive_data(int fd, int revents, void *user_data)
                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 = SR_DF_END;
-       session_bus(user_data, &packet);
+       sr_session_bus(user_data, &packet);
 
        return TRUE;
 }
@@ -331,7 +331,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        }
 
        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 = SR_DF_HEADER;
        packet.length = sizeof(struct sr_datafeed_header);
@@ -342,7 +342,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        header.num_analog_probes = NUM_PROBES;
        header.num_logic_probes = 0;
        header.protocol_id = SR_PROTO_RAW;
-       session_bus(session_device_id, &packet);
+       sr_session_bus(session_device_id, &packet);
        free(ufds);
 
        return SR_OK;