X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=9892df0f055e16f8a8ad76e860398f6790ba4997;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=a4022f1fb63da8bdbebc6ebbca9ffe8e01d9c23f;hpb=ca070ed9a0237e5cea10e5dd974e06da62de890d;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index a4022f1f..9892df0f 100644
--- 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;
 	}
 
@@ -664,7 +664,6 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
 	gettimeofday(&header.starttime, NULL);
 	header.samplerate = zp->cur_samplerate;
 	header.num_logic_probes = zp->num_channels;
-	header.num_analog_probes = 0;
 	sr_session_bus(session_data, &packet);
 
 	if (!(buf = g_try_malloc(PACKET_SIZE))) {