- memcpy(&sample, logic->inbuf + logic->itercnt * logic->di->unitsize,
- logic->di->unitsize);
- for (i = 0; i < logic->di->num_probes; i++) {
- probe_samples[i] = sample & 0x01;
- sample >>= 1;
+ sample_pos = logic->inbuf + logic->itercnt * logic->di->data_unitsize;
+ for (i = 0; i < logic->di->dec_num_channels; i++) {
+ /* A channelmap value of -1 means "unused optional channel". */
+ if (logic->di->dec_channelmap[i] == -1) {
+ /* Value of unused channel is 0xff, instead of 0 or 1. */
+ logic->di->channel_samples[i] = 0xff;
+ } else {
+ byte_offset = logic->di->dec_channelmap[i] / 8;
+ bit_offset = logic->di->dec_channelmap[i] % 8;
+ sample = *(sample_pos + byte_offset) & (1 << bit_offset) ? 1 : 0;
+ logic->di->channel_samples[i] = sample;
+ }