sr: la8: Fix typo.

[libsigrok.git] / hardware / chronovu-la8 / chronovu-la8.c

diff --git a/hardware/chronovu-la8/chronovu-la8.c b/hardware/chronovu-la8/chronovu-la8.c
index 05af43b96c52cc6613724a02402ed36b4a78467a..cfca8e3dea36d467bfef1edadc7fbf5bf5a49aa7 100644 (file)
--- a/hardware/chronovu-la8/chronovu-la8.c
+++ b/hardware/chronovu-la8/chronovu-la8.c
@@ -21,8 +21,8 @@
 #include <ftdi.h>
 #include <glib.h>
 #include <string.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 #define USB_VENDOR_ID                  0x0403
 #define USB_PRODUCT_ID                 0x6001
@@ -41,6 +41,18 @@
 
 static GSList *device_instances = NULL;
 
+static const char *probe_names[NUM_PROBES + 1] = {
+       "0",
+       "1",
+       "2",
+       "3",
+       "4",
+       "5",
+       "6",
+       "7",
+       NULL,
+};
+
 struct la8 {
        /** FTDI device context (used by libftdi). */
        struct ftdi_context *ftdic;
@@ -470,12 +482,11 @@ static int hw_init(const char *deviceinfo)
        sr_spew("la8: entering %s", __func__);
 
        /* Avoid compiler errors. */
-       deviceinfo = deviceinfo;
+       (void)deviceinfo;
 
        /* Allocate memory for our private driver context. */
        if (!(la8 = g_try_malloc(sizeof(struct la8)))) {
                sr_err("la8: %s: struct la8 malloc failed", __func__);
-               ret = SR_ERR_MALLOC;
                goto err_free_nothing;
        }
 
@@ -499,24 +510,21 @@ static int hw_init(const char *deviceinfo)
        /* Allocate memory where we'll store the de-mangled data. */
        if (!(la8->final_buf = g_try_malloc(SDRAM_SIZE))) {
                sr_err("la8: %s: final_buf malloc failed", __func__);
-               ret = SR_ERR_MALLOC;
                goto err_free_la8;
        }
 
        /* Allocate memory for the FTDI context (ftdic) and initialize it. */
        if (!(la8->ftdic = ftdi_new())) {
                sr_err("la8: %s: ftdi_new failed", __func__);
-               ret = SR_ERR; /* TODO: More specific error? */
                goto err_free_final_buf;
        }
 
        /* Check for the device and temporarily open it. */
        if ((ret = ftdi_usb_open_desc(la8->ftdic, USB_VENDOR_ID,
                        USB_PRODUCT_ID, USB_DESCRIPTION, NULL)) < 0) {
-               sr_err("la8: %s: ftdi_usb_open_desc: (%d) %s",
+               sr_dbg("la8: %s: ftdi_usb_open_desc: (%d) %s",
                       __func__, ret, ftdi_get_error_string(la8->ftdic));
                (void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
-               ret = SR_ERR; /* TODO: More specific error? */
                goto err_free_ftdic;
        }
        sr_dbg("la8: found device");
@@ -526,7 +534,6 @@ static int hw_init(const char *deviceinfo)
                        USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION);
        if (!sdi) {
                sr_err("la8: %s: sr_device_instance_new failed", __func__);
-               ret = SR_ERR; /* TODO: More specific error? */
                goto err_close_ftdic;
        }
 
@@ -539,7 +546,6 @@ static int hw_init(const char *deviceinfo)
        /* Close device. We'll reopen it again when we need it. */
        (void) la8_close(la8); /* Log, but ignore errors. */
 
-       // return SR_OK; /* TODO */
        return 1;
 
 err_close_ftdic:
@@ -551,7 +557,7 @@ err_free_final_buf:
 err_free_la8:
        g_free(la8);
 err_free_nothing:
-       // return ret; /* TODO */
+
        return 0;
 }
 
@@ -690,11 +696,17 @@ static void hw_cleanup(void)
                        sr_warn("la8: %s: sdi was NULL, continuing", __func__);
                        continue;
                }
+#if 0
+               /*
+                * Fixes a segfault as it's free()d elsewhere already.
+                * TODO: Document who is supposed to free this, and when.
+                */
                if (sdi->priv != NULL)
                        free(sdi->priv);
                else
                        sr_warn("la8: %s: sdi->priv was NULL, nothing "
                                "to do", __func__);
+#endif
                sr_device_instance_free(sdi); /* Returns void. */
        }
        g_slist_free(device_instances); /* Returns void. */
@@ -726,6 +738,9 @@ static void *hw_get_device_info(int device_index, int device_info_id)
        case SR_DI_NUM_PROBES:
                info = GINT_TO_POINTER(NUM_PROBES);
                break;
+       case SR_DI_PROBE_NAMES:
+               info = probe_names;
+               break;
        case SR_DI_SAMPLERATES:
                fill_supported_samplerates_if_needed();
                info = &samplerates;
@@ -987,11 +1002,11 @@ static int receive_data(int fd, int revents, void *session_data)
        struct la8 *la8;
 
        /* Avoid compiler errors. */
-       fd = fd;
-       revents = revents;
+       (void)fd;
+       (void)revents;
 
        if (!(sdi = session_data)) {
-               sr_err("la8: %s: user_data was NULL", __func__);
+               sr_err("la8: %s: session_data was NULL", __func__);
                return FALSE;
        }