X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic16%2Fprotocol.h;h=db19498a12a19925f063b233a1015b0fdf5b2038;hb=499b17e9c043e1ec92e71095289d63f09b981eea;hp=0551712f1bdafab7ac0d4c2064ca7501e99fb675;hpb=f6a21fa50c3276eab4aacf61cae4ecfb16a98e73;p=libsigrok.git

diff --git a/hardware/saleae-logic16/protocol.h b/hardware/saleae-logic16/protocol.h
index 0551712f..db19498a 100644
--- a/hardware/saleae-logic16/protocol.h
+++ b/hardware/saleae-logic16/protocol.h
@@ -2,6 +2,8 @@
  * This file is part of the libsigrok project.
  *
  * Copyright (C) 2013 Marcus Comstedt <marcus@mc.pp.se>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
  * 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
@@ -25,21 +27,62 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "saleae-logic16: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "saleae-logic16"
+
+enum voltage_range {
+	VOLTAGE_RANGE_UNKNOWN,
+	VOLTAGE_RANGE_18_33_V,	/* 1.8V and 3.3V logic */
+	VOLTAGE_RANGE_5_V,	/* 5V logic */
+};
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
+	/*
+	 * Since we can't keep track of a Logic16 device after upgrading
+	 * the firmware (it renumerates into a different device address
+	 * after the upgrade) this is like a global lock. No device will open
+	 * until a proper delay after the last device was upgraded.
+	 */
+	int64_t fw_updated;
+
 	/** The currently configured samplerate of the device. */
 	uint64_t cur_samplerate;
+
+	/** Maximum number of samples to capture, if nonzero. */
+	uint64_t limit_samples;
+
+	/** The currently configured input voltage of the device. */
+	enum voltage_range cur_voltage_range;
+
+	/** The input voltage selected by the user. */
+	enum voltage_range selected_voltage_range;
+
+	/** Channels to use. */
+	uint16_t cur_channels;
+
+	/* EEPROM data from address 8. */
+	uint8_t eeprom_data[8];
+
+	int64_t num_samples;
+	int submitted_transfers;
+	int empty_transfer_count;
+	int num_channels, cur_channel;
+	uint16_t channel_masks[16];
+	uint16_t channel_data[16];
+	uint8_t *convbuffer;
+	size_t convbuffer_size;
+
+	void *cb_data;
+	unsigned int num_transfers;
+	struct libusb_transfer **transfers;
+	struct sr_context *ctx;
 };
 
-SR_PRIV int saleae_logic16_receive_data(int fd, int revents, void *cb_data);
+SR_PRIV int logic16_setup_acquisition(const struct sr_dev_inst *sdi,
+			uint64_t samplerate, uint16_t channels);
+SR_PRIV int logic16_start_acquisition(const struct sr_dev_inst *sdi);
+SR_PRIV int logic16_abort_acquisition(const struct sr_dev_inst *sdi);
+SR_PRIV int logic16_init_device(const struct sr_dev_inst *sdi);
+SR_PRIV void logic16_receive_transfer(struct libusb_transfer *transfer);
 
 #endif