When no firmware file is found, return the right error code so sigrok
doesn't continue running with no firmware loaded.
Thanks Martin StensgÄrd <redacted> for the patch!
struct sr_datafeed_packet packet;
struct sr_datafeed_header header;
struct clockselect_50 clockselect;
struct sr_datafeed_packet packet;
struct sr_datafeed_header header;
struct clockselect_50 clockselect;
+ int frac, triggerpin, ret;
uint8_t triggerselect;
struct triggerinout triggerinout_conf;
struct triggerlut lut;
uint8_t triggerselect;
struct triggerinout triggerinout_conf;
struct triggerlut lut;
session_device_id = session_device_id;
session_device_id = session_device_id;
sigma = sdi->priv;
/* If the samplerate has not been set, default to 200 KHz. */
sigma = sdi->priv;
/* If the samplerate has not been set, default to 200 KHz. */
- if (sigma->cur_firmware == -1)
- set_samplerate(sdi, SR_KHZ(200));
+ if (sigma->cur_firmware == -1) {
+ if ((ret = set_samplerate(sdi, SR_KHZ(200))) != SR_OK)
+ return ret;
+ }
/* Enter trigger programming mode. */
sigma_set_register(WRITE_TRIGGER_SELECT1, 0x20, sigma);
/* Enter trigger programming mode. */
sigma_set_register(WRITE_TRIGGER_SELECT1, 0x20, sigma);