/*
* This file is part of the sigrok project.
*
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
}
SR_PRIV int ols_set_samplerate(const struct sr_dev_inst *sdi,
- uint64_t samplerate,
- const struct sr_samplerates *samplerates)
+ const uint64_t samplerate)
{
struct dev_context *devc;
devc = sdi->priv;
- if (devc->max_samplerate) {
- if (samplerate > devc->max_samplerate)
- return SR_ERR_SAMPLERATE;
- } else if (samplerate < samplerates->low || samplerate > samplerates->high)
+ if (devc->max_samplerate && samplerate > devc->max_samplerate)
return SR_ERR_SAMPLERATE;
if (samplerate > CLOCK_RATE) {
if (devc->flag_reg & FLAG_DEMUX)
devc->cur_samplerate *= 2;
if (devc->cur_samplerate != samplerate)
- sr_err("Can't match samplerate %" PRIu64 ", using %"
+ sr_info("Can't match samplerate %" PRIu64 ", using %"
PRIu64 ".", samplerate, devc->cur_samplerate);
return SR_OK;
struct drv_context *drvc;
struct dev_context *devc;
GSList *l;
+ uint32_t sample;
int num_channels, offset, i, j;
unsigned char byte;
sr_dbg("Received byte 0x%.2x.", byte);
if (devc->num_bytes == num_channels) {
/* Got a full sample. */
- sr_dbg("Received sample 0x%.*x.",
- devc->num_bytes * 2, *(int *)devc->sample);
+ sample = devc->sample[0] | (devc->sample[1] << 8) \
+ | (devc->sample[2] << 16) | (devc->sample[3] << 24);
+ sr_dbg("Received sample 0x%.*x.", devc->num_bytes * 2, sample);
if (devc->flag_reg & FLAG_RLE) {
/*
* In RLE mode -1 should never come in as a
* FIXME: This will only work on
* little-endian systems.
*/
- devc->rle_count = *(int *)(devc->sample);
+ devc->rle_count = sample;
sr_dbg("RLE count: %d.", devc->rle_count);
devc->num_bytes = 0;
return TRUE;
}
}
memcpy(devc->sample, devc->tmp_sample, 4);
- sr_dbg("Full sample: 0x%.8x.", *(int *)devc->sample);
+ sr_dbg("Full sample: 0x%.8x.", sample);
}
/* the OLS sends its sample buffer backwards.