Merge branch 'master' into flow_ctrl

Conflicts:
	host/lib/usrp/usrp2/mboard_impl.cpp
	host/lib/usrp/usrp2/usrp2_impl.hpp

1 files changed, 47 insertions, 0 deletions

diff --git a/firmware/fx2/common/usrp_interfaces.h b/firmware/fx2/common/usrp_interfaces.h
new file mode 100644
index 000000000..8666e0490
--- /dev/null
+++ b/firmware/fx2/common/usrp_interfaces.h
@@ -0,0 +1,47 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _USRP_INTERFACES_H_
+#define _USRP_INTERFACES_H_
+
+/*
+ * We've now split the USRP into 3 separate interfaces.
+ *
+ * Interface 0 contains only ep0 and is used for command and status.
+ * Interface 1 is the Tx path and it uses ep2 OUT BULK.
+ * Interface 2 is the Rx path and it uses ep6 IN BULK.
+ */
+ 
+#define	USRP_CMD_INTERFACE		0
+#define	USRP_CMD_ALTINTERFACE		0
+#define	USRP_CMD_ENDPOINT		0
+
+#define	USRP_TX_INTERFACE		1
+#define	USRP_TX_ALTINTERFACE		0
+#define	USRP_TX_ENDPOINT		2	// streaming data from host to FPGA
+
+#define	USRP_RX_INTERFACE		2
+#define	USRP_RX_ALTINTERFACE		0
+#define	USRP_RX_ENDPOINT		6	// streaming data from FPGA to host
+
+
+#endif /* _USRP_INTERFACES_H_ */