sysclk-lwla: Clarify function of registers 10B0 to 10BC

[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 1c9bca885e08f3af60949aa8f807d1003331015b..5a1522fc9e60e50bfd050d0e15930c437a71788c 100644 (file)
--- a/src/hardware/sysclk-lwla/protocol.c
+++ b/src/hardware/sysclk-lwla/protocol.c
@@ -327,16 +327,16 @@ static void issue_stop_capture(const struct sr_dev_inst *sdi)
 
        regvals = devc->reg_write_seq;
 
-       regvals[0].reg = REG_CMD_CTRL2;
+       regvals[0].reg = REG_LONG_ADDR;
        regvals[0].val = 10;
 
-       regvals[1].reg = REG_CMD_CTRL3;
+       regvals[1].reg = REG_LONG_LOW;
        regvals[1].val = 0;
 
-       regvals[2].reg = REG_CMD_CTRL4;
+       regvals[2].reg = REG_LONG_HIGH;
        regvals[2].val = 0;
 
-       regvals[3].reg = REG_CMD_CTRL1;
+       regvals[3].reg = REG_LONG_STROBE;
        regvals[3].val = 0;
 
        regvals[4].reg = REG_DIV_BYPASS;
@@ -714,25 +714,25 @@ SR_PRIV int lwla_init_device(const struct sr_dev_inst *sdi)
        if (ret != SR_OK)
                return ret;
 
-       ret = lwla_write_reg(sdi->conn, REG_CMD_CTRL2, 100);
+       ret = lwla_write_reg(sdi->conn, REG_LONG_ADDR, 100);
        if (ret != SR_OK)
                return ret;
 
-       ret = lwla_read_reg(sdi->conn, REG_CMD_CTRL1, &value);
+       ret = lwla_read_reg(sdi->conn, REG_LONG_STROBE, &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_CMD_CTRL4, &value);
+       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)
                return SR_ERR;
 
-       ret = lwla_read_reg(sdi->conn, REG_CMD_CTRL3, &value);
+       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);
@@ -748,10 +748,12 @@ SR_PRIV int lwla_init_device(const struct sr_dev_inst *sdi)
 SR_PRIV int lwla_set_clock_config(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
+       struct drv_context *drvc;
        int ret;
        enum clock_config choice;
 
        devc = sdi->priv;
+       drvc = sdi->driver->context;
 
        if (sdi->status == SR_ST_INACTIVE)
                choice = CONF_CLOCK_NONE;
@@ -764,7 +766,8 @@ SR_PRIV int lwla_set_clock_config(const struct sr_dev_inst *sdi)
 
        if (choice != devc->cur_clock_config) {
                devc->cur_clock_config = CONF_CLOCK_NONE;
-               ret = lwla_send_bitstream(sdi->conn, bitstream_map[choice]);
+               ret = lwla_send_bitstream(drvc->sr_ctx, sdi->conn,
+                                         bitstream_map[choice]);
                if (ret == SR_OK)
                        devc->cur_clock_config = choice;
                return ret;
@@ -830,16 +833,16 @@ SR_PRIV int lwla_setup_acquisition(const struct sr_dev_inst *sdi)
        regvals[1].reg = REG_MEM_CTRL2;
        regvals[1].val = 1;
 
-       regvals[2].reg = REG_CMD_CTRL2;
+       regvals[2].reg = REG_LONG_ADDR;
        regvals[2].val = 10;
 
-       regvals[3].reg = REG_CMD_CTRL3;
+       regvals[3].reg = REG_LONG_LOW;
        regvals[3].val = 0x74;
 
-       regvals[4].reg = REG_CMD_CTRL4;
+       regvals[4].reg = REG_LONG_HIGH;
        regvals[4].val = 0;
 
-       regvals[5].reg = REG_CMD_CTRL1;
+       regvals[5].reg = REG_LONG_STROBE;
        regvals[5].val = 0;
 
        regvals[6].reg = REG_DIV_BYPASS;
@@ -884,16 +887,16 @@ SR_PRIV int lwla_start_acquisition(const struct sr_dev_inst *sdi)
 
        regvals = devc->reg_write_seq;
 
-       regvals[0].reg = REG_CMD_CTRL2;
+       regvals[0].reg = REG_LONG_ADDR;
        regvals[0].val = 10;
 
-       regvals[1].reg = REG_CMD_CTRL3;
+       regvals[1].reg = REG_LONG_LOW;
        regvals[1].val = 1;
 
-       regvals[2].reg = REG_CMD_CTRL4;
+       regvals[2].reg = REG_LONG_HIGH;
        regvals[2].val = 0;
 
-       regvals[3].reg = REG_CMD_CTRL1;
+       regvals[3].reg = REG_LONG_STROBE;
        regvals[3].val = 0;
 
        devc->reg_write_pos = 0;