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

fx2lafw: Cosmetics.

This commit is contained in:
Uwe Hermann 2012-05-11 00:19:01 +02:00
parent dc68c660d5
commit 37dc0b16a6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/fx2lafw/command.c
View File

@ -68,7 +68,7 @@ SR_PRIV int command_start_acquisition(libusb_device_handle *devhdl,
if ((SR_MHZ(48) % samplerate) == 0) {
cmd.flags = CMD_START_FLAGS_CLK_48MHZ;
delay = SR_MHZ(48) / samplerate - 1;
if(delay > MAX_SAMPLE_DELAY)
if (delay > MAX_SAMPLE_DELAY)
delay = 0;
}
@ -77,7 +77,7 @@ SR_PRIV int command_start_acquisition(libusb_device_handle *devhdl,
delay = SR_MHZ(30) / samplerate - 1;
}
sr_info("fx2lafw: gpif delay = %d, clocksource = %sMHz", delay,
sr_info("fx2lafw: GPIF delay = %d, clocksource = %sMHz", delay,
(cmd.flags & CMD_START_FLAGS_CLK_48MHZ) ? "48" : "30");
if (delay <= 0 || delay > MAX_SAMPLE_DELAY) {
@ -86,8 +86,8 @@ SR_PRIV int command_start_acquisition(libusb_device_handle *devhdl,
return SR_ERR;
}
cmd.sample_delay_h = (delay >> 8) & 0x00FF;
cmd.sample_delay_l = delay & 0x00FF;
cmd.sample_delay_h = (delay >> 8) & 0xff;
cmd.sample_delay_l = delay & 0xff;
/* Send the control message. */
ret = libusb_control_transfer(devhdl, LIBUSB_REQUEST_TYPE_VENDOR |

3
hardware/fx2lafw/fx2lafw.h
View File

@ -34,7 +34,8 @@
#define FX2LAFW_VERSION_MAJOR 1
#define FX2LAFW_VERSION_MINOR 0
#define MAX_SAMPLE_DELAY (6*256) /* 6 delay states of up to 256 clock ticks*/
/* 6 delay states of up to 256 clock ticks */
#define MAX_SAMPLE_DELAY (6 * 256)
/* Software trigger implementation: positive values indicate trigger stage. */
#define TRIGGER_FIRED -1