Index: head/comms/gnuradio/files/patch-config_usrp_sdcc.m4 =================================================================== --- head/comms/gnuradio/files/patch-config_usrp_sdcc.m4 (nonexistent) +++ head/comms/gnuradio/files/patch-config_usrp_sdcc.m4 (revision 265008) @@ -0,0 +1,11 @@ +--- config/usrp_sdcc.m4.orig 2010-11-19 20:32:17.000000000 -0500 ++++ config/usrp_sdcc.m4 2010-11-19 20:33:49.000000000 -0500 +@@ -21,7 +21,7 @@ + [ + sdccok=yes + AC_CHECK_PROG(XCC, sdcc, sdcc -mmcs51 --no-xinit-opt,no) +- AC_CHECK_PROG(XAS, asx8051, asx8051 -plosgff,no) ++ AC_CHECK_PROG(XAS,sdas8051 , sdas8051 -plosgff,no) + + if test "$XCC" = "no" -o "$XAS" = "no" ; then + AC_MSG_RESULT([USRP requires sdcc. sdcc not found. See http://sdcc.sf.net]) Property changes on: head/comms/gnuradio/files/patch-config_usrp_sdcc.m4 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/comms/gnuradio/files/patch-gnuradio-core_Makefile.in =================================================================== --- head/comms/gnuradio/files/patch-gnuradio-core_Makefile.in (revision 265007) +++ head/comms/gnuradio/files/patch-gnuradio-core_Makefile.in (revision 265008) @@ -1,20 +1,20 @@ ---- gnuradio-core/Makefile.in.orig 2008-03-24 12:49:57.000000000 -0400 -+++ gnuradio-core/Makefile.in 2008-03-24 16:13:56.000000000 -0400 -@@ -546,14 +546,13 @@ +--- gnuradio-core/Makefile.in.orig 2008-08-23 20:37:32.000000000 -0400 ++++ gnuradio-core/Makefile.in 2010-11-16 14:44:47.000000000 -0500 +@@ -561,14 +561,13 @@ # Base directory for example applications exampledir = $(datadir)/gnuradio/examples EXTRA_DIST = \ - gnuradio-core.conf \ gnuradio-core.pc.in -SUBDIRS = src doc -pkgconfigdir = $(libdir)/pkgconfig +SUBDIRS = src +pkgconfigdir = %%LIBDATA%%/pkgconfig pkgconfig_DATA = gnuradio-core.pc etcdir = $(sysconfdir)/gnuradio/conf.d -etc_DATA = gnuradio-core.conf +etc_DATA = all: all-recursive .SUFFIXES: Property changes on: head/comms/gnuradio/files/patch-gnuradio-core_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/comms/gnuradio/files/patch-usrp_firmware_lib_delay.c =================================================================== --- head/comms/gnuradio/files/patch-usrp_firmware_lib_delay.c (nonexistent) +++ head/comms/gnuradio/files/patch-usrp_firmware_lib_delay.c (revision 265008) @@ -0,0 +1,40 @@ +--- usrp/firmware/lib/delay.c.orig 2010-11-19 21:26:31.000000000 -0500 ++++ usrp/firmware/lib/delay.c 2010-11-19 21:28:04.000000000 -0500 +@@ -24,11 +24,12 @@ + * Delay approximately 1 microsecond (including overhead in udelay). + */ + static void +-udelay1 (void) _naked ++udelay1 (void) ++//__naked + { +- _asm ; lcall that got us here took 4 bus cycles ++ __asm ; lcall that got us here took 4 bus cycles + ret ; 4 bus cycles +- _endasm; ++ __endasm; + } + + /* +@@ -51,9 +52,10 @@ + * but explains the factor of 4 problem below). + */ + static void +-mdelay1 (void) _naked ++mdelay1 (void) ++// _naked + { +- _asm ++ __asm + mov dptr,#(-1200 & 0xffff) + 002$: + inc dptr ; 3 bus cycles +@@ -62,7 +64,7 @@ + jnz 002$ ; 3 bus cycles + + ret +- _endasm; ++ __endasm; + } + + void Property changes on: head/comms/gnuradio/files/patch-usrp_firmware_lib_delay.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/comms/gnuradio/files/patch-usrp_firmware_src_common_fpga_load.c =================================================================== --- head/comms/gnuradio/files/patch-usrp_firmware_src_common_fpga_load.c (nonexistent) +++ head/comms/gnuradio/files/patch-usrp_firmware_src_common_fpga_load.c (revision 265008) @@ -0,0 +1,12 @@ +--- usrp/firmware/src/common/fpga_load.c.orig 2010-11-19 22:24:42.000000000 -0500 ++++ usrp/firmware/src/common/fpga_load.c 2010-11-19 22:25:05.000000000 -0500 +@@ -89,7 +89,8 @@ + #else + + static void +-clock_out_config_byte (unsigned char bits) _naked ++clock_out_config_byte (unsigned char bits) ++// _naked + { + _asm + mov a, dpl Property changes on: head/comms/gnuradio/files/patch-usrp_firmware_src_common_fpga_load.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_spi.c =================================================================== --- head/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_spi.c (nonexistent) +++ head/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_spi.c (revision 265008) @@ -0,0 +1,12 @@ +--- usrp/firmware/src/usrp2/spi.c.orig 2010-11-19 22:13:00.000000000 -0500 ++++ usrp/firmware/src/usrp2/spi.c 2010-11-19 22:13:12.000000000 -0500 +@@ -320,7 +320,8 @@ + } + #else + static unsigned char +-read_byte_msb (void) _naked ++read_byte_msb (void) ++// _naked + { + _asm + clr a Property changes on: head/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_spi.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property