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

fx2lafw: Code cleanup.

This commit is contained in:
Bert Vermeulen 2014-08-26 01:49:00 +02:00
parent 1685c27619
commit 81a3497655
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/hardware/fx2lafw/protocol.c
View File

@ -87,21 +87,25 @@ static int command_get_revid_version(struct sr_dev_inst *sdi, uint8_t *revid)
SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi) SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi)
{ {
struct dev_context *devc = sdi->priv; struct dev_context *devc;
struct sr_usb_dev_inst *usb = sdi->conn; struct sr_usb_dev_inst *usb;
libusb_device_handle *devhdl = usb->devhdl; uint64_t samplerate;
uint64_t samplerate = devc->cur_samplerate; struct cmd_start_acquisition cmd;
gboolean samplewide = devc->sample_wide; int delay, ret;
struct cmd_start_acquisition cmd = { 0 };
int delay = 0, ret; devc = sdi->priv;
usb = sdi->conn;
samplerate = devc->cur_samplerate;
/* Compute the sample rate. */ /* Compute the sample rate. */
if (samplewide && samplerate > MAX_16BIT_SAMPLE_RATE) { if (devc->sample_wide && samplerate > MAX_16BIT_SAMPLE_RATE) {
sr_err("Unable to sample at %" PRIu64 "Hz " sr_err("Unable to sample at %" PRIu64 "Hz "
"when collecting 16-bit samples.", samplerate); "when collecting 16-bit samples.", samplerate);
return SR_ERR; return SR_ERR;
} }
delay = 0;
cmd.flags = cmd.sample_delay_h = cmd.sample_delay_l = 0;
if ((SR_MHZ(48) % samplerate) == 0) { if ((SR_MHZ(48) % samplerate) == 0) {
cmd.flags = CMD_START_FLAGS_CLK_48MHZ; cmd.flags = CMD_START_FLAGS_CLK_48MHZ;
delay = SR_MHZ(48) / samplerate - 1; delay = SR_MHZ(48) / samplerate - 1;
@ -126,11 +130,11 @@ SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi)
cmd.sample_delay_l = delay & 0xff; cmd.sample_delay_l = delay & 0xff;
/* Select the sampling width. */ /* Select the sampling width. */
cmd.flags |= samplewide ? CMD_START_FLAGS_SAMPLE_16BIT : cmd.flags |= devc->sample_wide ? CMD_START_FLAGS_SAMPLE_16BIT :
CMD_START_FLAGS_SAMPLE_8BIT; CMD_START_FLAGS_SAMPLE_8BIT;
/* Send the control message. */ /* Send the control message. */
ret = libusb_control_transfer(devhdl, LIBUSB_REQUEST_TYPE_VENDOR | ret = libusb_control_transfer(usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR |
LIBUSB_ENDPOINT_OUT, CMD_START, 0x0000, 0x0000, LIBUSB_ENDPOINT_OUT, CMD_START, 0x0000, 0x0000,
(unsigned char *)&cmd, sizeof(cmd), 100); (unsigned char *)&cmd, sizeof(cmd), 100);
if (ret < 0) { if (ret < 0) {