ols: more robust device reset in acquisition stop

[libsigrok.git] / src / hardware / sysclk-lwla / lwla.h

diff --git a/src/hardware/sysclk-lwla/lwla.h b/src/hardware/sysclk-lwla/lwla.h
index 7bd5886415519524131774f8b30dd9cba81ca79f..bf5318d1e64d4c7c7cd21d0ea5a89f43d2121aa4 100644 (file)
--- a/src/hardware/sysclk-lwla/lwla.h
+++ b/src/hardware/sysclk-lwla/lwla.h
@@ -48,7 +48,8 @@ struct sr_usb_dev_inst;
 #define LWLA_WORD_3(val) GUINT16_TO_LE(((val) >> 32) & 0xFFFF)
 
 /* Maximum number of 16-bit words sent at a time during acquisition.
- * Used for allocating the libusb transfer buffer.
+ * Used for allocating the libusb transfer buffer. Keep this even so that
+ * subsequent members are always 32-bit aligned.
  */
 #define MAX_ACQ_SEND_LEN16     64 /* 43 for capture setup plus stuffing */
 
@@ -60,7 +61,7 @@ struct sr_usb_dev_inst;
 
 /* Maximum length of a register read/write sequence.
  */
-#define MAX_REG_SEQ_LEN                16
+#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
@@ -68,16 +69,7 @@ struct sr_usb_dev_inst;
  */
 #define PACKET_SIZE            (5000 * 4 * 5)
 
-/** USB device end points.
- */
-enum usb_endpoint {
-       EP_COMMAND = 2,
-       EP_CONFIG  = 4,
-       EP_REPLY   = 6 | LIBUSB_ENDPOINT_IN
-};
-
-/** LWLA protocol command ID codes.
- */
+/** LWLA protocol command ID codes. */
 enum command_id {
        CMD_READ_REG    = 1,
        CMD_WRITE_REG   = 2,
@@ -90,28 +82,25 @@ enum command_id {
 /** LWLA capture state flags.
  * The bit positions are the same as in the LWLA1016 control register.
  */
-enum {
+enum status_flag {
        STATUS_CAPTURING = 1 << 2,
        STATUS_TRIGGERED = 1 << 5,
        STATUS_MEM_AVAIL = 1 << 6,
 };
 
-/** LWLA1034 run-length encoding states.
- */
+/** LWLA1034 run-length encoding states. */
 enum rle_state {
        RLE_STATE_DATA,
        RLE_STATE_LEN
 };
 
-/** Register address/value pair.
- */
+/** Register address/value pair. */
 struct regval {
        unsigned int reg;
        uint32_t val;
 };
 
-/** LWLA sample acquisition and decompression state.
- */
+/** 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 */
@@ -124,13 +113,13 @@ struct acquisition_state {
        struct libusb_transfer *xfer_in;        /* USB in transfer record */
        struct libusb_transfer *xfer_out;       /* USB out transfer record */
 
-       size_t mem_addr_fill;   /* capture memory fill level */
-       size_t mem_addr_done;   /* position up to which data was received */
-       size_t mem_addr_next;   /* start address for next async read */
-       size_t mem_addr_stop;   /* end of memory range to be read */
-       size_t in_index;        /* position in read transfer buffer */
-       size_t out_index;       /* position in logic packet buffer */
-       enum rle_state rle;     /* RLE decoding state */
+       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 */
@@ -161,7 +150,7 @@ 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);