From owner-freebsd-isdn Sun Apr 12 02:14:47 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id CAA08538 for freebsd-isdn-outgoing; Sun, 12 Apr 1998 02:14:47 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from server.amis.net (server.amis.net [195.10.52.10]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id CAA08533 for ; Sun, 12 Apr 1998 02:14:42 -0700 (PDT) (envelope-from blaz@gold.amis.net) Received: (from uucp@localhost) by server.amis.net (8.8.8/8.8.8) with UUCP id LAA28663; Sun, 12 Apr 1998 11:14:01 +0200 (CEST) Received: from localhost (blaz@localhost) by gold.amis.net (8.8.8/8.8.8) with SMTP id LAA00248; Sun, 12 Apr 1998 11:13:41 +0200 (CEST) Date: Sun, 12 Apr 1998 11:13:40 +0200 (CEST) From: Blaz Zupan To: Wolfgang Helbig cc: FreeBSD ISDN mailinglist Subject: Re: layer 1 rework In-Reply-To: <199804102313.BAA00432@rvc1.informatik.ba-stuttgart.de> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org > This is a rework of layer 1: With this patch i4b works just fine on my machine now, even some of the error messages that the previous hack that you produced for me now dissapeared. I was running a I4B_SMP_WORKAROUND-enabled kernel until today and am now running without the SMP workaround and after 2 reboots is still seems to work. So I guess you are on the right track :) Blaz Zupan, blaz@medinet.si, http://home.amis.net/blaz Medinet d.o.o., Linhartova 21, 2000 Maribor, Slovenia To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Sun Apr 12 02:27:08 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id CAA09553 for freebsd-isdn-outgoing; Sun, 12 Apr 1998 02:27:08 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from hcshh.hcs.de (hcshh.hcs.de [194.123.40.1]) by hub.freebsd.org (8.8.8/8.8.8) with SMTP id CAA09542 for ; Sun, 12 Apr 1998 02:27:06 -0700 (PDT) (envelope-from hm@hcs.de) Received: from hcswork.hcs.de([192.76.124.5]) (1724 bytes) by hcshh.hcs.de via sendmail with P:smtp/R:inet_hosts/T:smtp (sender: ) id for ; Sun, 12 Apr 1998 11:26:53 +0200 (METDST) (Smail-3.2.0.97 1997-Aug-19 #16 built 1997-Oct-22) Received: by hcswork.hcs.de (Smail3.1.29.0 #12) id m0yOJ3v-0000dZC; Sun, 12 Apr 98 11:28 METDST Message-Id: From: hm@hcs.de (Hellmuth Michaelis) Subject: Re: layer 1 rework In-Reply-To: from Blaz Zupan at "Apr 12, 98 11:13:40 am" To: blaz@gold.amis.net (Blaz Zupan) Date: Sun, 12 Apr 1998 11:28:31 +0200 (METDST) Cc: helbig@Informatik.BA-Stuttgart.DE, FreeBSD-ISDN@FreeBSD.ORG Reply-To: hm@hcs.de Organization: HCS Hanseatischer Computerservice GmbH X-Mailer: ELM [version 2.4ME+ PL39 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >From the keyboard of Blaz Zupan: > > This is a rework of layer 1: > > With this patch i4b works just fine on my machine now, even some of the > error messages that the previous hack that you produced for me now > dissapeared. I was running a I4B_SMP_WORKAROUND-enabled kernel until today > and am now running without the SMP workaround and after 2 reboots is still > seems to work. So I guess you are on the right track :) This is really good news! And a big, fat "Thank You" to Wolfgang for his work! hellmuth -- Hellmuth Michaelis Tel +49 40 559747-70 HCS Hanseatischer Computerservice GmbH Fax +49 40 559747-77 Oldesloer Strasse 97-99 Mail hm@hcs.de 22457 Hamburg WWW http://www.hcs.de To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Sun Apr 12 02:33:52 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id CAA10029 for freebsd-isdn-outgoing; Sun, 12 Apr 1998 02:33:52 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from server.amis.net (server.amis.net [195.10.52.10]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id CAA10024 for ; Sun, 12 Apr 1998 02:33:48 -0700 (PDT) (envelope-from blaz@gold.amis.net) Received: (from uucp@localhost) by server.amis.net (8.8.8/8.8.8) with UUCP id LAA29729; Sun, 12 Apr 1998 11:33:24 +0200 (CEST) Received: from localhost (blaz@localhost) by gold.amis.net (8.8.8/8.8.8) with SMTP id LAA00420; Sun, 12 Apr 1998 11:32:46 +0200 (CEST) Date: Sun, 12 Apr 1998 11:32:46 +0200 (CEST) From: Blaz Zupan To: Hellmuth Michaelis cc: helbig@Informatik.BA-Stuttgart.DE, FreeBSD-ISDN@FreeBSD.ORG Subject: Re: layer 1 rework In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org > > dissapeared. I was running a I4B_SMP_WORKAROUND-enabled kernel until today > This is really good news! And a big, fat "Thank You" to Wolfgang for his work! Hellmuth, I hope you don't jump to conclusions and that you remember that I don't have a SMP machine, it just fixed part of the problem for me, too. I hope somebody who is running SMP will try out this patch and report his results! And of course a big fat thank-you to Woflgang from me, too! Blaz Zupan, blaz@medinet.si, http://home.amis.net/blaz Medinet d.o.o., Linhartova 21, 2000 Maribor, Slovenia To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Sun Apr 12 04:01:42 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id EAA19940 for freebsd-isdn-outgoing; Sun, 12 Apr 1998 04:01:42 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from server.amis.net (server.amis.net [195.10.52.10]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id EAA19935 for ; Sun, 12 Apr 1998 04:01:38 -0700 (PDT) (envelope-from blaz@gold.amis.net) Received: (from uucp@localhost) by server.amis.net (8.8.8/8.8.8) with UUCP id NAA04367 for freebsd-isdn@freebsd.org; Sun, 12 Apr 1998 13:01:33 +0200 (CEST) Received: from localhost (blaz@localhost) by gold.amis.net (8.8.8/8.8.8) with SMTP id NAA00348 for ; Sun, 12 Apr 1998 13:01:25 +0200 (CEST) Date: Sun, 12 Apr 1998 13:01:25 +0200 (CEST) From: Blaz Zupan To: freebsd-isdn@FreeBSD.ORG Subject: Callback Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Concerning my problems with callback, I have the strange feeling that I didn't correctly understand the "calledback" call type. Reading the source, it seems like the remote end has to _reject_ the call, i.e. return a busy signal. But my current setup _accepts_ the call and then after authentication it drops the call and calls back. If packets arrive in the mean time, i4b calls again and this repeats again and again... Is my assumption correct, does i4b callback only work with setups where the remote end returns a busy on the dialin? Blaz Zupan, blaz@medinet.si, http://home.amis.net/blaz Medinet d.o.o., Linhartova 21, 2000 Maribor, Slovenia To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Sun Apr 12 04:34:53 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id EAA24715 for freebsd-isdn-outgoing; Sun, 12 Apr 1998 04:34:53 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from critter.freebsd.dk (critter.freebsd.dk [195.8.129.14]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id EAA24673 for ; Sun, 12 Apr 1998 04:34:42 -0700 (PDT) (envelope-from phk@critter.freebsd.dk) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.8.7/8.8.5) with ESMTP id NAA16115; Sun, 12 Apr 1998 13:33:32 +0200 (CEST) To: Blaz Zupan cc: freebsd-isdn@FreeBSD.ORG Subject: Re: Callback In-reply-to: Your message of "Sun, 12 Apr 1998 13:01:25 +0200." Date: Sun, 12 Apr 1998 13:33:32 +0200 Message-ID: <16113.892380812@critter.freebsd.dk> From: Poul-Henning Kamp Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org In message , Blaz Zupan w rites: >Concerning my problems with callback, I have the strange feeling that I >didn't correctly understand the "calledback" call type. Reading the >source, it seems like the remote end has to _reject_ the call, i.e. return >a busy signal. But my current setup _accepts_ the call and then after >authentication it drops the call and calls back. If packets arrive in the >mean time, i4b calls again and this repeats again and again... > >Is my assumption correct, does i4b callback only work with setups where >the remote end returns a busy on the dialin? yes. -- Poul-Henning Kamp FreeBSD coreteam member phk@FreeBSD.ORG "Real hackers run -current on their laptop." "Drink MONO-tonic, it goes down but it will NEVER come back up!" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Sun Apr 12 05:24:41 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id FAA01016 for freebsd-isdn-outgoing; Sun, 12 Apr 1998 05:24:41 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from news1.gtn.com (news1.gtn.com [194.77.0.15]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id FAA01011 for ; Sun, 12 Apr 1998 05:24:37 -0700 (PDT) (envelope-from andreas@klemm.gtn.com) Received: (from uucp@localhost) by news1.gtn.com (8.8.6/8.8.6) with UUCP id OAA00102 for FreeBSD-ISDN@FreeBSD.ORG; Sun, 12 Apr 1998 14:15:05 +0200 (MET DST) Received: (from andreas@localhost) by klemm.gtn.com (8.8.8/8.8.7) id NAA13653; Sun, 12 Apr 1998 13:07:00 +0200 (CEST) (envelope-from andreas) Message-ID: <19980412130659.38280@klemm.gtn.com> Date: Sun, 12 Apr 1998 13:06:59 +0200 From: Andreas Klemm To: FreeBSD-ISDN@FreeBSD.ORG Subject: bisdn patches for -current via new mkbisdnktree script Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=YZ5djTAD1cGYuMQK X-Mailer: Mutt 0.89.1i X-Disclaimer: A free society is one where it is safe to be unpopular X-Operating-System: FreeBSD 3.0-CURRENT SMP Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset=us-ascii Just for the case, that there is still demand to run bisdn on -current ... here the latest mkbisdnktree script that contains diffs for the time->getmicrotime changes. Happy easter weekend Andreas /// -- Andreas Klemm http://www.FreeBSD.ORG/~andreas What gives you 90% more speed, for example in kernel compilation ? http://www.FreeBSD.ORG/~fsmp/SMP/akgraph-a/graph1.html powered by ,,symmetric multiprocessor FreeBSD'' --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=mkbisdnktree #! /bin/sh prefix=/usr kerneldir=${prefix}/src/sys bisdnkerneldir=/home/data/sys.bisdn bisdndir=/home/data/bisdn-097 # remove everything and start over rm -rf ${bisdnkerneldir} mkdir -p ${bisdnkerneldir} rm -f /bisdn ln -s ${bisdnkerneldir} /bisdn # make basic symlinks cd ${bisdnkerneldir} ln -s ${kerneldir}/* ${bisdnkerneldir} # 3.1 patch "files" in sys/conf rm ${bisdnkerneldir}/conf mkdir ${bisdnkerneldir}/conf ln -s ${kerneldir}/conf/* ${bisdnkerneldir}/conf rm ${bisdnkerneldir}/conf/files cp ${kerneldir}/conf/files ${bisdnkerneldir}/conf cat << !EOT >> ${bisdnkerneldir}/conf/files bisdn/b_isdntel.c optional ispy device-driver bisdn/b_isdntel.c optional itel device-driver bisdn/b_isdntty.c optional ity device-driver bisdn/b_isdnipi.c optional ipi device-driver net/slcompress.c optional ipi bisdn/b_isdn.c optional isdn device-driver bisdn/b_isdnlap.c optional disdn device-driver bisdn/b_disdn.c optional disdn device-driver !EOT # # 3.2 patch "files.i386" in sys/i386/conf # rm ${bisdnkerneldir}/i386 mkdir ${bisdnkerneldir}/i386 ln -s ${kerneldir}/i386/* ${bisdnkerneldir}/i386 rm ${bisdnkerneldir}/i386/conf mkdir ${bisdnkerneldir}/i386/conf ln -s ${kerneldir}/i386/conf/* ${bisdnkerneldir}/i386/conf rm ${bisdnkerneldir}/i386/conf/files.i386 cp ${kerneldir}/i386/conf/files.i386 ${bisdnkerneldir}/i386/conf # DO PATCH in bisdnkerneldir cd ${bisdnkerneldir}/i386/conf patch --quiet --fuzz=50 \ < ${bisdndir}/diffs/usr-src-sys-i386-conf-files.i386.diff # # 3.2 copy kernel config example BISDN # cp ${bisdndir}/BISDN ${bisdnkerneldir}/i386/conf/BISDN.koptions # # 3.3b patch "options.i386" in sys/i386/conf # rm ${bisdnkerneldir}/i386/conf/options.i386 cp ${kerneldir}/i386/conf/options.i386 ${bisdnkerneldir}/i386/conf # DO PATCH in bisdnkerneldir cd ${bisdnkerneldir}/i386/conf patch --quiet --fuzz=50 \ < ${bisdndir}/diffs/usr-src-sys-i386-conf-options.i386.diff # # copy teles.c file to i386/isa # rm ${bisdnkerneldir}/i386/isa mkdir ${bisdnkerneldir}/i386/isa ln -s ${kerneldir}/i386/isa/* ${bisdnkerneldir}/i386/isa cp ${bisdndir}/sys-i386-isa/teles.c ${bisdnkerneldir}/i386/isa # NOT needed usr-src-sys-i386-i386-support.s.diff # # 3.4 copy the needed header files into /usr/include/machine # cp ${bisdndir}/machine/*.h /usr/include/machine # new -current cp ${bisdndir}/machine/*.h /bisdn/i386/include # # 3.5 copy the bisdn kernel sources to the right place # mkdir ${bisdnkerneldir}/bisdn cp ${bisdndir}/sys-bisdn/* ${bisdnkerneldir}/bisdn # # create a separate compile directory for bisdn in sys.bisdn # rm ${bisdnkerneldir}/compile mkdir ${bisdnkerneldir}/compile # remove not needed CVS dirs cd ${bisdnkerneldir} find . -type l -name CVS -print | xargs rm case `uname -n` in *klemm.gtn.com|"") cp /root/bin/BISDN* ${bisdnkerneldir}/i386/conf ;; esac # # PATCHES in ${bisdnkerneldir}/i386/isa # cd ${bisdnkerneldir}/i386/isa patch --quiet <=3 +#define TIMEOUT_FUNC_T timeout_t * +#else +#define TIMEOUT_FUNC_T timeout_func_t +#endif /* __FreeBSD__ >=3 */ #endif /* __FreeBSD__ */ #ifdef __NetBSD__ #define TIMEOUT_FUNC_T void * @@ -468,9 +472,14 @@ /* since 32 bytes should be xmitted in ~ 4 ms, wait */ /* for 1 tick */ #ifdef __FreeBSD__ +#if __FreeBSD__ >=3 + untimeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) unit, bisdn_timeout_handle); + bisdn_timeout_handle = timeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) unit, 1); +#else untimeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) unit); timeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) unit, 1); #endif +#endif #ifdef __NetBSD__ untimeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) sc); timeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) sc, 1); @@ -549,8 +558,12 @@ /* since 32 bytes should be xmitted in ~ 4 ms, wait for 1 tick */ #ifdef __FreeBSD__ +#if __FreeBSD__ >=3 + bisdn_timeout_handle = timeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) unit, 1); +#else timeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) unit, 1); #endif +#endif #ifdef __NetBSD__ timeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) sc, 1); #endif @@ -1617,7 +1630,11 @@ sc->sc_vmem_addr[0x80] = 0; } #ifdef __FreeBSD__ +#if __FreeBSD__ >=3 + bisdn_timeout_handle = timeout((TIMEOUT_FUNC_T) telinit, (caddr_t) unit, hz / 10); +#else timeout((TIMEOUT_FUNC_T) telinit, (caddr_t) unit, hz / 10); +#endif #endif /* __FreeBSD__ */ #ifdef __NetBSD__ timeout((TIMEOUT_FUNC_T) telinit, (caddr_t) sc, hz / 10); @@ -1636,8 +1653,12 @@ /* clear the timeout */ #ifdef __FreeBSD__ +#if __FreeBSD__ >=3 + untimeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) unit, bisdn_timeout_handle); +#else untimeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) unit); #endif +#endif #ifdef __NetBSD__ untimeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) sc); #endif @@ -1669,8 +1690,12 @@ /* since 32 bytes should be xmitted in ~ 4 ms, wait */ /* for 1 tick */ #ifdef __FreeBSD__ +#if __FreeBSD__ >=3 + bisdn_timeout_handle = timeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) unit, 1); +#else timeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) unit, 1); #endif +#endif #ifdef __NetBSD__ timeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) sc, 1); #endif @@ -1847,7 +1872,11 @@ /* since 32 bytes should be xmitted in ~ 4 ms, wait */ /* for 1 tick */ #ifdef __FreeBSD__ +#if __FreeBSD__ >=3 + bisdn_timeout_handle = timeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) unit, 1); +#else timeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) unit, 1); +#endif #endif #ifdef __NetBSD__ timeout((TIMEOUT_FUNC_T) tel_d_wd, (caddr_t) sc, 1); !EOT # # PATCHES in ${bisdnkerneldir}/bisdn # cd ${bisdnkerneldir}/bisdn patch --quiet < #ifdef __FreeBSD__ +#if __FreeBSD__ >=3 +#define TIMEOUT_FUNC_T timeout_t * +#else #define TIMEOUT_FUNC_T timeout_func_t +#endif /* __FreeBSD__ >=3 */ #endif /* __FreeBSD__ */ #ifdef __NetBSD__ #define TIMEOUT_FUNC_T void * @@ -706,7 +710,11 @@ splx(x); } msg->isalert = alert; +#if __FreeBSD__ >=3 + bisdn_timeout_handle = timeout((TIMEOUT_FUNC_T)disdn_resend, (caddr_t)cn, 2*hz); +#else timeout((TIMEOUT_FUNC_T)disdn_resend, (caddr_t)cn, 2*hz); +#endif return(0); } msg->isalert = 0; @@ -717,7 +725,11 @@ ctrl->appl = an; cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); ctrl->lastact = ltime.tv_sec; @@ -827,7 +839,11 @@ int cs; cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); ctrl->lastact = ltime.tv_sec; @@ -918,7 +934,11 @@ int cs; cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); ctrl->lastact = ltime.tv_sec; @@ -1353,7 +1373,11 @@ ctrl = &isdn_ctrl[msg->ctrl]; cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); ctrl->lastact = ltime.tv_sec; @@ -1450,7 +1474,11 @@ { chan->state = ACTIVE; ctrl->state = IS_FIRST; +#if __FreeBSD__ >=3 + bisdn_timeout_handle = timeout((TIMEOUT_FUNC_T)disdn_firstout,(caddr_t)(int)chan->ctrl,hz/5); +#else timeout((TIMEOUT_FUNC_T)disdn_firstout,(caddr_t)(int)chan->ctrl,hz/5); +#endif } } return; @@ -1487,7 +1515,11 @@ ctrl = &isdn_ctrl[msg->ctrl]; cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); ctrl->lastact = ltime.tv_sec; @@ -1507,7 +1539,11 @@ { chan->state = ACTIVE; ctrl->state = IS_FIRST; +#if __FreeBSD__ >=3 + bisdn_timeout_handle = timeout((TIMEOUT_FUNC_T)disdn_firstout,(caddr_t)(int)chan->ctrl,hz/5); +#else timeout((TIMEOUT_FUNC_T)disdn_firstout,(caddr_t)(int)chan->ctrl,hz/5); +#endif } } return; @@ -1657,7 +1693,11 @@ if(sc->sc_flags & TEITIMEOUT) { sc->sc_flags &= ~(TEITIMEOUT); +#if __FreeBSD__ >=3 + untimeout((TIMEOUT_FUNC_T) tei_get, (caddr_t) unit, bisdn_timeout_handle); +#else untimeout((TIMEOUT_FUNC_T) tei_get, (caddr_t) unit); +#endif } ri = *(u_short *) & b[4]; @@ -1689,7 +1729,11 @@ sc->sc_state = DISCON; sc->hdlc.state = LAP_DISCONNECTED; sc->sc_flags |= TEITIMEOUT; +#if __FreeBSD__ >=3 + bisdn_timeout_handle = timeout((TIMEOUT_FUNC_T) tei_get, (caddr_t) unit, 2*hz); +#else timeout((TIMEOUT_FUNC_T) tei_get, (caddr_t) unit, 2*hz); +#endif } break; @@ -1727,7 +1771,11 @@ sc->sc_state = DISCON; sc->hdlc.state = LAP_DISCONNECTED; sc->sc_flags |= TEITIMEOUT; - timeout((TIMEOUT_FUNC_T) tei_get, (caddr_t) unit, 10); +#if __FreeBSD__ >=3 + bisdn_timeout_handle = timeout((TIMEOUT_FUNC_T) tei_get, (caddr_t) unit, 10*hz); +#else + timeout((TIMEOUT_FUNC_T) tei_get, (caddr_t) unit, 10*hz); +#endif } break; @@ -1864,7 +1912,11 @@ return(0); cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); ctrl->lastact = ltime.tv_sec; @@ -2155,7 +2207,11 @@ printf("tei_get stat\n"); #endif sc->sc_flags |= TEITIMEOUT; +#if __FreeBSD__ >=3 + bisdn_timeout_handle = timeout((TIMEOUT_FUNC_T) tei_get, (caddr_t) unit, hz); +#else timeout((TIMEOUT_FUNC_T) tei_get, (caddr_t) unit, hz); +#endif splx(x); return(-1); } @@ -2163,7 +2219,11 @@ if((m = isdn_getbuf(8)) == NULL) { sc->sc_flags |= TEITIMEOUT; - timeout((TIMEOUT_FUNC_T) tei_get, (caddr_t) unit, 10); +#if __FreeBSD__ >=3 + bisdn_timeout_handle = timeout((TIMEOUT_FUNC_T) tei_get, (caddr_t) unit, 10*hz); +#else + timeout((TIMEOUT_FUNC_T) tei_get, (caddr_t) unit, 10*hz); +#endif splx(x); return(-1); } @@ -2177,7 +2237,11 @@ if(sc->sc_tei == 0xff) { cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); for(i=0; i < 16 ; i++, sc->sc_ri++) @@ -2209,7 +2273,11 @@ disdn_d_startout(sc->sc_unit); sc->sc_flags |= TEITIMEOUT; +#if __FreeBSD__ >=3 + bisdn_timeout_handle = timeout((TIMEOUT_FUNC_T) tei_get, (caddr_t) unit, 2 * hz); +#else timeout((TIMEOUT_FUNC_T) tei_get, (caddr_t) unit, 2 * hz); +#endif splx(x); return(-1); @@ -2237,7 +2305,11 @@ return; cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); m->m_len = 8; --- b_isdn.c.orig Sun Apr 12 06:42:08 1998 +++ b_isdn.c Sun Apr 12 07:32:38 1998 @@ -104,7 +104,11 @@ #include #ifdef __FreeBSD__ +#if __FreeBSD__ >=3 +#define TIMEOUT_FUNC_T timeout_t * +#else #define TIMEOUT_FUNC_T timeout_func_t +#endif /* __FreeBSD__ >=3 */ #endif /* __FreeBSD__ */ #ifdef __NetBSD__ #define TIMEOUT_FUNC_T void * @@ -694,7 +698,11 @@ { isdn_timeout = 1; cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); #ifdef TO_DEBUG /* if (to_debug) */ @@ -726,6 +734,9 @@ { isdn_appl_t *appl = &isdn_appl[an]; struct mbuf *m; +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + struct timeval tv; +#endif int cs; if((m = isdn_getbuf(sizeof(message_connect_t))) != NULL) @@ -746,7 +757,12 @@ (*appl->Connect) (appl->drivno); cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(&tv); + isdn_ctrl[cn].call_start = tv.tv_sec; +#else isdn_ctrl[cn].call_start = time.tv_sec; +#endif splx (cs); if((isdn_timeout == 0) && appl->idle_time) --- b_isdn.h.orig Sun Apr 12 06:42:08 1998 +++ b_isdn.h Sun Apr 12 06:42:09 1998 @@ -78,6 +78,10 @@ void (*DisConn) (int no); } isdn_appl_t; +#if __FreeBSD__ >=3 +static struct callout_handle bisdn_timeout_handle; +#endif + /* The following code is taken from the if.h IF_Q* stuff */ /* We do not need drop control */ --- b_isdnipi.c.orig Sun Apr 12 06:42:08 1998 +++ b_isdnipi.c Sun Apr 12 07:23:47 1998 @@ -101,6 +101,8 @@ * *---------------------------------------------------------------------------*/ +#include "opt_inet.h" + #ifdef INET #include "ipi.h" @@ -111,7 +113,15 @@ #include #include #include -#include + +#if BSD > 199306 && defined (__FreeBSD__) +#include +#include +#include +#else +#include +#endif + #include #include @@ -534,7 +544,11 @@ #endif /* IPI_VJ */ +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(&sc->sc_if.if_lastchange); +#else sc->sc_if.if_lastchange = time; +#endif x = splimp(); @@ -673,7 +687,11 @@ m->m_pkthdr.rcvif = &sc->sc_if; m->m_pkthdr.len = m->m_len; +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(&sc->sc_if.if_lastchange); +#else sc->sc_if.if_lastchange = time; +#endif #ifdef IPI_VJ sc->sc_cinb += m->m_pkthdr.len; --- b_isdnlap.c.orig Sun Apr 12 06:42:08 1998 +++ b_isdnlap.c Sun Apr 12 07:35:16 1998 @@ -16,20 +16,14 @@ * *---------------------------------------------------------------------------*/ -#ifdef __FreeBSD__ -#include -#include -#include -#include -#include -#endif /* __FreeBSD__ */ -#ifdef __NetBSD__ #include #include #include #include -#include #include + +#ifdef __NetBSD__ +#include #endif /* __NetBSD__ */ #include @@ -45,7 +39,11 @@ #include #ifdef __FreeBSD__ +#if __FreeBSD__ >=3 +#define TIMEOUT_FUNC_T timeout_t * +#else #define TIMEOUT_FUNC_T timeout_func_t +#endif /* __FreeBSD__ >=3 */ #endif /* __FreeBSD__ */ #ifdef __NetBSD__ #define TIMEOUT_FUNC_T void * @@ -509,7 +507,11 @@ { /* Start round trip timer */ hd->rtt_seq = (hd->vs-1) & hd->mmask; +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(&hd->rtt_time); +#else hd->rtt_time = time; +#endif hd->flags.rtt_run = 1; } return 1; @@ -628,11 +630,19 @@ { if(hd->timeout) { +#if __FreeBSD__ >=3 + untimeout((TIMEOUT_FUNC_T)laprecover,hd, hd->ch); +#else untimeout((TIMEOUT_FUNC_T)laprecover,hd); +#endif } hd->timeout= tp; if(tp) +#if __FreeBSD__ >=3 + hd->ch = timeout((TIMEOUT_FUNC_T)laprecover,hd,hd->toutval[tp]); +#else timeout((TIMEOUT_FUNC_T)laprecover,hd,hd->toutval[tp]); +#endif } static void @@ -646,6 +656,13 @@ timediff(struct timeval *t1) { long t; +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + struct timeval tv; + getmicrotime(&tv); + t= (tv.tv_usec - t1->tv_usec) / 1000; + return(t + (tv.tv_sec - t1->tv_sec)*1000); +#else t= (time.tv_usec - t1->tv_usec) / 1000; return(t + (time.tv_sec - t1->tv_sec)*1000); +#endif } --- b_isdnlap.h.orig Sun Apr 12 06:42:08 1998 +++ b_isdnlap.h Sun Apr 12 06:42:09 1998 @@ -88,5 +88,7 @@ u_short rtt_seq; /* Sequence number being timed */ u_long srt; /* Smoothed round-trip time, ms */ u_long mdev; /* Mean rtt deviation, ms */ +#if defined (__FreeBSD__) && __FreeBSD__ >=3 + struct callout_handle ch; +#endif }; - --- b_isdntel.c.orig Sun Apr 12 07:55:22 1998 +++ b_isdntel.c Sun Apr 12 07:57:02 1998 @@ -168,7 +168,11 @@ { m->m_data[0]= out; *(u_long *) &m->m_data[1]= ispyabscnt++; +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(&m->m_data[5]); +#else *(struct timeval *) &m->m_data[5]= time; +#endif } IS_ENQUEUE(&i_q[no],m); !EOT # # Do some of the work automatically # # cd /bisdn/i386/conf # config BISDNSMP # cd /bisdn/compile/BISDNSMP # time make depend all exit 0 --YZ5djTAD1cGYuMQK-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Sun Apr 12 11:55:34 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id LAA18152 for freebsd-isdn-outgoing; Sun, 12 Apr 1998 11:55:34 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from uriela.in-berlin.de (uriela.in-berlin.de [192.109.42.147]) by hub.freebsd.org (8.8.8/8.8.8) with SMTP id LAA18145 for ; Sun, 12 Apr 1998 11:55:25 -0700 (PDT) (envelope-from dva!balu@never.mind.de) Received: by uriela.in-berlin.de (/\oo/\ Smail3.1.29.1 #29.8) from never.never.mind.de (193.101.72.4) with smtp id m0yORuQ-000LtXC; Sun, 12 Apr 98 20:55 MET DST Received: from dva by never.never.mind.de with uucp (linux Smail3.1.28.1 #1) id m0yORuP-000ExYC; Sun, 12 Apr 98 20:55 MET DST Received: by dva.in-berlin.de via smail with stdio id for freebsd-isdn@FreeBSD.ORG; Sun, 12 Apr 1998 20:50:22 +0200 (CEST) (Smail-3.2 1996-Jul-4 #1 built CET-26-Nov) Message-Id: From: balu@dva.in-berlin.de (Boris Staeblow) Subject: diff for BISDNTEST3 and latest FreeBSD-current! To: freebsd-isdn@FreeBSD.ORG Date: Sun, 12 Apr 1998 20:50:21 +0200 (CEST) X-Mailer: ELM [version 2.4ME+ PL34 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Because of the recent time-changes in FreeBSD-current i've spend some hours to make bisdntest-3 work and compile with the latest current. I'm not so familiar with C and kernel-hacking, so i hope i've done it in the right way. My kernel is running fine now. Can anyone confirm the correctness of this diff? Boris diff -r -u ../bisdntest.orig/diffs/sys-conf-files.diff ./diffs/sys-conf-files.diff --- ../bisdntest.orig/diffs/sys-conf-files.diff Sat Aug 30 16:34:45 1997 +++ ./diffs/sys-conf-files.diff Sun Apr 12 20:02:13 1998 @@ -1,88 +1,61 @@ -*** files.orig Sat Aug 30 16:23:12 1997 ---- files Sat Aug 30 16:32:30 1997 -*************** -*** 28,33 **** ---- 28,42 ---- - dev/ppbus/ppi.c optional ppi - dev/ppbus/vpo.c optional vpo - dev/vn/vn.c optional vn -+ bisdn/b_isdntel.c optional ispy device-driver -+ bisdn/b_isdntel.c optional itel device-driver -+ bisdn/b_isdntty.c optional ity device-driver -+ bisdn/b_isdnipi.c optional ipi device-driver -+ bisdn/b_isdnipp.c optional ipp device-driver -+ bisdn/b_isdn.c optional isdn device-driver -+ bisdn/b_isdnlap.c optional disdn device-driver -+ bisdn/b_disdn.c optional disdn device-driver -+ - dev/vx/if_vx.c optional vx device-driver - gnu/ext2fs/ext2_alloc.c optional ext2fs - gnu/ext2fs/ext2_balloc.c optional ext2fs -*************** -*** 84,90 **** - kern/kern_sysctl.c standard - kern/kern_time.c standard - kern/kern_xxx.c standard -- kern/md5c.c optional md5 - kern/subr_diskslice.c standard - kern/subr_dkbad.c standard - kern/subr_log.c standard ---- 93,98 ---- -*************** -*** 167,172 **** ---- 175,181 ---- - net/bpf.c optional bpfilter - net/bpf_filter.c optional bpfilter - net/bsd_comp.c optional ppp_bsdcomp -+ net/bsd_comp.c optional ipp - net/hostcache.c standard - net/if.c standard - net/if_atmsubr.c optional atm -*************** -*** 177,193 **** ---- 186,206 ---- - net/if_media.c standard - net/if_mib.c standard - net/if_ppp.c optional ppp -+ net/if_ppp.c optional ipp - net/if_sl.c optional sl - net/if_spppsubr.c optional sppp - net/if_tun.c optional tun - net/ppp_deflate.c optional ppp_deflate - net/ppp_tty.c optional ppp -+ net/ppp_tty.c optional ipp - net/radix.c standard - net/raw_cb.c standard - net/raw_usrreq.c standard - net/route.c standard - net/rtsock.c standard - net/slcompress.c optional ppp -+ net/slcompress.c optional ipp -+ net/slcompress.c optional ipi - net/slcompress.c optional sl - net/zlib.c optional ppp_deflate - netatalk/aarp.c optional netatalk -*************** -*** 229,234 **** ---- 242,252 ---- - netinet/in_proto.c optional inet - netinet/in_rmx.c optional inet - netinet/ip_divert.c optional ipdivert -+ netinet/ip_fil.c optional ipfilter inet -+ netinet/fil.c optional ipfilter inet -+ netinet/ip_nat.c optional ipfilter inet -+ netinet/ip_frag.c optional ipfilter inet -+ netinet/ip_state.c optional ipfilter inet - netinet/ip_fw.c optional ipfirewall - netinet/ip_icmp.c optional inet - netinet/ip_input.c optional inet -*************** -*** 355,361 **** - pci/pci.c optional pci device-driver - pci/pci_compat.c optional pci - pci/pcisupport.c optional pci -- pci/tek390.c optional amd device-driver - pci/wdc_p.c optional wdc device-driver - scsi/cd.c optional cd - scsi/ch.c optional ch ---- 373,378 ---- +--- files.orig Sun Apr 12 15:20:45 1998 ++++ files Sun Apr 12 19:15:10 1998 +@@ -54,6 +54,14 @@ + dev/ppbus/pps.c optional pps + dev/ppbus/vpo.c optional vpo + dev/vn/vn.c optional vn ++bisdn/b_isdntel.c optional ispy device-driver ++bisdn/b_isdntel.c optional itel device-driver ++bisdn/b_isdntty.c optional ity device-driver ++bisdn/b_isdnipi.c optional ipi device-driver ++bisdn/b_isdnipp.c optional ipp device-driver ++bisdn/b_isdn.c optional isdn device-driver ++bisdn/b_isdnlap.c optional disdn device-driver ++bisdn/b_disdn.c optional disdn device-driver + dev/vx/if_vx.c optional vx device-driver + gnu/ext2fs/ext2_alloc.c optional ext2fs + gnu/ext2fs/ext2_balloc.c optional ext2fs +@@ -196,6 +204,7 @@ + net/bpf.c optional bpfilter + net/bpf_filter.c optional bpfilter + net/bsd_comp.c optional ppp_bsdcomp ++net/bsd_comp.c optional ipp + #net/hostcache.c standard + net/if.c standard + net/if_atmsubr.c optional atm +@@ -206,12 +215,14 @@ + net/if_media.c standard + net/if_mib.c standard + net/if_ppp.c optional ppp ++net/if_ppp.c optional ipp + net/if_sl.c optional sl + net/if_spppsubr.c optional sppp + net/if_tun.c optional tun + net/if_vlan.c optional vlan + net/ppp_deflate.c optional ppp_deflate + net/ppp_tty.c optional ppp ++net/ppp_tty.c optional ipp + net/radix.c standard + net/raw_cb.c standard + net/raw_usrreq.c standard +@@ -219,6 +230,8 @@ + net/rtsock.c standard + net/slcompress.c optional ppp + net/slcompress.c optional sl ++net/slcompress.c optional ipp ++net/slcompress.c optional ipi + net/zlib.c optional ppp_deflate + netatalk/aarp.c optional netatalk + netatalk/at_control.c optional netatalk +@@ -229,6 +242,11 @@ + netatalk/ddp_usrreq.c optional netatalk + #netccitt/ccitt_proto.c optional ccitt + #netccitt/hd_debug.c optional hdlc ++netinet/ip_fil.c optional ipfilter inet ++netinet/fil.c optional ipfilter inet ++netinet/ip_nat.c optional ipfilter inet ++netinet/ip_frag.c optional ipfilter inet ++netinet/ip_state.c optional ipfilter inet + #netccitt/hd_input.c optional hdlc + #netccitt/hd_output.c optional hdlc + #netccitt/hd_subr.c optional hdlc diff -r -u ../bisdntest.orig/sys-bisdn/b_disdn.c ./sys-bisdn/b_disdn.c --- ../bisdntest.orig/sys-bisdn/b_disdn.c Tue Oct 7 23:31:29 1997 +++ ./sys-bisdn/b_disdn.c Sun Apr 12 20:02:42 1998 @@ -725,7 +725,11 @@ ctrl->appl = an; cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); ctrl->lastact = ltime.tv_sec; @@ -835,7 +839,11 @@ int cs; cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); ctrl->lastact = ltime.tv_sec; @@ -926,7 +934,11 @@ int cs; cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); ctrl->lastact = ltime.tv_sec; @@ -1361,7 +1373,11 @@ ctrl = &isdn_ctrl[msg->ctrl]; cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); ctrl->lastact = ltime.tv_sec; @@ -1499,7 +1515,11 @@ ctrl = &isdn_ctrl[msg->ctrl]; cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); ctrl->lastact = ltime.tv_sec; @@ -1892,7 +1912,11 @@ return(0); cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); ctrl->lastact = ltime.tv_sec; @@ -2213,7 +2237,11 @@ if(sc->sc_tei == 0xff) { cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); for(i=0; i < 16 ; i++, sc->sc_ri++) @@ -2277,7 +2305,11 @@ return; cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); m->m_len = 8; diff -r -u ../bisdntest.orig/sys-bisdn/b_isdn.c ./sys-bisdn/b_isdn.c --- ../bisdntest.orig/sys-bisdn/b_isdn.c Wed Oct 8 00:34:27 1997 +++ ./sys-bisdn/b_isdn.c Sun Apr 12 20:02:42 1998 @@ -98,6 +98,9 @@ #include #include #include +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 +#include +#endif #if BSD > 199306 && defined(DEVFS) #include @@ -783,7 +786,11 @@ { isdn_timeout = 1; cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(<ime); +#else ltime = time; +#endif splx(cs); #ifdef TO_DEBUG /* if (to_debug) */ @@ -835,7 +842,11 @@ (*appl->Connect) (appl->drivno); cs = splclock(); +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + isdn_ctrl[cn].call_start = time_second; +#else isdn_ctrl[cn].call_start = time.tv_sec; +#endif splx (cs); if((isdn_timeout == 0) && appl->idle_time) diff -r -u ../bisdntest.orig/sys-bisdn/b_isdnipi.c ./sys-bisdn/b_isdnipi.c --- ../bisdntest.orig/sys-bisdn/b_isdnipi.c Tue Oct 7 23:31:29 1997 +++ ./sys-bisdn/b_isdnipi.c Sun Apr 12 20:02:42 1998 @@ -101,6 +101,10 @@ * *---------------------------------------------------------------------------*/ +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 +#include "opt_inet.h" +#endif + #ifdef INET #include "ipi.h" @@ -111,6 +115,11 @@ #include #include #include + +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 +#include +#endif + #if BSD > 199306 && defined (__FreeBSD__) #include #include @@ -663,7 +672,11 @@ #endif /* IPI_VJ */ +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(&sc->sc_if.if_lastchange); +#else sc->sc_if.if_lastchange = time; +#endif x = splimp(); @@ -803,7 +816,11 @@ m->m_pkthdr.rcvif = &sc->sc_if; m->m_pkthdr.len = m->m_len; +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(&sc->sc_if.if_lastchange); +#else sc->sc_if.if_lastchange = time; +#endif #ifdef IPI_VJ sc->sc_cinb += m->m_pkthdr.len; diff -r -u ../bisdntest.orig/sys-bisdn/b_isdnlap.c ./sys-bisdn/b_isdnlap.c --- ../bisdntest.orig/sys-bisdn/b_isdnlap.c Tue Oct 7 23:31:29 1997 +++ ./sys-bisdn/b_isdnlap.c Sun Apr 12 20:02:42 1998 @@ -507,7 +507,11 @@ { /* Start round trip timer */ hd->rtt_seq = (hd->vs-1) & hd->mmask; +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(&hd->rtt_time); +#else hd->rtt_time = time; +#endif hd->flags.rtt_run = 1; } return 1; @@ -653,6 +657,15 @@ timediff(struct timeval *t1) { long t; + struct timeval tv; + getmicrotime(&tv); + +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + t= (tv.tv_usec - t1->tv_usec) / 1000; + return(t + (tv.tv_sec - t1->tv_sec)*1000); +#else t= (time.tv_usec - t1->tv_usec) / 1000; return(t + (time.tv_sec - t1->tv_sec)*1000); +#endif + } diff -r -u ../bisdntest.orig/sys-bisdn/b_isdntel.c ./sys-bisdn/b_isdntel.c --- ../bisdntest.orig/sys-bisdn/b_isdntel.c Sat Apr 5 14:43:42 1997 +++ ./sys-bisdn/b_isdntel.c Sun Apr 12 20:02:42 1998 @@ -170,7 +170,12 @@ { m->m_data[0]= out; *(u_long *) &m->m_data[1]= ispyabscnt++; + +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(&*(struct timeval *) &m->m_data[5]); +#else *(struct timeval *) &m->m_data[5]= time; +#endif } IS_ENQUEUE(&i_q[no],m); -- balu@dva.in-berlin.de Boris Staeblow To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Sun Apr 12 12:42:39 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id MAA22159 for freebsd-isdn-outgoing; Sun, 12 Apr 1998 12:42:39 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from critter.freebsd.dk (critter.freebsd.dk [195.8.129.14]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id MAA22152 for ; Sun, 12 Apr 1998 12:42:35 -0700 (PDT) (envelope-from phk@critter.freebsd.dk) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.8.7/8.8.5) with ESMTP id VAA17690; Sun, 12 Apr 1998 21:41:34 +0200 (CEST) To: balu@dva.in-berlin.de (Boris Staeblow) cc: freebsd-isdn@FreeBSD.ORG Subject: Re: diff for BISDNTEST3 and latest FreeBSD-current! In-reply-to: Your message of "Sun, 12 Apr 1998 20:50:21 +0200." Date: Sun, 12 Apr 1998 21:41:34 +0200 Message-ID: <17688.892410094@critter.freebsd.dk> From: Poul-Henning Kamp Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org In message , Boris Staeblow writes: > >Because of the recent time-changes in FreeBSD-current i've spend some >hours to make bisdntest-3 work and compile with the latest current. It looks ok to me, I have not tested it. -- Poul-Henning Kamp FreeBSD coreteam member phk@FreeBSD.ORG "Real hackers run -current on their laptop." "Drink MONO-tonic, it goes down but it will NEVER come back up!" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Mon Apr 13 01:26:04 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id BAA02539 for freebsd-isdn-outgoing; Mon, 13 Apr 1998 01:26:04 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from linteuto.teuto.de (linteuto.teuto.de [194.77.23.26]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id BAA02523 for ; Mon, 13 Apr 1998 01:26:01 -0700 (PDT) (envelope-from martin@rumolt.teuto.de) Received: from rumolt.teuto.de (root@rumolt.teuto.de [194.77.23.161]) by linteuto.teuto.de (8.8.8/8.8.8) with ESMTP id KAA09284; Mon, 13 Apr 1998 10:25:57 +0200 Received: (from martin@localhost) by rumolt.teuto.de (8.8.8/8.8.7) id KAA01197; Mon, 13 Apr 1998 10:14:15 +0200 (MEST) From: Martin Husemann Message-Id: <199804130814.KAA01197@rumolt.teuto.de> Subject: Re: Callback To: blaz@gold.amis.net (Blaz Zupan) Date: Mon, 13 Apr 1998 10:14:15 +0200 (MEST) Cc: freebsd-isdn@FreeBSD.ORG In-Reply-To: from "Blaz Zupan" at Apr 12, 98 01:01:25 pm Organization: Crusaders Catering Services Inc. X-Mailer: ELM [version 2.4 PL24] MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org > Is my assumption correct, does i4b callback only work with setups where > the remote end returns a busy on the dialin? Yes - otherwise you'll pay for the connection, at least here in Germany. Most routers support two kind of callbacks - the one that i4b supports means: the called system rejects (so no charge for this connection), waits a configurable time and the calls back. Information on who has called and who is to be called back relies on the ISDN calling party number information and stuff statically configured in the routers (or isnd's) configuration. The other type of callback (not supported by i4b right now) means: the called system accepts the connection and starts ppp negotiation. During this the ppp's aggree to do a callback. Information on who called in and who is going to be called back is subject to the authentication/negotiation already done by the two ppp's. Then ppp closes down, the connection is disconnected and the called system calls back. I've never seen someone actually use the second type due to its obvious disadvantages. It may be usefull if you travel, call in from an unknown number and want to be called back at that number. Martin To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Mon Apr 13 02:20:35 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id CAA11712 for freebsd-isdn-outgoing; Mon, 13 Apr 1998 02:20:35 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from server.amis.net (server.amis.net [195.10.52.10]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id CAA11651 for ; Mon, 13 Apr 1998 02:20:29 -0700 (PDT) (envelope-from blaz@gold.amis.net) Received: (from uucp@localhost) by server.amis.net (8.8.8/8.8.8) with UUCP id LAA09678; Mon, 13 Apr 1998 11:20:07 +0200 (CEST) Received: from localhost (blaz@localhost) by gold.amis.net (8.8.8/8.8.8) with SMTP id LAA00436; Mon, 13 Apr 1998 11:15:30 +0200 (CEST) Date: Mon, 13 Apr 1998 11:15:29 +0200 (CEST) From: Blaz Zupan To: Martin Husemann cc: freebsd-isdn@FreeBSD.ORG Subject: Re: Callback In-Reply-To: <199804130814.KAA01197@rumolt.teuto.de> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org > Yes - otherwise you'll pay for the connection, at least here in Germany. Yes I know, same thing here in slovenia. > I've never seen someone actually use the second type due to its obvious > disadvantages. It may be usefull if you travel, call in from an unknown > number and want to be called back at that number. I *have* to use the second type of callback because the remote end (a Livingston PM3) does not yet support D-channel-type callback (i.e. the one that is free for the caller). I was using a callback setup with bisdn without any problems so I just tried "porting" my configuration to i4b but failed for obvious reasons. Oh well, there are two possibilities right now, I will first try to bug Livingston to finally implement D-channel callback and then I'll go and hack i4b to make it support the other type of callback that I was using with bisdn (if I don't get lost in the i4b source :). Blaz Zupan, blaz@medinet.si, http://home.amis.net/blaz Medinet d.o.o., Linhartova 21, 2000 Maribor, Slovenia To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Mon Apr 13 13:27:14 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id NAA10254 for freebsd-isdn-outgoing; Mon, 13 Apr 1998 13:27:14 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from zippo.unna.ping.de (zippo.unna.ping.de [193.100.14.18]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id UAA10203 for ; Mon, 13 Apr 1998 20:27:06 GMT (envelope-from oskar@zippo.unna.ping.de) Received: from zippo.unna.ping.de (oskar@localhost [127.0.0.1]) by zippo.unna.ping.de (8.8.4/8.8.7) with ESMTP id WAA07547; Mon, 13 Apr 1998 22:25:23 +0200 (CEST) Message-Id: <199804132025.WAA07547@zippo.unna.ping.de> X-Mailer: exmh version 2.0gamma 1/24/97 To: Martin Husemann Cc: blaz@gold.amis.net (Blaz Zupan), freebsd-isdn@FreeBSD.ORG From: Jan-Hinrich Fessel Subject: Re: Callback In-Reply-To: Deine Nachricht vom Mon, 13 Apr 98 10:14:15 +0200. <199804130814.KAA01197@rumolt.teuto.de> X-Face: 'NlN?Dkb1WA4Fdbh(T&Okll'P?h$Ak1{5,LHx<2=v@!qg.G~6G?;]y`C/D#x5"GWN_.U4PA >rlR=V&h576tqk7-~tfGVVtZrybdmaG|iki>{4Kd&ra/d$&vleXP;y/Z"?4Q|$q?{T}SW]_bUHZmcH &C1^iA\&{>h66//IRsKzy[+f}l-:wc6T\Eg,Xc={E8Q\q"AqsV!!YG*/_fMcSlUw0pZ6j!KBMSTzz" Wd}uG:Zv#)gV?IGi^^fW0<`sO2D_MKP]gzx_\o%m<|~^+U>tu,)`*OJ]3n&@!K Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==_Exmh_-1359883924P"; micalg=pgp-md5; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit Date: Mon, 13 Apr 1998 22:24:50 +0200 Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org --==_Exmh_-1359883924P Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit In message <199804130814.KAA01197@rumolt.teuto.de>you write: > I've never seen someone actually use the second type due to its obvious > disadvantages. It may be usefull if you travel, call in from an unknown Cisco added support for the immiediate callback only recently, before every one calling a cisco had to use PPP-callback. Livingston still not supports it, and ascend, I don't know. Gruesse Oskar ============================================================================== Tragbar ist, was nicht herunterfaellt. oskar@zappa.unna.ping.de ============================================================================== --==_Exmh_-1359883924P Content-Type: application/pgp-signature -----BEGIN PGP MESSAGE----- Version: 2.6.3i iQCVAwUBNTJ0krA63tqjeAhZAQHa1AP+NOrDYAsJ/LfTvVWBGy4dGUYAOxMr4084 4LXI29UN+I8qqctnPNF609YysZbDKZHSCmdQiQTCrL3U/RIdYjVGNf1FPbNJJiCo Xb0eowQcWZFtUJ5XsasfHYDmbK6XwzbzQweywyMawCYIL4/MCgpA7JGD45qFI/lB bSNCp9KauzU= =GiaQ -----END PGP MESSAGE----- --==_Exmh_-1359883924P-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Tue Apr 14 07:44:26 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id HAA24438 for freebsd-isdn-outgoing; Tue, 14 Apr 1998 07:44:26 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from hcshh.hcs.de (hcshh.hcs.de [194.123.40.1]) by hub.freebsd.org (8.8.8/8.8.8) with SMTP id OAA24433 for ; Tue, 14 Apr 1998 14:44:24 GMT (envelope-from hm@hcs.de) Received: from hcswork.hcs.de([192.76.124.5]) (1484 bytes) by hcshh.hcs.de via sendmail with P:smtp/R:inet_hosts/T:smtp (sender: ) id for ; Tue, 14 Apr 1998 16:44:06 +0200 (METDST) (Smail-3.2.0.97 1997-Aug-19 #16 built 1997-Oct-22) Received: by hcswork.hcs.de (Smail3.1.29.0 #12) id m0yP6y2-00000UC; Tue, 14 Apr 98 16:45 METDST Message-Id: From: hm@hcs.de (Hellmuth Michaelis) Subject: Re: bisdn patches for -current via new mkbisdnktree script In-Reply-To: <19980412130659.38280@klemm.gtn.com> from Andreas Klemm at "Apr 12, 98 01:06:59 pm" To: andreas@klemm.gtn.com (Andreas Klemm) Date: Tue, 14 Apr 1998 16:45:46 +0200 (METDST) Cc: FreeBSD-ISDN@FreeBSD.ORG Reply-To: hm@hcs.de Organization: HCS Hanseatischer Computerservice GmbH X-Mailer: ELM [version 2.4ME+ PL39 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >From the keyboard of Andreas Klemm: > Just for the case, that there is still demand to run bisdn Ahhhh - now i know why there is no feedback for the multi-number features in i4b that where especially written in looong nights for someone mentioning this lack of features in bisdn all the time .... ;-) hellmuth -- Hellmuth Michaelis Tel +49 40 559747-70 HCS Hanseatischer Computerservice GmbH Fax +49 40 559747-77 Oldesloer Strasse 97-99 Mail hm@hcs.de 22457 Hamburg WWW http://www.hcs.de To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Tue Apr 14 08:05:54 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id IAA29444 for freebsd-isdn-outgoing; Tue, 14 Apr 1998 08:05:54 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from sun-test.hightek.com ([194.74.141.100]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id PAA29411 for ; Tue, 14 Apr 1998 15:05:49 GMT (envelope-from andreas@klemm2.hightek.com) Received: from klemm2.hightek.com ([195.90.203.76]) by sun-test.hightek.com (Netscape Mail Server v1.1) with ESMTP id AAA11872; Tue, 14 Apr 1998 17:07:08 +0200 Received: (from andreas@localhost) by klemm2.hightek.com (8.8.8/8.8.8) id RAA02316; Tue, 14 Apr 1998 17:05:42 +0200 (CEST) (envelope-from andreas) Message-ID: <19980414170542.30422@hightek.com> Date: Tue, 14 Apr 1998 17:05:42 +0200 From: Andreas Klemm To: hm@hcs.de Cc: FreeBSD-ISDN@FreeBSD.ORG Subject: Re: bisdn patches for -current via new mkbisdnktree script References: <19980412130659.38280@klemm.gtn.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 0.89.1i In-Reply-To: ; from Hellmuth Michaelis on Tue, Apr 14, 1998 at 04:45:46PM +0200 X-Operating-System: FreeBSD 2.2.6-STABLE Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org On Tue, Apr 14, 1998 at 04:45:46PM +0200, Hellmuth Michaelis wrote: > >From the keyboard of Andreas Klemm: > > > Just for the case, that there is still demand to run bisdn > > Ahhhh - now i know why there is no feedback for the multi-number features > in i4b that where especially written in looong nights for someone mentioning > this lack of features in bisdn all the time .... ;-) Umpf. Now you got me ;-) New job, less time for testing, sorry. 1 time I tried, but was completely unsuccessfull and had no time for this afterwards. I'm really sorry. Andreas /// -- B&K Gruppe - Wuppertal phone +49 202 7399 - 170 fax +49 202 7399 - 100 http://www.FreeBSD.ORG/~andreas/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Wed Apr 15 05:47:22 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id FAA16797 for freebsd-isdn-outgoing; Wed, 15 Apr 1998 05:47:22 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from hyper.huygens.org (hyper.huygens.org [130.89.181.103]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id MAA16792 for ; Wed, 15 Apr 1998 12:47:20 GMT (envelope-from dillema@huygens.org) Received: from hyper.huygens.org (localhost [127.0.0.1]) by hyper.huygens.org (8.8.7/8.8.7) with ESMTP id OAA14070; Wed, 15 Apr 1998 14:47:18 +0200 Message-Id: <199804151247.OAA14070@hyper.huygens.org> X-Mailer: exmh version 2.0zeta 7/24/97 To: FreeBSD-ISDN@FreeBSD.ORG cc: dillema@huygens.org Subject: i4b on NetBSD-1.3.1... From: Feico Dillema Reply-To: dillema@huygens.org X-Organisation: University of Twente, The Netherlands Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 15 Apr 1998 14:47:18 +0200 Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Hello everybody, I made a first attempt to test i4b on NetBSD. It looks quite a bit improved over bisdn. Thanks to the authors for a job well done so far. I got i4b without much setup trouble to run on NetBSD-1.3.1 (thought some of you might be interested in this little fact). After a few days of operation, however, I noticed some strange things which may or may not be due to i4b. I ftp-ed i4b last week, so I think I have the latest version. It runs on an Intel machine with a Teles 16.3 card running NetBSD-1.3.1 + i4b. Mystery case: I have 2 analog phones on a A/B converter each with its own MSN. A friend of mine reported not being able to call one of them, while having no problems with the other. Others didn't seem to have problems calling this MSN. These problems were reported over time intervals my i4b machine was switched on (probably without an isdnd actually running at the time). When I got the last problem report, I halted my machine and he was able to call the problematic tel. number again (so it looks these things are correlated). I haven't made a serious attempt to track the problem down yet. Mainly as I can hardly imagine how i4b and the telephone interfere, and then only for one of the tel. numbers. Can one of you tell me whether I must be halicinating or paranoid or that there's a bug to track down. Maybe related observation made: I get lots of `Illegal State' messages when voice calls are in progress. I'll see if I can get a sample of these later this week and send them to the list, as I would like some support in analyzing the (still rather obscure to me) debugging messages. Note, that data traffic with sppp and i4b just seems to work like a charm. (even after the Illegal State messages, so i4b seems to recover pretty well) greetings, Feico Dillema -I do not have a problem with my last name. -University of Twente, P.O. Box 217, 7500 AE Enschede, The Netherlands To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Wed Apr 15 12:02:22 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id MAA12720 for freebsd-isdn-outgoing; Wed, 15 Apr 1998 12:02:22 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from casparc.ppp.net (mail.ppp.net [194.64.12.35]) by hub.freebsd.org (8.8.8/8.8.8) with SMTP id TAA12701 for ; Wed, 15 Apr 1998 19:02:13 GMT (envelope-from ernie!bert.kts.org!hm@ppp.net) Received: from ernie by casparc.ppp.net with uucp (Smail3.1.28.1 #1) id m0yPXRi-00299AC; Wed, 15 Apr 98 21:02 MET DST Received: from bert.kts.org(really [194.55.156.2]) by ernie.kts.org via sendmail with smtp id for ; Wed, 15 Apr 1998 20:11:30 +0200 (CEST) (Smail-3.2.0.91 1997-Jan-14 #3 built 1998-Feb-14) Received: by bert.kts.org via sendmail with stdio id for FreeBSD-ISDN@FreeBSD.ORG; Wed, 15 Apr 1998 20:08:19 +0200 (CEST) (Smail-3.2.0.94 1997-Apr-22 #7 built 1997-Jul-4) Message-Id: From: hm@kts.org (Hellmuth Michaelis) Subject: Re: i4b on NetBSD-1.3.1... In-Reply-To: <199804151247.OAA14070@hyper.huygens.org> from Feico Dillema at "Apr 15, 98 02:47:18 pm" To: dillema@huygens.org Date: Wed, 15 Apr 1998 20:08:19 +0200 (CEST) Cc: FreeBSD-ISDN@FreeBSD.ORG Organization: Kitchen Table Systems Reply-To: hm@kts.org X-Mailer: ELM [version 2.4ME+ PL31H (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Feico Dillema wrote: > I have 2 analog phones on a A/B converter each with its own MSN. A friend > of mine reported not being able to call one of them, while having no > problems with the other. [...] > I haven't made a serious attempt to track the problem down yet. Mainly as > I can hardly imagine how i4b and the telephone interfere, and then only for > one of the tel. numbers. Can one of you tell me whether I must be > halicinating or paranoid or that there's a bug to track down. There might be a bug to track down. Unplug the A/B converter from the S0 bus, wait a minute and plug it back into the bus. If the problem still exists, all i can suggest is to either get a D-channel tracer or setup a second i4b machine with 2 passive cards to run isdntrace in analyze mode and get a trace of what happenes and start to debug. hellmuth -- Hellmuth Michaelis hm@kts.org Hamburg, Europe "Those who can, do. Those who can't, talk. And those who can't talk, talk about talking." (B. Shaw) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Sat Apr 18 11:32:21 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id LAA06775 for freebsd-isdn-outgoing; Sat, 18 Apr 1998 11:32:21 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from casparc.ppp.net (mail.ppp.net [194.64.12.35]) by hub.freebsd.org (8.8.8/8.8.8) with SMTP id SAA06763 for ; Sat, 18 Apr 1998 18:32:10 GMT (envelope-from ernie!bert.kts.org!hm@ppp.net) Received: from ernie by casparc.ppp.net with uucp (Smail3.1.28.1 #1) id m0yQcPD-00297dC; Sat, 18 Apr 98 20:32 MET DST Received: from bert.kts.org(really [194.55.156.2]) by ernie.kts.org via sendmail with smtp id for ; Sat, 18 Apr 1998 20:17:47 +0200 (CEST) (Smail-3.2.0.91 1997-Jan-14 #3 built 1998-Feb-14) Received: by bert.kts.org via sendmail with stdio id for freebsd-isdn@freebsd.org; Sat, 18 Apr 1998 20:14:40 +0200 (CEST) (Smail-3.2.0.94 1997-Apr-22 #7 built 1997-Jul-4) Message-Id: From: hm@kts.org (Hellmuth Michaelis) Subject: FYI: IRQ 10 problems Teles S0/16 To: freebsd-isdn@FreeBSD.ORG (ISDN for BSD) Date: Sat, 18 Apr 1998 20:14:40 +0200 (CEST) Organization: Kitchen Table Systems Reply-To: hm@kts.org X-Mailer: ELM [version 2.4ME+ PL31H (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Just to let you know: i just replaced a Creatix PnP Card which ran fine on IRQ 10 with a Teles S0/16 configured at IRQ 10 for testing purposes. The Teles was not able to interrupt at all configured at IRQ 10 ! Exchanging the IRQ with an active card, so the Teles got IRQ 9 and the other card got IRQ 10 solved the problem. hellmuth -- Hellmuth Michaelis hm@kts.org Hamburg, Europe "Those who can, do. Those who can't, talk. And those who can't talk, talk about talking." (B. Shaw) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Sat Apr 18 14:59:01 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id OAA10236 for freebsd-isdn-outgoing; Sat, 18 Apr 1998 14:59:01 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from rvc1.informatik.ba-stuttgart.de (rvc1.informatik.ba-stuttgart.de [141.31.112.22]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id VAA10211 for ; Sat, 18 Apr 1998 21:58:50 GMT (envelope-from helbig@Informatik.BA-Stuttgart.DE) Received: (from helbig@localhost) by rvc1.informatik.ba-stuttgart.de (8.8.8/8.8.5) id XAA01345; Sat, 18 Apr 1998 23:57:39 +0200 (MET DST) From: Wolfgang Helbig Message-Id: <199804182157.XAA01345@rvc1.informatik.ba-stuttgart.de> Subject: Re: first ICMP reply In-Reply-To: from Hellmuth Michaelis at "Apr 11, 98 04:04:03 pm" To: hm@hcs.de Date: Sat, 18 Apr 1998 23:57:38 +0200 (MET DST) Cc: FreeBSD-ISDN@FreeBSD.ORG (FreeBSD ISDN mailinglist) X-Mailer: ELM [version 2.4ME+ PL30 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org > >From the keyboard of Wolfgang Helbig: > > > For whatever reason, if doing a ping -c1 via a raw IP interface, > > the ICMP reply is not received. > > I do receive a reply with a ping -c1 and 0.51. And i'd like to know > the reason why you don't ;-) So did I. It only happened with the CREATIX-Card (IOM-1, HSCX is SAB 82525N) The transmit FIFO turned out not to be ready, even if the XPF-interrupt is indicated, as opposed to the specs. The following diff against i4b-00.51 is a workaround for this: This patch also unifies some more IOM-1 and IOM-2 HSCX-init and again includes the FreeBSD-current ,,time changes''. But the really important part is the new line isic_hscx_waitxfw(sc, h_chan); just before HSCX_WRFIFO(h_chan, chan->out_mbuf_cur_ptr, nextlen); in isic_hscx_irq(). I measured up to 2 ms waiting time in isic_hscx_waitx. Wolfgang --- /home/helbig/src/i4b/layer1/i4b_hscx.c Thu Mar 12 10:38:52 1998 +++ layer1/i4b_hscx.c Sat Apr 18 22:48:12 1998 @@ -214,7 +214,11 @@ hdr.type = (h_chan == HSCX_CH_A ? TRC_CH_B1 : TRC_CH_B2); hdr.dir = FROM_NT; hdr.count = ++sc->sc_trace_bcount; +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(&hdr.time); +#else hdr.time = time; +#endif MPH_Trace_Ind(&hdr, chan->in_mbuf->m_len, chan->in_mbuf->m_data); } @@ -288,7 +292,11 @@ hdr.type = (h_chan == HSCX_CH_A ? TRC_CH_B1 : TRC_CH_B2); hdr.dir = FROM_NT; hdr.count = ++sc->sc_trace_bcount; +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(&hdr.time); +#else hdr.time = time; +#endif MPH_Trace_Ind(&hdr, chan->in_mbuf->m_len, chan->in_mbuf->m_data); } @@ -371,7 +379,11 @@ hdr.type = (h_chan == HSCX_CH_A ? TRC_CH_B1 : TRC_CH_B2); hdr.dir = FROM_TE; hdr.count = ++sc->sc_trace_bcount; +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(&hdr.time); +#else hdr.time = time; +#endif MPH_Trace_Ind(&hdr, chan->out_mbuf_cur->m_len, chan->out_mbuf_cur->m_data); } @@ -391,7 +403,6 @@ while(chan->out_mbuf_cur && len != HSCX_FIFO_LEN) { - DBGL1(L1_H_IRQ, "isic_hscx_irq", ("out_mbuf_cur_len: %d\n", chan->out_mbuf_cur_len)); nextlen = min(chan->out_mbuf_cur_len, HSCX_FIFO_LEN - len); #ifdef NOTDEF @@ -404,6 +415,7 @@ next_len); #endif + isic_hscx_waitxfw(sc, h_chan); HSCX_WRFIFO(h_chan, chan->out_mbuf_cur_ptr, nextlen); cmd |= HSCX_CMDR_XTF; @@ -427,7 +439,11 @@ hdr.type = (h_chan == HSCX_CH_A ? TRC_CH_B1 : TRC_CH_B2); hdr.dir = FROM_TE; hdr.count = ++sc->sc_trace_bcount; +#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + getmicrotime(&hdr.time); +#else hdr.time = time; +#endif MPH_Trace_Ind(&hdr, chan->out_mbuf_cur->m_len, chan->out_mbuf_cur->m_data); } } @@ -474,14 +490,6 @@ HSCX_CCR1_CM2 | /* clock mode 5 */ HSCX_CCR1_CM0); - /* XAD1: Transmit Address Byte 1 */ - HSCX_WRITE(h_chan, H_XAD1, 0xff); /* fully transparent setup */ - - /* XAD2: Transmit Address Byte 2 */ - HSCX_WRITE(h_chan, H_XAD2, 0xff); /* fully transparent setup */ - - /* RAH2: Receive Address Byte High Reg. 2 */ - HSCX_WRITE(h_chan, H_RAH2, 0xff); /* fully transparent setup */ /* XBCH: reset Transmit Byte Count High */ HSCX_WRITE(h_chan, H_XBCH, 0x00); @@ -550,8 +558,6 @@ } else /* IOM 1 setup */ { - /* MASK */ - HSCX_WRITE(h_chan, H_MASK, 0xff); /* CCR1: Power Up, Clock Mode 1 */ HSCX_WRITE(h_chan, H_CCR1, HSCX_CCR1_PU | /* power up */ @@ -585,9 +591,6 @@ /* Raw Telephony, extended transparent mode 1 */ /* fully transparent, no framing, bitstuffing, CRC */ - HSCX_WRITE(h_chan, H_XAD1, 0xff); /* XAD1 */ - HSCX_WRITE(h_chan, H_XAD2, 0xff); /* XAD2 */ - HSCX_WRITE(h_chan, H_RAH2, 0xff); /* RAH2 */ HSCX_WRITE(h_chan, H_MODE, HSCX_MODE_MDS1|HSCX_MODE_MDS0|HSCX_MODE_ADM|HSCX_MODE_RTS); HSCX_WRITE(h_chan, H_CCR1, HSCX_CCR1_PU|HSCX_CCR1_CM0); /* CCR1 */ } @@ -595,6 +598,15 @@ /* common IOM-1 and IOM-2 setup */ + /* XAD1: Transmit Address Byte 1 */ + HSCX_WRITE(h_chan, H_XAD1, 0xff); /* fully transparent setup */ + + /* XAD2: Transmit Address Byte 2 */ + HSCX_WRITE(h_chan, H_XAD2, 0xff); /* fully transparent setup */ + + /* RAH2: Receive Address Byte High Reg. 2 */ + HSCX_WRITE(h_chan, H_RAH2, 0xff); /* fully transparent setup */ + isic_hscx_cmd(sc, h_chan, HSCX_CMDR_RHR|HSCX_CMDR_XRES); /* don't touch ICA, EXA and EXB bits, this could be HSCX_CH_B */ @@ -685,7 +697,8 @@ if(timeout == 0) { DBGL1(L1_H_ERR, "isic_hscx_waitxfw", ("HSCX wait for XFW timeout!\n")) - } + } else if (timeout != 200) + DBGL1(L1_H_ERR, "isic_hscx_waitxfw", ("timeout: %d\n", timeout)) } #endif /* NISIC > 0 */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Sat Apr 18 18:16:18 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id SAA16380 for freebsd-isdn-outgoing; Sat, 18 Apr 1998 18:16:18 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from mailc.telia.com (root@mailc.telia.com [194.22.190.4]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id BAA16374 for ; Sun, 19 Apr 1998 01:16:14 GMT (envelope-from Arve.Ronning@ah.telia.no) Received: from d1o203.telia.com (root@d1o203.telia.com [195.204.220.241]) by mailc.telia.com (8.8.8/8.8.8) with ESMTP id DAA03827; Sun, 19 Apr 1998 03:15:59 +0200 (MET DST) Received: from DxCC.home.no (t5o201p40.telia.com [195.204.217.40]) by d1o203.telia.com (8.8.5/8.6.12) with SMTP id DAA26028; Sun, 19 Apr 1998 03:15:52 +0200 (MET DST) Message-ID: <35395006.41C67EA6@ah.telia.no> Date: Sun, 19 Apr 1998 03:14:46 +0200 From: Arve Ronning X-Mailer: Mozilla 3.03Gold (X11; I; FreeBSD 2.2.5-RELEASE i386) MIME-Version: 1.0 To: hm@kts.org CC: ISDN for BSD Subject: Re: FYI: IRQ 10 problems Teles S0/16 References: Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Hellmuth Michaelis wrote: > > The Teles was not able to interrupt at all configured at IRQ 10 ! > This is the entry in my kernel config file : options "TEL_S0_16_3" device isic0 at isa? port 0xd80 net irq 10 flags 0x04 vector isicintr and I'm sending this mail through that Teles S0/16.3 card, ie it works ! Regards -Arve To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message From owner-freebsd-isdn Sat Apr 18 23:02:10 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id XAA20027 for freebsd-isdn-outgoing; Sat, 18 Apr 1998 23:02:10 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from casparc.ppp.net (mail.ppp.net [194.64.12.35]) by hub.freebsd.org (8.8.8/8.8.8) with SMTP id GAA20021 for ; Sun, 19 Apr 1998 06:02:06 GMT (envelope-from ernie!bert.kts.org!hm@ppp.net) Received: from ernie by casparc.ppp.net with uucp (Smail3.1.28.1 #1) id m0yQnAx-00297kC; Sun, 19 Apr 98 08:02 MET DST Received: from bert.kts.org(really [194.55.156.2]) by ernie.kts.org via sendmail with smtp id for ; Sun, 19 Apr 1998 07:22:13 +0200 (CEST) (Smail-3.2.0.91 1997-Jan-14 #3 built 1998-Feb-14) Received: by bert.kts.org via sendmail with stdio id for freebsd-isdn@freebsd.org; Sun, 19 Apr 1998 07:19:07 +0200 (CEST) (Smail-3.2.0.94 1997-Apr-22 #7 built 1997-Jul-4) Message-Id: From: hm@kts.org (Hellmuth Michaelis) Subject: Re: FYI: IRQ 10 problems Teles S0/16 In-Reply-To: <19980419030339.53956@follo.net> from Eivind Eklund at "Apr 19, 98 03:03:39 am" To: freebsd-isdn@FreeBSD.ORG (ISDN for BSD) Date: Sun, 19 Apr 1998 07:19:07 +0200 (CEST) Organization: Kitchen Table Systems Reply-To: hm@kts.org X-Mailer: ELM [version 2.4ME+ PL31H (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Eivind Eklund wrote: > > i just replaced a Creatix PnP Card which ran fine on IRQ 10 with a Teles S0/16 > > configured at IRQ 10 for testing purposes. > > > > The Teles was not able to interrupt at all configured at IRQ 10 ! > > IRQ 10 worked for me the last time I tested it. I'll try to test > again on monday (but I'm fairly hard pressed workwise, so I may not > have time). Yes, you are probably right because i have other hardware in which a S0/16 works at IRQ 10. It seems to be a hardware problem (of the S0/16) where one card in a given motherboard is able to drive IRQ 10 whereas another card is not. hellmuth -- Hellmuth Michaelis hm@kts.org Hamburg, Europe "Those who can, do. Those who can't, talk. And those who can't talk, talk about talking." (B. Shaw) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message