X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic16%2Fprotocol.c;h=29be871b7f1aaa6909425481e43e0f607e2320ab;hb=db11d7d2d05c9e38978ae92920d96b61cf982d14;hp=03808874c97da793d895644397ee5bd411f817f4;hpb=b117363ad7510e300501612c0cda23b81adeccc5;p=libsigrok.git diff --git a/hardware/saleae-logic16/protocol.c b/hardware/saleae-logic16/protocol.c index 03808874..29be871b 100644 --- a/hardware/saleae-logic16/protocol.c +++ b/hardware/saleae-logic16/protocol.c @@ -429,6 +429,9 @@ SR_PRIV int saleae_logic16_setup_acquisition(const struct sr_dev_inst *sdi, uint8_t clock_select, reg1, reg10; uint64_t div; int i, ret, nchan = 0; + struct dev_context *devc; + + devc = sdi->priv; if (samplerate == 0 || samplerate > MAX_SAMPLE_RATE) { sr_err("Unable to sample at %" PRIu64 "Hz.", samplerate); @@ -460,6 +463,9 @@ SR_PRIV int saleae_logic16_setup_acquisition(const struct sr_dev_inst *sdi, return SR_ERR; } + if ((ret = upload_fpga_bitstream(sdi, devc->selected_voltage_range)) != SR_OK) + return ret; + if ((ret = read_fpga_register(sdi, 1, ®1)) != SR_OK) return ret; @@ -568,7 +574,7 @@ SR_PRIV int saleae_logic16_init_device(const struct sr_dev_inst *sdi) if ((ret = read_eeprom(sdi, 8, 8, devc->eeprom_data)) != SR_OK) return ret; - if ((ret = upload_fpga_bitstream(sdi, VOLTAGE_RANGE_18_33_V)) != SR_OK) + if ((ret = upload_fpga_bitstream(sdi, devc->selected_voltage_range)) != SR_OK) return ret; return SR_OK;