Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / usrp2 / firmware / include / usrp2_eth_packet.h

diff --git a/usrp2/firmware/include/usrp2_eth_packet.h b/usrp2/firmware/include/usrp2_eth_packet.h
index b0123c5844e0e84b9bfce53cafff40fc70c00b83..2f24556f06b48b11f3bc41b177d4a80ffed6388b 100644 (file)
--- a/usrp2/firmware/include/usrp2_eth_packet.h
+++ b/usrp2/firmware/include/usrp2_eth_packet.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007,2008,2009 Free Software Foundation, Inc.
+ * Copyright 2007,2008,2009,2010 Free Software Foundation, Inc.
  *
  * 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
@@ -147,10 +147,11 @@ typedef struct {
  *   ethernet header + transport header + fixed header + maximum number of samples.
  *   sizeof(u2_eth_samples_t) == 1512
  *   (payload is 1498 bytes, two bytes shorter than 1500 byte MTU)
+ *   (sample numbers are made even to force pairwise alignment in the interleaved case)
  */
 
-#define U2_MAX_SAMPLES 371
-#define        U2_MIN_SAMPLES    9
+#define U2_MAX_SAMPLES 370
+#define        U2_MIN_SAMPLES   10
 
 typedef struct {
   u2_eth_packet_t      hdrs;
@@ -208,6 +209,10 @@ typedef struct {
 #define OP_GPIO_WRITE_REPLY          (OP_GPIO_WRITE | OP_REPLY_BIT)
 #define OP_GPIO_STREAM               21
 #define OP_GPIO_STREAM_REPLY         (OP_GPIO_STREAM | OP_REPLY_BIT)
+#define OP_RX_ANTENNA                22
+#define OP_RX_ANTENNA_REPLY          (OP_RX_ANTENNA | OP_REPLY_BIT)
+#define OP_TX_ANTENNA                23
+#define OP_TX_ANTENNA_REPLY          (OP_RX_ANTENNA | OP_REPLY_BIT)
 
 /*
  * All subpackets are a multiple of 4 bytes long.