build: Set CXXFLAGS when building Python module

[libsigrok.git] / src / hardware / sysclk-lwla / protocol.c

diff --git a/src/hardware/sysclk-lwla/protocol.c b/src/hardware/sysclk-lwla/protocol.c
index 5a1522fc9e60e50bfd050d0e15930c437a71788c..ba676f69a72c7804bfc6aed3b2bdcca359ce1fa8 100644 (file)
--- a/src/hardware/sysclk-lwla/protocol.c
+++ b/src/hardware/sysclk-lwla/protocol.c
@@ -257,10 +257,10 @@ static void issue_read_start(const struct sr_dev_inst *sdi)
        regvals[0].reg = REG_DIV_BYPASS;
        regvals[0].val = 1;
 
-       regvals[1].reg = REG_MEM_CTRL2;
-       regvals[1].val = 2;
+       regvals[1].reg = REG_MEM_CTRL;
+       regvals[1].val = MEM_CTRL_CLR_IDX;
 
-       regvals[2].reg = REG_MEM_CTRL4;
+       regvals[2].reg = REG_MEM_START;
        regvals[2].val = 4;
 
        devc->reg_write_pos = 0;
@@ -328,7 +328,7 @@ static void issue_stop_capture(const struct sr_dev_inst *sdi)
        regvals = devc->reg_write_seq;
 
        regvals[0].reg = REG_LONG_ADDR;
-       regvals[0].val = 10;
+       regvals[0].val = LREG_CAP_CTRL;
 
        regvals[1].reg = REG_LONG_LOW;
        regvals[1].val = 0;
@@ -372,13 +372,10 @@ static void process_capture_status(const struct sr_dev_inst *sdi)
                return;
        }
 
-       /* TODO: Find out the actual bit width of these fields as stored
-        * in the FPGA.  These fields are definitely less than 64 bit wide
-        * internally, and the unused bits occasionally even contain garbage.
-        */
        mem_fill = LWLA_TO_UINT32(acq->xfer_buf_in[0]);
-       duration = LWLA_TO_UINT32(acq->xfer_buf_in[4]);
-       flags    = LWLA_TO_UINT32(acq->xfer_buf_in[8]) & STATUS_FLAG_MASK;
+       duration = LWLA_TO_UINT32(acq->xfer_buf_in[4])
+               | ((uint64_t)LWLA_TO_UINT32(acq->xfer_buf_in[5]) << 32);
+       flags = LWLA_TO_UINT32(acq->xfer_buf_in[8]) & STATUS_FLAG_MASK;
 
        /* The LWLA1034 runs at 125 MHz if the clock divider is bypassed.
         * However, the time base used for the duration is apparently not
@@ -700,9 +697,9 @@ static void LIBUSB_CALL receive_transfer_in(struct libusb_transfer *transfer)
  */
 SR_PRIV int lwla_init_device(const struct sr_dev_inst *sdi)
 {
+       uint64_t value;
        struct dev_context *devc;
        int ret;
-       uint32_t value;
 
        devc = sdi->priv;
 
@@ -710,36 +707,23 @@ SR_PRIV int lwla_init_device(const struct sr_dev_inst *sdi)
        devc->cur_clock_config = CONF_CLOCK_NONE;
 
        ret = lwla_set_clock_config(sdi);
-
        if (ret != SR_OK)
                return ret;
 
-       ret = lwla_write_reg(sdi->conn, REG_LONG_ADDR, 100);
+       ret = lwla_read_long_reg(sdi->conn, LREG_TEST_ID, &value);
        if (ret != SR_OK)
                return ret;
 
-       ret = lwla_read_reg(sdi->conn, REG_LONG_STROBE, &value);
+       /* Ignore the value returned by the first read */
+       ret = lwla_read_long_reg(sdi->conn, LREG_TEST_ID, &value);
        if (ret != SR_OK)
                return ret;
-       sr_dbg("Received test word 0x%08X back.", value);
-       if (value != 0x12345678)
-               return SR_ERR;
 
-       ret = lwla_read_reg(sdi->conn, REG_LONG_HIGH, &value);
-       if (ret != SR_OK)
-               return ret;
-       sr_dbg("Received test word 0x%08X back.", value);
-       if (value != 0x12345678)
+       if (value != UINT64_C(0x1234567887654321)) {
+               sr_err("Received invalid test word 0x%016" PRIX64 ".", value);
                return SR_ERR;
-
-       ret = lwla_read_reg(sdi->conn, REG_LONG_LOW, &value);
-       if (ret != SR_OK)
-               return ret;
-       sr_dbg("Received test word 0x%08X back.", value);
-       if (value != 0x87654321)
-               return SR_ERR;
-
-       return ret;
+       }
+       return SR_OK;
 }
 
 /* Select the LWLA clock configuration.  If the clock source changed from
@@ -827,18 +811,18 @@ SR_PRIV int lwla_setup_acquisition(const struct sr_dev_inst *sdi)
                        sr_info("External clock, rising edge.");
        }
 
-       regvals[0].reg = REG_MEM_CTRL2;
-       regvals[0].val = 2;
+       regvals[0].reg = REG_MEM_CTRL;
+       regvals[0].val = MEM_CTRL_CLR_IDX;
 
-       regvals[1].reg = REG_MEM_CTRL2;
-       regvals[1].val = 1;
+       regvals[1].reg = REG_MEM_CTRL;
+       regvals[1].val = MEM_CTRL_WRITE;
 
        regvals[2].reg = REG_LONG_ADDR;
-       regvals[2].val = 10;
+       regvals[2].val = LREG_CAP_CTRL;
 
        regvals[3].reg = REG_LONG_LOW;
-       regvals[3].val = 0x74;
-
+       regvals[3].val = CAP_CTRL_CLR_TIMEBASE | CAP_CTRL_FLUSH_FIFO
+                      | CAP_CTRL_CLR_FIFOFULL | CAP_CTRL_CLR_COUNTER;
        regvals[4].reg = REG_LONG_HIGH;
        regvals[4].val = 0;
 
@@ -888,10 +872,10 @@ SR_PRIV int lwla_start_acquisition(const struct sr_dev_inst *sdi)
        regvals = devc->reg_write_seq;
 
        regvals[0].reg = REG_LONG_ADDR;
-       regvals[0].val = 10;
+       regvals[0].val = LREG_CAP_CTRL;
 
        regvals[1].reg = REG_LONG_LOW;
-       regvals[1].val = 1;
+       regvals[1].val = CAP_CTRL_TRG_EN;
 
        regvals[2].reg = REG_LONG_HIGH;
        regvals[2].val = 0;