X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Fcommand.h;h=1403976d3095662c5fae08d5273e735c11946b0b;hb=90f680ff006e5ae2fd4935bd885a14bd9927fd99;hp=0ab3e85e26ce5ba303fd2cb28aebde82172b2fe5;hpb=1e94408ae515157a9f27898b7b4c181e2aef980a;p=libsigrok.git diff --git a/hardware/fx2lafw/command.h b/hardware/fx2lafw/command.h index 0ab3e85e..1403976d 100644 --- a/hardware/fx2lafw/command.h +++ b/hardware/fx2lafw/command.h @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2012 Joel Holdsworth * @@ -20,15 +20,20 @@ #ifndef LIBSIGROK_HARDWARE_FX2LAFW_COMMAND_H #define LIBSIGROK_HARDWARE_FX2LAFW_COMMAND_H -#include "sigrok.h" +#include +#include "libsigrok.h" /* Protocol commands */ #define CMD_GET_FW_VERSION 0xb0 #define CMD_START 0xb1 #define CMD_GET_REVID_VERSION 0xb2 +#define CMD_START_FLAGS_WIDE_POS 5 #define CMD_START_FLAGS_CLK_SRC_POS 6 +#define CMD_START_FLAGS_SAMPLE_8BIT (0 << CMD_START_FLAGS_WIDE_POS) +#define CMD_START_FLAGS_SAMPLE_16BIT (1 << CMD_START_FLAGS_WIDE_POS) + #define CMD_START_FLAGS_CLK_30MHZ (0 << CMD_START_FLAGS_CLK_SRC_POS) #define CMD_START_FLAGS_CLK_48MHZ (1 << CMD_START_FLAGS_CLK_SRC_POS) @@ -41,7 +46,8 @@ struct version_info { struct cmd_start_acquisition { uint8_t flags; - uint8_t sample_delay; + uint8_t sample_delay_h; + uint8_t sample_delay_l; }; #pragma pack(pop) @@ -51,6 +57,6 @@ SR_PRIV int command_get_fw_version(libusb_device_handle *devhdl, SR_PRIV int command_get_revid_version(libusb_device_handle *devhdl, uint8_t *revid); SR_PRIV int command_start_acquisition(libusb_device_handle *devhdl, - uint64_t samplerate); + uint64_t samplerate, gboolean samplewide); #endif