X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Fcommand.h;h=686a743a12eac11cf8c93ec3bd999f6f47a99901;hb=8da0cd02228bb6890eb5068e6507bf6ce0d2fdd2;hp=cc5f91c208314727726bc8e46feca45b906c7807;hpb=18544912fb14f1beb10fe375aad9743a8e8df790;p=sigrok-firmware-fx2lafw.git

diff --git a/include/command.h b/include/command.h
index cc5f91c2..686a743a 100644
--- a/include/command.h
+++ b/include/command.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the fx2lafw project.
+ * This file is part of the sigrok-firmware-fx2lafw project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
@@ -14,29 +14,39 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef FX2LAFW_INCLUDE_COMMAND_H
+#define FX2LAFW_INCLUDE_COMMAND_H
+
 #include <stdint.h>
 
 /* Protocol commands */
-#define CMD_GET_FW_VERSION	0xb0
-#define CMD_START		0xb1
+#define CMD_GET_FW_VERSION		0xb0
+#define CMD_START			0xb1
+#define CMD_GET_REVID_VERSION		0xb2
 
+#define CMD_START_FLAGS_CLK_CTL2_POS	4
+#define CMD_START_FLAGS_WIDE_POS	5
 #define CMD_START_FLAGS_CLK_SRC_POS	6
 
+#define CMD_START_FLAGS_CLK_CTL2	(1 << CMD_START_FLAGS_CLK_CTL2_POS)
+#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)
 
-struct version_info
-{
+struct version_info {
 	uint8_t major;
 	uint8_t minor;
 };
 
-struct cmd_start_acquisition
-{
+struct cmd_start_acquisition {
 	uint8_t flags;
-	uint8_t sample_delay;
+	uint8_t sample_delay_h;
+	uint8_t sample_delay_l;
 };
+
+#endif