kingst-la2016: fix the fpga register addresses

[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 f0f280fa10422a42cdc0b2e4e230ea154b1166ba..bf5318d1e64d4c7c7cd21d0ea5a89f43d2121aa4 100644 (file)
--- a/src/hardware/sysclk-lwla/lwla.h
+++ b/src/hardware/sysclk-lwla/lwla.h
@@ -61,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
@@ -69,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,
@@ -91,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 */
@@ -162,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);