X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsysclk-lwla%2Flwla.h;h=bf5318d1e64d4c7c7cd21d0ea5a89f43d2121aa4;hb=8cd15dd4ce2fdbefbcc6e64632c8006e5404f253;hp=3e14525576de0b8a883834eeb88ed021a0827bf1;hpb=e1172cf847e522b07d063c36c3f54b0a5dc8429f;p=libsigrok.git

diff --git a/src/hardware/sysclk-lwla/lwla.h b/src/hardware/sysclk-lwla/lwla.h
index 3e145255..bf5318d1 100644
--- a/src/hardware/sysclk-lwla/lwla.h
+++ b/src/hardware/sysclk-lwla/lwla.h
@@ -47,60 +47,101 @@ struct sr_usb_dev_inst;
 #define LWLA_WORD_2(val) GUINT16_TO_LE(((val) >> 48) & 0xFFFF)
 #define LWLA_WORD_3(val) GUINT16_TO_LE(((val) >> 32) & 0xFFFF)
 
-/** USB device end points.
+/* Maximum number of 16-bit words sent at a time during acquisition.
+ * Used for allocating the libusb transfer buffer. Keep this even so that
+ * subsequent members are always 32-bit aligned.
  */
-enum {
-	EP_COMMAND   = 2,
-	EP_BITSTREAM = 4,
-	EP_REPLY     = 6 | LIBUSB_ENDPOINT_IN
-};
+#define MAX_ACQ_SEND_LEN16	64 /* 43 for capture setup plus stuffing */
+
+/* Maximum number of 32-bit words received at a time during acquisition.
+ * This is a multiple of the endpoint buffer size to avoid transfer overflow
+ * conditions.
+ */
+#define MAX_ACQ_RECV_LEN32	(2 * 512 / 4)
 
-/** LWLA protocol command ID codes.
+/* Maximum length of a register read/write sequence.
  */
-enum {
+#define MAX_REG_SEQ_LEN		8
+
+/* Logic datafeed packet size in bytes.
+ * This is a multiple of both 4 and 5 to match any model's unit size
+ * and memory granularity.
+ */
+#define PACKET_SIZE		(5000 * 4 * 5)
+
+/** LWLA protocol command ID codes. */
+enum command_id {
 	CMD_READ_REG	= 1,
 	CMD_WRITE_REG	= 2,
-	CMD_READ_MEM	= 6,
-	CMD_CAP_SETUP	= 7,
-	CMD_CAP_STATUS	= 8,
+	CMD_READ_MEM32	= 3,
+	CMD_READ_MEM36	= 6,
+	CMD_WRITE_LREGS	= 7,
+	CMD_READ_LREGS	= 8,
 };
 
 /** LWLA capture state flags.
+ * The bit positions are the same as in the LWLA1016 control register.
  */
-enum {
-	STATUS_CAPTURING = 1 << 1,
-	STATUS_TRIGGERED = 1 << 4,
-	STATUS_MEM_AVAIL = 1 << 5,
-	STATUS_FLAG_MASK = 0x3F
+enum status_flag {
+	STATUS_CAPTURING = 1 << 2,
+	STATUS_TRIGGERED = 1 << 5,
+	STATUS_MEM_AVAIL = 1 << 6,
 };
 
-/** LWLA register addresses.
- */
-enum {
-	REG_MEM_CTRL2   = 0x1074, /* capture buffer control ??? */
-	REG_MEM_FILL    = 0x1078, /* capture buffer fill level */
-	REG_MEM_CTRL4   = 0x107C, /* capture buffer control ??? */
-
-	REG_DIV_BYPASS  = 0x1094, /* bypass clock divider flag */
-
-	REG_LONG_STROBE = 0x10B0, /* long register read/write strobe */
-	REG_LONG_ADDR   = 0x10B4, /* long register address */
-	REG_LONG_LOW    = 0x10B8, /* long register low word */
-	REG_LONG_HIGH   = 0x10BC, /* long register high word */
-
-	REG_FREQ_CH1    = 0x10C0, /* channel 1 live frequency */
-	REG_FREQ_CH2    = 0x10C4, /* channel 2 live frequency */
-	REG_FREQ_CH3    = 0x10C8, /* channel 3 live frequency */
-	REG_FREQ_CH4    = 0x10CC, /* channel 4 live frequency */
+/** LWLA1034 run-length encoding states. */
+enum rle_state {
+	RLE_STATE_DATA,
+	RLE_STATE_LEN
 };
 
-/** Register/value pair.
- */
-struct regval_pair {
+/** Register address/value pair. */
+struct regval {
 	unsigned int reg;
-	unsigned int val;
+	uint32_t val;
+};
+
+/** LWLA sample acquisition and decompression state. */
+struct acquisition_state {
+	uint64_t samples_max;	/* maximum number of samples to process */
+	uint64_t samples_done;	/* number of samples sent to the session bus */
+	uint64_t duration_max;	/* maximum capture duration in milliseconds */
+	uint64_t duration_now;	/* running capture duration since trigger */
+
+	uint64_t sample;	/* last sample read from capture memory */
+	uint64_t run_len;	/* remaining run length of current sample */
+
+	struct libusb_transfer *xfer_in;	/* USB in transfer record */
+	struct libusb_transfer *xfer_out;	/* USB out transfer record */
+
+	unsigned int mem_addr_fill;	/* capture memory fill level */
+	unsigned int mem_addr_done;	/* next address to be processed */
+	unsigned int mem_addr_next;	/* start address for next async read */
+	unsigned int mem_addr_stop;	/* end of memory range to be read */
+	unsigned int in_index;		/* position in read transfer buffer */
+	unsigned int out_index;		/* position in logic packet buffer */
+	enum rle_state rle;		/* RLE decoding state */
+
+	gboolean rle_enabled;	/* capturing in timing-state mode */
+	gboolean clock_boost;	/* switch to faster clock during capture */
+	unsigned int status;	/* last received device status */
+
+	unsigned int reg_seq_pos;	/* index of next register/value pair */
+	unsigned int reg_seq_len;	/* length of register/value sequence */
+
+	struct regval reg_sequence[MAX_REG_SEQ_LEN];	/* register buffer */
+	uint32_t xfer_buf_in[MAX_ACQ_RECV_LEN32];	/* USB in buffer */
+	uint16_t xfer_buf_out[MAX_ACQ_SEND_LEN16];	/* USB out buffer */
+	uint8_t out_packet[PACKET_SIZE];		/* logic payload */
 };
 
+static inline void lwla_queue_regval(struct acquisition_state *acq,
+				     unsigned int reg, uint32_t value)
+{
+	acq->reg_sequence[acq->reg_seq_len].reg = reg;
+	acq->reg_sequence[acq->reg_seq_len].val = value;
+	acq->reg_seq_len++;
+}
+
 SR_PRIV int lwla_send_bitstream(struct sr_context *ctx,
 				const struct sr_usb_dev_inst *usb,
 				const char *name);
@@ -109,18 +150,15 @@ SR_PRIV int lwla_send_command(const struct sr_usb_dev_inst *usb,
 			      const uint16_t *command, int cmd_len);
 
 SR_PRIV int lwla_receive_reply(const struct sr_usb_dev_inst *usb,
-			       uint32_t *reply, int reply_len, int expect_len);
+			       void *reply, int buf_size, int *xfer_len);
 
 SR_PRIV int lwla_read_reg(const struct sr_usb_dev_inst *usb,
 			  uint16_t reg, uint32_t *value);
 
-SR_PRIV int lwla_read_long_reg(const struct sr_usb_dev_inst *usb,
-			       uint32_t addr, uint64_t *value);
-
 SR_PRIV int lwla_write_reg(const struct sr_usb_dev_inst *usb,
 			   uint16_t reg, uint32_t value);
 
 SR_PRIV int lwla_write_regs(const struct sr_usb_dev_inst *usb,
-			    const struct regval_pair *regvals, int count);
+			    const struct regval *regvals, int count);
 
 #endif