Date: Sat, 9 May 1998 13:03:04 +0200 (MET DST) From: Wolfgang Helbig <helbig@Informatik.BA-Stuttgart.DE> To: FreeBSD-ISDN@FreeBSD.ORG (FreeBSD ISDN mailinglist) Subject: i4b-00.60-alpha for FreeBSD-current Message-ID: <199805091103.NAA00483@rvc1.informatik.ba-stuttgart.de>
next in thread | raw e-mail | index | archive | help
Hi,
here are some patches to make i4b build for FreeBSD-current:
- Bruce Evans changed yacc and lex rules in bsd-prog-mk, which
broke isdnd/Makefile
Don't forget ``make depend''.
- asm volatile is not valid anymore in the current gcc-configuration,
use __asm __volatile instead in i4b_tel_s08.c and i4b_tel_s16.c
This patch should work in FreeBSD 2.2.x and NetBSD as well??
- A typo in i4b_l1fsm.c.
With these patches applied it builds and works fine.
Wolfgang
diff -ru /home/helbig/src/i4b/isdnd/Makefile ./isdnd/Makefile
--- /home/helbig/src/i4b/isdnd/Makefile Wed Apr 22 11:47:12 1998
+++ ./isdnd/Makefile Sat May 9 11:35:39 1998
@@ -1,14 +1,26 @@
+.if !defined(BSDTYPE)
+BSDTYPE!=uname
+.endif
+
+.if !defined(RELEASE)
+RELEASE!=uname -r
+.endif
+
PROG = isdnd
SRCS = rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c \
process.c rates.c msghdl.c fsm.c support.c timer.c \
exec.c dial.c monitor.c
+.if (${BSDTYPE} == "FreeBSD" && ${RELEASE} == "3.0-CURRENT")
+SRCS += y.tab.h
+.endif
+
+.if (${BSDTYPE} == "NetBSD" || \
+ ${BSDTYPE} == "FreeBSD" && ${RELEASE} != "3.0-CURRENT")
CLEANFILES+= rc_scan.c rc_parse.c y.tab.h y.output hdr.out isdnd.core
+.endif
COPTS += -I../isdnmonitor
-.if !defined(BSDTYPE)
-BSDTYPE!=uname
-.endif
# compile debug support
COPTS += -DDEBUG
@@ -28,10 +40,13 @@
MAN = isdnd.8 isdnd.rc.5 isdnd.rates.5 isdnd.acct.5
.endif
+.if (${BSDTYPE} == "NetBSD" || \
+ ${BSDTYPE} == "FreeBSD" && ${RELEASE} != "3.0-CURRENT")
rc_scan.c: rc_scan.l y.tab.h
y.tab.h: rc_parse.c
rc_parse.c: rc_parse.y
rc_config.c: y.tab.h
+.endif
hdr:
cextract +A +p -P -E -o hdr.out *.c
diff -ru /home/helbig/src/i4b/layer1/i4b_l1fsm.c ./layer1/i4b_l1fsm.c
--- /home/helbig/src/i4b/layer1/i4b_l1fsm.c Fri May 1 19:23:33 1998
+++ ./layer1/i4b_l1fsm.c Sat May 9 12:13:14 1998
@@ -171,7 +171,7 @@
{
sc->sc_I430T3 = 0;
#if defined(__FreeBSD__) && __FreeBSD__ >=3
- untimeout((TIMEOUT_FUNC_T)timer3_expired,(struct isic_softc *)sc, T3_callout);
+ untimeout((TIMEOUT_FUNC_T)timer3_expired,(struct isic_softc *)sc, sc->sc_T3_callout);
#else
untimeout((TIMEOUT_FUNC_T)timer3_expired,(struct isic_softc *)sc);
#endif
diff -ru /home/helbig/src/i4b/layer1/i4b_tel_s016.c ./layer1/i4b_tel_s016.c
--- /home/helbig/src/i4b/layer1/i4b_tel_s016.c Mon Mar 2 09:42:51 1998
+++ ./layer1/i4b_tel_s016.c Sat May 9 12:07:29 1998
@@ -170,7 +170,7 @@
tels016_memcpyb(void *to, const void *from, size_t len)
{
/* %edi=to %esi=from %ecx=len */
- asm volatile ("
+ __asm __volatile ("
.align 4,0x90
cld
rep
diff -ru /home/helbig/src/i4b/layer1/i4b_tel_s08.c ./layer1/i4b_tel_s08.c
--- /home/helbig/src/i4b/layer1/i4b_tel_s08.c Tue Apr 21 17:57:20 1998
+++ ./layer1/i4b_tel_s08.c Sat May 9 12:07:50 1998
@@ -169,7 +169,7 @@
tels08_memcpyb(void *to, const void *from, size_t len)
{
/* %edi=to %esi=from %ecx=len */
- asm volatile ("
+ __asm __volatile ("
.align 4,0x90
cld
rep
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-isdn" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199805091103.NAA00483>