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

saleae-logic16: Minor whitespace fixes, cosmetics.

This commit is contained in:
Uwe Hermann 2014-05-03 21:22:38 +02:00
parent 1b822521f7
commit b9a53103cf
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hardware/saleae-logic16/api.c
View File

@ -627,6 +627,9 @@ static int configure_channels(const struct sr_dev_inst *sdi)
struct sr_channel *ch; struct sr_channel *ch;
GSList *l; GSList *l;
uint16_t channel_bit; uint16_t channel_bit;
#ifdef WORDS_BIGENDIAN
int i;
#endif
devc = sdi->priv; devc = sdi->priv;
@ -657,8 +660,7 @@ static int configure_channels(const struct sr_dev_inst *sdi)
devc->unitsize = 2; devc->unitsize = 2;
} else { } else {
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
int i; for (i = 0; i < devc->num_channels; i++)
for (i=0; i<devc->num_channels; i++)
devc->channel_masks[i] >>= 8; devc->channel_masks[i] >>= 8;
#endif #endif
devc->unitsize = 1; devc->unitsize = 1;

4
hardware/saleae-logic16/protocol.c
View File

@ -720,7 +720,7 @@ static size_t convert_sample_data(struct dev_context *devc,
const uint8_t *src, size_t srccnt, const uint8_t *src, size_t srccnt,
int unitsize) int unitsize)
{ {
return (unitsize == 2? return (unitsize == 2 ?
convert_sample_data_16(devc, dest, destcnt, src, srccnt) : convert_sample_data_16(devc, dest, destcnt, src, srccnt) :
convert_sample_data_8(devc, dest, destcnt, src, srccnt)); convert_sample_data_8(devc, dest, destcnt, src, srccnt));
} }
@ -790,7 +790,7 @@ SR_PRIV void logic16_receive_transfer(struct libusb_transfer *transfer)
transfer->actual_length, devc->unitsize); transfer->actual_length, devc->unitsize);
if (converted_length > 0) { if (converted_length > 0) {
/* Cap sample count if needed */ /* Cap sample count if needed. */
if (devc->limit_samples && if (devc->limit_samples &&
(uint64_t)devc->num_samples + converted_length (uint64_t)devc->num_samples + converted_length
> devc->limit_samples) { > devc->limit_samples) {