Build fix.

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

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index b41d8ed3536714f83e5a2fb695c3801e538c72e7..7abdd56ef01ea545a1f7058bba0c37d23d1b7192 100644 (file)
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -78,7 +78,7 @@ static int hw_opendev(int device_index)
        struct alsa *alsa;
        int err;
 
-       if (!(sdi = get_sigrok_device_instance(device_instances, 0)))
+       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
                return SIGROK_ERR;
        alsa = sdi->priv;
 
@@ -112,7 +112,7 @@ static void hw_closedev(int device_index)
        struct sigrok_device_instance *sdi;
        struct alsa *alsa;
 
-       if (!(sdi = get_sigrok_device_instance(device_instances, 0)))
+       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
                return;
        alsa = sdi->priv;
        if (!alsa)
@@ -155,9 +155,9 @@ static void *hw_get_device_info(int device_index, int device_info_id)
        case DI_CUR_SAMPLERATE:
                info = &alsa->cur_rate;
                break;
-       case DI_PROBE_TYPE:
-               info = GINT_TO_POINTER(PROBE_TYPE_ANALOG);
-               break;
+       // case DI_PROBE_TYPE:
+       //      info = GINT_TO_POINTER(PROBE_TYPE_ANALOG);
+       //      break;
        }
 
        return info;
@@ -211,6 +211,9 @@ static int receive_data(int fd, int revents, void *user_data)
        char inb[4096];
        int i, x, count;
 
+       fd = fd;
+       revents = revents;
+
        do {
                memset(inb, 0, sizeof(inb));
                count = snd_pcm_readi(alsa->capture_handle, inb,