sr: cleanup callback: Return int.

[libsigrok.git] / hardware / zeroplus-logic-cube / zeroplus.c

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 4abd7f789b0a1011d27900396ac173d677de09bf..02ba89d719866242c6216c21fe26b20982c8deae 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -197,7 +197,7 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev,
        }
 
        if ((err = libusb_get_device_descriptor(dev, des))) {
-               sr_warn("failed to get device descriptor: %d", err);
+               sr_err("failed to get device descriptor: %d", err);
                return -1;
        }
 
@@ -219,7 +219,7 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev,
                }
 
                if (zp->num_channels == 0) {
-                       sr_warn("Unknown ZeroPlus device %04X", des->idProduct);
+                       sr_err("Unknown ZeroPlus device %04X", des->idProduct);
                        return -2;
                }
 
@@ -230,7 +230,7 @@ static int opendev4(struct sr_device_instance **sdi, libusb_device *dev,
                                (*sdi)->index, zp->usb->bus,
                                zp->usb->address, USB_INTERFACE);
                } else {
-                       sr_warn("failed to open device: %d", err);
+                       sr_err("failed to open device: %d", err);
                        *sdi = NULL;
                }
        }
@@ -363,7 +363,7 @@ static int hw_init(const char *deviceinfo)
        // memset(zp->trigger_buffer, 0, NUM_TRIGGER_STAGES);
 
        if (libusb_init(&usb_context) != 0) {
-               sr_warn("Failed to initialize USB.");
+               sr_err("Failed to initialize USB.");
                return 0;
        }
 
@@ -374,7 +374,7 @@ static int hw_init(const char *deviceinfo)
        for (i = 0; devlist[i]; i++) {
                err = libusb_get_device_descriptor(devlist[i], &des);
                if (err != 0) {
-                       sr_warn("failed to get device descriptor: %d", err);
+                       sr_err("failed to get device descriptor: %d", err);
                        continue;
                }
 
@@ -416,7 +416,7 @@ static int hw_opendev(int device_index)
        int err;
 
        if (!(sdi = zp_open_device(device_index))) {
-               sr_warn("unable to open device");
+               sr_err("unable to open device");
                return SR_ERR;
        }
 
@@ -429,14 +429,14 @@ static int hw_opendev(int device_index)
 
        err = libusb_set_configuration(zp->usb->devhdl, USB_CONFIGURATION);
        if (err < 0) {
-               sr_warn("zp: Unable to set USB configuration %d: %d",
-                       USB_CONFIGURATION, err);
+               sr_err("zp: Unable to set USB configuration %d: %d",
+                      USB_CONFIGURATION, err);
                return SR_ERR;
        }
 
        err = libusb_claim_interface(zp->usb->devhdl, USB_INTERFACE);
        if (err != 0) {
-               sr_warn("Unable to claim interface: %d", err);
+               sr_err("Unable to claim interface: %d", err);
                return SR_ERR;
        }
 
@@ -485,10 +485,12 @@ static int hw_closedev(int device_index)
        return SR_OK;
 }
 
-static void hw_cleanup(void)
+static int hw_cleanup(void)
 {
        GSList *l;
 
+       /* TODO: Error handling. */
+
        /* Properly close all devices... */
        for (l = device_instances; l; l = l->next)
                close_device((struct sr_device_instance *)l->data);
@@ -502,6 +504,8 @@ static void hw_cleanup(void)
        if (usb_context)
                libusb_exit(usb_context);
        usb_context = NULL;
+
+       return SR_OK;
 }
 
 static void *hw_get_device_info(int device_index, int device_info_id)
@@ -698,7 +702,7 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
 }
 
 /* This stops acquisition on ALL devices, ignoring device_index. */
-static void hw_stop_acquisition(int device_index, gpointer session_device_id)
+static int hw_stop_acquisition(int device_index, gpointer session_device_id)
 {
        struct sr_datafeed_packet packet;
        struct sr_device_instance *sdi;
@@ -709,16 +713,18 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 
        if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
                sr_err("zp: %s: sdi was NULL", __func__);
-               return; /* FIXME */
+               return SR_ERR_BUG;
        }
 
        if (!(zp = sdi->priv)) {
                sr_err("zp: %s: sdi->priv was NULL", __func__);
-               return; /* FIXME */
+               return SR_ERR_BUG;
        }
 
        analyzer_reset(zp->usb->devhdl);
        /* TODO: Need to cancel and free any queued up transfers. */
+
+       return SR_OK;
 }
 
 SR_PRIV struct sr_device_plugin zeroplus_logic_cube_plugin_info = {