Update usrp to 3.0.2:

	* fixed support for BSD make tool
	* added synchronized multi-usrp support
	* added support for 32 bit counter

4 files changed, 29 insertions, 216 deletions

diff --git a/ham/usrp/Makefile b/ham/usrp/Makefile
index 4e164372931..66468203414 100644
--- a/ham/usrp/Makefile
+++ b/ham/usrp/Makefile
@@ -1,18 +1,26 @@
-# $NetBSD: Makefile,v 1.8 2006/10/24 21:01:18 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2006/11/13 18:01:29 wulf Exp $
 
-DISTNAME=	usrp-0.12
-PKGREVISION=	2
+PKGNAME=	usrp-${VERSION}
 COMMENT=	Non GNU Radio specific part of the USRP code base
 
-BUILD_DEPENDS+=	sdcc>=2.4.0:../../devel/sdcc
+.include "../../meta-pkgs/gnuradio/Makefile.common"
 
-PYTHON_PATCH_SCRIPTS	+= firmware/src/common/edit-gpif
-PYTHON_PATCH_SCRIPTS	+= firmware/src/common/build_eeprom.py
-PYTHON_PATCH_SCRIPTS	+= firmware/src/usrp2/edit-gpif
+CONFIGURE_ARGS+=	--enable-usrp
 
-CONFIGURE_ARGS+=	--enable-doxygen
+BUILD_DEPENDS+=	sdcc>=2.4.0:../../devel/sdcc
 
-.include "../../meta-pkgs/gnuradio/Makefile.common"
+PYTHON_PATCH_SCRIPTS+=	usrp/firmware/include/generate_regs.py
+PYTHON_PATCH_SCRIPTS+=	usrp/firmware/src/common/edit-gpif
+PYTHON_PATCH_SCRIPTS+=	usrp/firmware/src/common/build_eeprom.py
+PYTHON_PATCH_SCRIPTS+=	usrp/firmware/src/usrp2/edit-gpif
+PYTHON_PATCH_SCRIPTS+=	usrp/fpga/gen_makefile_extra.py
+PYTHON_PATCH_SCRIPTS+=	usrp/fpga/sdr_lib/gen_cordic_consts.py
+PYTHON_PATCH_SCRIPTS+=	usrp/fpga/toplevel/mrfm/mrfm.py
+PYTHON_PATCH_SCRIPTS+=	usrp/fpga/toplevel/mrfm/mrfm_fft.py
+PYTHON_PATCH_SCRIPTS+=	usrp/host/lib/check_data.py
+PYTHON_PATCH_SCRIPTS+=	usrp/host/lib/dump_data.py
+PYTHON_PATCH_SCRIPTS+=	usrp/host/lib/gen_usrp_dbid.py
+PYTHON_PATCH_SCRIPTS+=	usrp/host/lib/usrp_dbid.py
 
 .include "../../ham/gnuradio-core/buildlink3.mk"
 .include "../../devel/libusb/buildlink3.mk"
diff --git a/ham/usrp/PLIST b/ham/usrp/PLIST
index e706fced164..f9af3ae0584 100644
--- a/ham/usrp/PLIST
+++ b/ham/usrp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/10/24 21:01:18 rillig Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/11/13 18:01:29 wulf Exp $
 bin/usrp_cal_dc_offset
 bin/usrper
 include/usrp_basic.h
@@ -25,206 +25,11 @@ ${PYSITELIB}/usrp_fpga_regs.pyo
 ${PYSITELIB}/usrp_prims.py
 ${PYSITELIB}/usrp_prims.pyc
 ${PYSITELIB}/usrp_prims.pyo
-share/doc/${PKGNAME}/ChangeLog
-share/doc/${PKGNAME}/README
-share/doc/${PKGNAME}/html/ad9862_8h-source.html
-share/doc/${PKGNAME}/html/ad9862_8h.html
-share/doc/${PKGNAME}/html/annotated.html
-share/doc/${PKGNAME}/html/bug__work__around__8_8cc.html
-share/doc/${PKGNAME}/html/check__order__quickly_8cc.html
-share/doc/${PKGNAME}/html/classfusb__devhandle-members.html
-share/doc/${PKGNAME}/html/classfusb__devhandle.html
-share/doc/${PKGNAME}/html/classfusb__devhandle.png
-share/doc/${PKGNAME}/html/classfusb__devhandle__darwin-members.html
-share/doc/${PKGNAME}/html/classfusb__devhandle__darwin.html
-share/doc/${PKGNAME}/html/classfusb__devhandle__darwin.png
-share/doc/${PKGNAME}/html/classfusb__devhandle__generic-members.html
-share/doc/${PKGNAME}/html/classfusb__devhandle__generic.html
-share/doc/${PKGNAME}/html/classfusb__devhandle__generic.png
-share/doc/${PKGNAME}/html/classfusb__devhandle__linux-members.html
-share/doc/${PKGNAME}/html/classfusb__devhandle__linux.html
-share/doc/${PKGNAME}/html/classfusb__devhandle__linux.png
-share/doc/${PKGNAME}/html/classfusb__devhandle__win32-members.html
-share/doc/${PKGNAME}/html/classfusb__devhandle__win32.html
-share/doc/${PKGNAME}/html/classfusb__devhandle__win32.png
-share/doc/${PKGNAME}/html/classfusb__ephandle-members.html
-share/doc/${PKGNAME}/html/classfusb__ephandle.html
-share/doc/${PKGNAME}/html/classfusb__ephandle.png
-share/doc/${PKGNAME}/html/classfusb__ephandle__darwin-members.html
-share/doc/${PKGNAME}/html/classfusb__ephandle__darwin.html
-share/doc/${PKGNAME}/html/classfusb__ephandle__darwin.png
-share/doc/${PKGNAME}/html/classfusb__ephandle__generic-members.html
-share/doc/${PKGNAME}/html/classfusb__ephandle__generic.html
-share/doc/${PKGNAME}/html/classfusb__ephandle__generic.png
-share/doc/${PKGNAME}/html/classfusb__ephandle__linux-members.html
-share/doc/${PKGNAME}/html/classfusb__ephandle__linux.html
-share/doc/${PKGNAME}/html/classfusb__ephandle__linux.png
-share/doc/${PKGNAME}/html/classfusb__ephandle__win32-members.html
-share/doc/${PKGNAME}/html/classfusb__ephandle__win32.html
-share/doc/${PKGNAME}/html/classfusb__ephandle__win32.png
-share/doc/${PKGNAME}/html/classfusb__sysconfig-members.html
-share/doc/${PKGNAME}/html/classfusb__sysconfig.html
-share/doc/${PKGNAME}/html/classusrp__basic-members.html
-share/doc/${PKGNAME}/html/classusrp__basic.html
-share/doc/${PKGNAME}/html/classusrp__basic.png
-share/doc/${PKGNAME}/html/classusrp__basic__rx-members.html
-share/doc/${PKGNAME}/html/classusrp__basic__rx.html
-share/doc/${PKGNAME}/html/classusrp__basic__rx.png
-share/doc/${PKGNAME}/html/classusrp__basic__tx-members.html
-share/doc/${PKGNAME}/html/classusrp__basic__tx.html
-share/doc/${PKGNAME}/html/classusrp__basic__tx.png
-share/doc/${PKGNAME}/html/classusrp__local__sighandler-members.html
-share/doc/${PKGNAME}/html/classusrp__local__sighandler.html
-share/doc/${PKGNAME}/html/classusrp__signal-members.html
-share/doc/${PKGNAME}/html/classusrp__signal.html
-share/doc/${PKGNAME}/html/classusrp__standard__common-members.html
-share/doc/${PKGNAME}/html/classusrp__standard__common.html
-share/doc/${PKGNAME}/html/classusrp__standard__common.png
-share/doc/${PKGNAME}/html/classusrp__standard__rx-members.html
-share/doc/${PKGNAME}/html/classusrp__standard__rx.html
-share/doc/${PKGNAME}/html/classusrp__standard__rx.png
-share/doc/${PKGNAME}/html/classusrp__standard__tx-members.html
-share/doc/${PKGNAME}/html/classusrp__standard__tx.html
-share/doc/${PKGNAME}/html/classusrp__standard__tx.png
-share/doc/${PKGNAME}/html/doxygen.css
-share/doc/${PKGNAME}/html/doxygen.png
-share/doc/${PKGNAME}/html/files.html
-share/doc/${PKGNAME}/html/functions.html
-share/doc/${PKGNAME}/html/functions_0x61.html
-share/doc/${PKGNAME}/html/functions_0x62.html
-share/doc/${PKGNAME}/html/functions_0x63.html
-share/doc/${PKGNAME}/html/functions_0x64.html
-share/doc/${PKGNAME}/html/functions_0x66.html
-share/doc/${PKGNAME}/html/functions_0x67.html
-share/doc/${PKGNAME}/html/functions_0x68.html
-share/doc/${PKGNAME}/html/functions_0x69.html
-share/doc/${PKGNAME}/html/functions_0x6d.html
-share/doc/${PKGNAME}/html/functions_0x6e.html
-share/doc/${PKGNAME}/html/functions_0x6f.html
-share/doc/${PKGNAME}/html/functions_0x70.html
-share/doc/${PKGNAME}/html/functions_0x72.html
-share/doc/${PKGNAME}/html/functions_0x73.html
-share/doc/${PKGNAME}/html/functions_0x74.html
-share/doc/${PKGNAME}/html/functions_0x75.html
-share/doc/${PKGNAME}/html/functions_0x76.html
-share/doc/${PKGNAME}/html/functions_0x77.html
-share/doc/${PKGNAME}/html/functions_0x7e.html
-share/doc/${PKGNAME}/html/functions_enum.html
-share/doc/${PKGNAME}/html/functions_eval.html
-share/doc/${PKGNAME}/html/functions_func.html
-share/doc/${PKGNAME}/html/functions_func_0x61.html
-share/doc/${PKGNAME}/html/functions_func_0x62.html
-share/doc/${PKGNAME}/html/functions_func_0x63.html
-share/doc/${PKGNAME}/html/functions_func_0x64.html
-share/doc/${PKGNAME}/html/functions_func_0x66.html
-share/doc/${PKGNAME}/html/functions_func_0x67.html
-share/doc/${PKGNAME}/html/functions_func_0x68.html
-share/doc/${PKGNAME}/html/functions_func_0x69.html
-share/doc/${PKGNAME}/html/functions_func_0x6d.html
-share/doc/${PKGNAME}/html/functions_func_0x6e.html
-share/doc/${PKGNAME}/html/functions_func_0x70.html
-share/doc/${PKGNAME}/html/functions_func_0x72.html
-share/doc/${PKGNAME}/html/functions_func_0x73.html
-share/doc/${PKGNAME}/html/functions_func_0x74.html
-share/doc/${PKGNAME}/html/functions_func_0x75.html
-share/doc/${PKGNAME}/html/functions_func_0x77.html
-share/doc/${PKGNAME}/html/functions_func_0x7e.html
-share/doc/${PKGNAME}/html/functions_vars.html
-share/doc/${PKGNAME}/html/fusb_8cc.html
-share/doc/${PKGNAME}/html/fusb_8h-source.html
-share/doc/${PKGNAME}/html/fusb_8h.html
-share/doc/${PKGNAME}/html/fusb__darwin_8cc.html
-share/doc/${PKGNAME}/html/fusb__darwin_8h-source.html
-share/doc/${PKGNAME}/html/fusb__darwin_8h.html
-share/doc/${PKGNAME}/html/fusb__generic_8cc.html
-share/doc/${PKGNAME}/html/fusb__generic_8h-source.html
-share/doc/${PKGNAME}/html/fusb__generic_8h.html
-share/doc/${PKGNAME}/html/fusb__linux_8cc.html
-share/doc/${PKGNAME}/html/fusb__linux_8h-source.html
-share/doc/${PKGNAME}/html/fusb__linux_8h.html
-share/doc/${PKGNAME}/html/fusb__sysconfig__darwin_8cc.html
-share/doc/${PKGNAME}/html/fusb__sysconfig__generic_8cc.html
-share/doc/${PKGNAME}/html/fusb__sysconfig__linux_8cc.html
-share/doc/${PKGNAME}/html/fusb__sysconfig__win32_8cc.html
-share/doc/${PKGNAME}/html/fusb__win32_8cc.html
-share/doc/${PKGNAME}/html/fusb__win32_8h-source.html
-share/doc/${PKGNAME}/html/fusb__win32_8h.html
-share/doc/${PKGNAME}/html/getopt_8h-source.html
-share/doc/${PKGNAME}/html/getopt_8h.html
-share/doc/${PKGNAME}/html/globals.html
-share/doc/${PKGNAME}/html/globals_0x61.html
-share/doc/${PKGNAME}/html/globals_0x62.html
-share/doc/${PKGNAME}/html/globals_0x63.html
-share/doc/${PKGNAME}/html/globals_0x64.html
-share/doc/${PKGNAME}/html/globals_0x65.html
-share/doc/${PKGNAME}/html/globals_0x67.html
-share/doc/${PKGNAME}/html/globals_0x6d.html
-share/doc/${PKGNAME}/html/globals_0x6e.html
-share/doc/${PKGNAME}/html/globals_0x6f.html
-share/doc/${PKGNAME}/html/globals_0x70.html
-share/doc/${PKGNAME}/html/globals_0x72.html
-share/doc/${PKGNAME}/html/globals_0x73.html
-share/doc/${PKGNAME}/html/globals_0x74.html
-share/doc/${PKGNAME}/html/globals_0x75.html
-share/doc/${PKGNAME}/html/globals_0x76.html
-share/doc/${PKGNAME}/html/globals_defs.html
-share/doc/${PKGNAME}/html/globals_enum.html
-share/doc/${PKGNAME}/html/globals_eval.html
-share/doc/${PKGNAME}/html/globals_func.html
-share/doc/${PKGNAME}/html/globals_vars.html
-share/doc/${PKGNAME}/html/hierarchy.html
-share/doc/${PKGNAME}/html/index.html
-share/doc/${PKGNAME}/html/mainpage_8dox.html
-share/doc/${PKGNAME}/html/md5_8h-source.html
-share/doc/${PKGNAME}/html/md5_8h.html
-share/doc/${PKGNAME}/html/namespacead9862.html
-share/doc/${PKGNAME}/html/namespaces.html
-share/doc/${PKGNAME}/html/rate__to__regval_8h-source.html
-share/doc/${PKGNAME}/html/rate__to__regval_8h.html
-share/doc/${PKGNAME}/html/std__paths_8h-source.html
-share/doc/${PKGNAME}/html/std__paths_8h.html
-share/doc/${PKGNAME}/html/structmd5__ctx-members.html
-share/doc/${PKGNAME}/html/structmd5__ctx.html
-share/doc/${PKGNAME}/html/structoption-members.html
-share/doc/${PKGNAME}/html/structoption.html
-share/doc/${PKGNAME}/html/structusrp__dboard__eeprom-members.html
-share/doc/${PKGNAME}/html/structusrp__dboard__eeprom.html
-share/doc/${PKGNAME}/html/tab_b.gif
-share/doc/${PKGNAME}/html/tab_l.gif
-share/doc/${PKGNAME}/html/tab_r.gif
-share/doc/${PKGNAME}/html/tabs.css
-share/doc/${PKGNAME}/html/test__usrp__standard__rx_8cc.html
-share/doc/${PKGNAME}/html/test__usrp__standard__tx_8cc.html
-share/doc/${PKGNAME}/html/time__stuff_8h-source.html
-share/doc/${PKGNAME}/html/time__stuff_8h.html
-share/doc/${PKGNAME}/html/usrp__basic_8cc.html
-share/doc/${PKGNAME}/html/usrp__basic_8h-source.html
-share/doc/${PKGNAME}/html/usrp__basic_8h.html
-share/doc/${PKGNAME}/html/usrp__bytesex_8h-source.html
-share/doc/${PKGNAME}/html/usrp__bytesex_8h.html
-share/doc/${PKGNAME}/html/usrp__cal__dc__offset_8cc.html
-share/doc/${PKGNAME}/html/usrp__config_8cc.html
-share/doc/${PKGNAME}/html/usrp__config_8h-source.html
-share/doc/${PKGNAME}/html/usrp__config_8h.html
-share/doc/${PKGNAME}/html/usrp__dbid_8cc.html
-share/doc/${PKGNAME}/html/usrp__dbid_8h-source.html
-share/doc/${PKGNAME}/html/usrp__dbid_8h.html
-share/doc/${PKGNAME}/html/usrp__local__sighandler_8cc.html
-share/doc/${PKGNAME}/html/usrp__local__sighandler_8h-source.html
-share/doc/${PKGNAME}/html/usrp__local__sighandler_8h.html
-share/doc/${PKGNAME}/html/usrp__prims_8cc.html
-share/doc/${PKGNAME}/html/usrp__prims_8h-source.html
-share/doc/${PKGNAME}/html/usrp__prims_8h.html
-share/doc/${PKGNAME}/html/usrp__slots_8h-source.html
-share/doc/${PKGNAME}/html/usrp__slots_8h.html
-share/doc/${PKGNAME}/html/usrp__standard_8cc.html
-share/doc/${PKGNAME}/html/usrp__standard_8h-source.html
-share/doc/${PKGNAME}/html/usrp__standard_8h.html
-share/doc/${PKGNAME}/html/usrp_guide.html
-share/doc/${PKGNAME}/html/usrper_8cc.html
+share/usrp/rev2/multi_2rxhb_2tx.rbf
 share/usrp/rev2/std.ihx
 share/usrp/rev2/std_2rxhb_2tx.rbf
 share/usrp/rev2/std_4rx_0tx.rbf
+share/usrp/rev4/multi_2rxhb_2tx.rbf
 share/usrp/rev4/std.ihx
 share/usrp/rev4/std_2rxhb_2tx.rbf
 share/usrp/rev4/std_4rx_0tx.rbf
diff --git a/ham/usrp/buildlink3.mk b/ham/usrp/buildlink3.mk
index c245e353aed..ffdf290cd62 100644
--- a/ham/usrp/buildlink3.mk
+++ b/ham/usrp/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/11/13 18:01:29 wulf Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 USRP_BUILDLINK3_MK:=	${USRP_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	usrp
 .endif
 
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nusrp}
 BUILDLINK_PACKAGES+=	usrp
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}usrp
 
-.if !empty(USRP_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.usrp=	usrp>=0.12
+.if ${USRP_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.usrp+=	usrp>=3.0.2
 BUILDLINK_PKGSRCDIR.usrp?=	../../ham/usrp
 .endif	# USRP_BUILDLINK3_MK
 
diff --git a/ham/usrp/distinfo b/ham/usrp/distinfo
index 705f6e435c9..2777398d290 100644
--- a/ham/usrp/distinfo
+++ b/ham/usrp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/10/24 17:22:18 rillig Exp $
+$NetBSD: distinfo,v 1.5 2006/11/13 18:01:29 wulf Exp $
 
-SHA1 (usrp-0.12.tar.gz) = 70c764473effc491549b2153c26ee7e7c6fd07a1
-RMD160 (usrp-0.12.tar.gz) = 8342869a4a4855e7bb896f632c4dfd42d0706e30
-Size (usrp-0.12.tar.gz) = 1470926 bytes
-SHA1 (patch-aa) = 1669edd87bd5d2d49f0b927a8ff79e7221ade0ec
+SHA1 (gnuradio-3.0.2.tar.gz) = 9d9a0e22c9e4fd9735f62c0145b9ceb61a33f9c2
+RMD160 (gnuradio-3.0.2.tar.gz) = 3ff771c2d13d680fb76d7ca82a6a11678c7069ae
+Size (gnuradio-3.0.2.tar.gz) = 3190212 bytes
+SHA1 (patch-aa) = 330992e9c596012f8ca25571709ab5203b525e18