BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sysclk-lwla: Widen constant to 64 bit before shifting 

(lwla_convert_trigger): Fix trigger mask computation bug introduced
by recent change:  Widen constant to 64 bit before shifting so that
channel nunmbers beyond 32 are processed correctly.
This commit is contained in:
Daniel Elstner 2015-01-31 21:04:14 +01:00
parent 5801d558e7
commit 57ba5f3d56
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hardware/sysclk-lwla/protocol.c
View File

@ -279,7 +279,7 @@ static void issue_read_end(const struct sr_dev_inst *sdi)
devc->state = STATE_READ_END; devc->state = STATE_READ_END;
} }
/* Decode an incoming reponse to a buffer fill level request and act on it /* Decode an incoming response to a buffer fill level request and act on it
* as appropriate. Note that this function changes the device context state. * as appropriate. Note that this function changes the device context state.
*/ */
static void process_capture_length(const struct sr_dev_inst *sdi) static void process_capture_length(const struct sr_dev_inst *sdi)
@ -768,7 +768,7 @@ SR_PRIV int lwla_convert_trigger(const struct sr_dev_inst *sdi)
if (!match->channel->enabled) if (!match->channel->enabled)
/* Ignore disabled channels with a trigger. */ /* Ignore disabled channels with a trigger. */
continue; continue;
channel_index = 1 << match->channel->index; channel_index = (uint64_t)1 << match->channel->index;
devc->trigger_mask |= channel_index; devc->trigger_mask |= channel_index;
switch (match->match) { switch (match->match) {
case SR_TRIGGER_ONE: case SR_TRIGGER_ONE: