From d82c05717d9fd12f3f4ced3d4bf0cae7216ca9d9 Mon Sep 17 00:00:00 2001
From: db <db@FreeBSD.org>
Date: Tue, 23 Nov 2010 14:38:44 +0000
Subject: - unbreak build due to changes in scdcc   See
 http://lists.gnu.org/archive/html/discuss-gnuradio/2010-11/msg00460.html -
 sdcc changed the name of asx8051 to sdas8051 - compiler removed "_naked"

---
 comms/gnuradio/files/patch-config_usrp_sdcc.m4     | 11 ++++++
 .../gnuradio/files/patch-gnuradio-core_Makefile.in |  6 ++--
 .../gnuradio/files/patch-usrp_firmware_lib_delay.c | 40 ++++++++++++++++++++++
 .../patch-usrp_firmware_src_common_fpga_load.c     | 12 +++++++
 .../files/patch-usrp_firmware_src_usrp2_spi.c      | 12 +++++++
 5 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 comms/gnuradio/files/patch-config_usrp_sdcc.m4
 create mode 100644 comms/gnuradio/files/patch-usrp_firmware_lib_delay.c
 create mode 100644 comms/gnuradio/files/patch-usrp_firmware_src_common_fpga_load.c
 create mode 100644 comms/gnuradio/files/patch-usrp_firmware_src_usrp2_spi.c

(limited to 'comms')

diff --git a/comms/gnuradio/files/patch-config_usrp_sdcc.m4 b/comms/gnuradio/files/patch-config_usrp_sdcc.m4
new file mode 100644
index 000000000000..af3542655373
--- /dev/null
+++ b/comms/gnuradio/files/patch-config_usrp_sdcc.m4
@@ -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])
diff --git a/comms/gnuradio/files/patch-gnuradio-core_Makefile.in b/comms/gnuradio/files/patch-gnuradio-core_Makefile.in
index 0f1ff50e84c2..113ee1a32f4d 100644
--- a/comms/gnuradio/files/patch-gnuradio-core_Makefile.in
+++ b/comms/gnuradio/files/patch-gnuradio-core_Makefile.in
@@ -1,6 +1,6 @@
---- 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 = \
diff --git a/comms/gnuradio/files/patch-usrp_firmware_lib_delay.c b/comms/gnuradio/files/patch-usrp_firmware_lib_delay.c
new file mode 100644
index 000000000000..cbdd7213f4c7
--- /dev/null
+++ b/comms/gnuradio/files/patch-usrp_firmware_lib_delay.c
@@ -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
diff --git a/comms/gnuradio/files/patch-usrp_firmware_src_common_fpga_load.c b/comms/gnuradio/files/patch-usrp_firmware_src_common_fpga_load.c
new file mode 100644
index 000000000000..663256ff6cd2
--- /dev/null
+++ b/comms/gnuradio/files/patch-usrp_firmware_src_common_fpga_load.c
@@ -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
diff --git a/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_spi.c b/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_spi.c
new file mode 100644
index 000000000000..628ed4256bc8
--- /dev/null
+++ b/comms/gnuradio/files/patch-usrp_firmware_src_usrp2_spi.c
@@ -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
-- 
cgit