Merge branch 'master' into udp

18 files changed, 92 insertions, 0 deletions

diff --git a/usrp1/rbf/.gitignore b/usrp1/rbf/.gitignore
new file mode 100644
index 000000000..eb58a95f5
--- /dev/null
+++ b/usrp1/rbf/.gitignore
@@ -0,0 +1,4 @@
+/Makefile
+/Makefile.in
+/usrp_fpga_rev1.rbf
+/usrp_fpga_rev2.rbf
diff --git a/usrp1/rbf/Makefile.am b/usrp1/rbf/Makefile.am
new file mode 100644
index 000000000..7bce77d5f
--- /dev/null
+++ b/usrp1/rbf/Makefile.am
@@ -0,0 +1,22 @@
+#
+# Copyright 2005,2006,2009 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.
+# 
+
+SUBDIRS = rev2 rev4
diff --git a/usrp1/rbf/rev2/.gitignore b/usrp1/rbf/rev2/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/usrp1/rbf/rev2/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/usrp1/rbf/rev2/Makefile.am b/usrp1/rbf/rev2/Makefile.am
new file mode 100644
index 000000000..487650e18
--- /dev/null
+++ b/usrp1/rbf/rev2/Makefile.am
@@ -0,0 +1,31 @@
+#
+# Copyright 2009 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+rbf2datadir = $(prefix)/share/usrp/rev2
+
+dist_rbf2data_DATA =		\
+	std_2rxhb_2tx.rbf		\
+	std_4rx_0tx.rbf		\
+	inband_1rxhb_1tx.rbf	\
+	inband_2rxhb_2tx.rbf	\
+	multi_2rxhb_2tx.rbf
diff --git a/usrp1/rbf/rev2/inband_1rxhb_1tx.rbf b/usrp1/rbf/rev2/inband_1rxhb_1tx.rbf
new file mode 100755
index 000000000..c1c9af2ce
--- /dev/null
+++ b/usrp1/rbf/rev2/inband_1rxhb_1tx.rbf
diff --git a/usrp1/rbf/rev2/inband_2rxhb_2tx.rbf b/usrp1/rbf/rev2/inband_2rxhb_2tx.rbf
new file mode 100755
index 000000000..ca1a0f92b
--- /dev/null
+++ b/usrp1/rbf/rev2/inband_2rxhb_2tx.rbf
diff --git a/usrp1/rbf/rev2/multi_2rxhb_2tx.rbf b/usrp1/rbf/rev2/multi_2rxhb_2tx.rbf
new file mode 100755
index 000000000..2683d8641
--- /dev/null
+++ b/usrp1/rbf/rev2/multi_2rxhb_2tx.rbf
diff --git a/usrp1/rbf/rev2/multi_4rx_0tx.rbf b/usrp1/rbf/rev2/multi_4rx_0tx.rbf
new file mode 100755
index 000000000..b7e4eb393
--- /dev/null
+++ b/usrp1/rbf/rev2/multi_4rx_0tx.rbf
diff --git a/usrp1/rbf/rev2/std_2rxhb_2tx.rbf b/usrp1/rbf/rev2/std_2rxhb_2tx.rbf
new file mode 100755
index 000000000..ee3c30d66
--- /dev/null
+++ b/usrp1/rbf/rev2/std_2rxhb_2tx.rbf
diff --git a/usrp1/rbf/rev2/std_4rx_0tx.rbf b/usrp1/rbf/rev2/std_4rx_0tx.rbf
new file mode 100755
index 000000000..1deca9517
--- /dev/null
+++ b/usrp1/rbf/rev2/std_4rx_0tx.rbf
diff --git a/usrp1/rbf/rev4/.gitignore b/usrp1/rbf/rev4/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/usrp1/rbf/rev4/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/usrp1/rbf/rev4/Makefile.am b/usrp1/rbf/rev4/Makefile.am
new file mode 100644
index 000000000..54de9b818
--- /dev/null
+++ b/usrp1/rbf/rev4/Makefile.am
@@ -0,0 +1,31 @@
+#
+# Copyright 2009 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+rbf4datadir = $(prefix)/share/usrp/rev4
+
+dist_rbf4data_DATA =		\
+	std_2rxhb_2tx.rbf		\
+	std_4rx_0tx.rbf		\
+	inband_1rxhb_1tx.rbf	\
+	inband_2rxhb_2tx.rbf	\
+	multi_2rxhb_2tx.rbf
diff --git a/usrp1/rbf/rev4/inband_1rxhb_1tx.rbf b/usrp1/rbf/rev4/inband_1rxhb_1tx.rbf
new file mode 100755
index 000000000..c1c9af2ce
--- /dev/null
+++ b/usrp1/rbf/rev4/inband_1rxhb_1tx.rbf
diff --git a/usrp1/rbf/rev4/inband_2rxhb_2tx.rbf b/usrp1/rbf/rev4/inband_2rxhb_2tx.rbf
new file mode 100755
index 000000000..ca1a0f92b
--- /dev/null
+++ b/usrp1/rbf/rev4/inband_2rxhb_2tx.rbf
diff --git a/usrp1/rbf/rev4/multi_2rxhb_2tx.rbf b/usrp1/rbf/rev4/multi_2rxhb_2tx.rbf
new file mode 100755
index 000000000..2683d8641
--- /dev/null
+++ b/usrp1/rbf/rev4/multi_2rxhb_2tx.rbf
diff --git a/usrp1/rbf/rev4/multi_4rx_0tx.rbf b/usrp1/rbf/rev4/multi_4rx_0tx.rbf
new file mode 100755
index 000000000..b7e4eb393
--- /dev/null
+++ b/usrp1/rbf/rev4/multi_4rx_0tx.rbf
diff --git a/usrp1/rbf/rev4/std_2rxhb_2tx.rbf b/usrp1/rbf/rev4/std_2rxhb_2tx.rbf
new file mode 100755
index 000000000..ee3c30d66
--- /dev/null
+++ b/usrp1/rbf/rev4/std_2rxhb_2tx.rbf
diff --git a/usrp1/rbf/rev4/std_4rx_0tx.rbf b/usrp1/rbf/rev4/std_4rx_0tx.rbf
new file mode 100755
index 000000000..1deca9517
--- /dev/null
+++ b/usrp1/rbf/rev4/std_4rx_0tx.rbf