From owner-freebsd-isdn Thu Jun 25 14:23:56 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id OAA29060 for freebsd-isdn-outgoing; Thu, 25 Jun 1998 14:23:56 -0700 (PDT) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from news1.gtn.com (news1.gtn.com [192.109.159.3]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id OAA29031 for ; Thu, 25 Jun 1998 14:23:25 -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 XAA22644; Thu, 25 Jun 1998 23:15:09 +0200 (MET DST) Received: (from andreas@localhost) by klemm.gtn.com (8.8.8/8.8.8) id XAA16314; Thu, 25 Jun 1998 23:08:30 +0200 (CEST) (envelope-from andreas) Message-ID: <19980625230830.A15937@klemm.gtn.com> Date: Thu, 25 Jun 1998 23:08:30 +0200 From: Andreas Klemm To: isdn@FreeBSD.ORG Cc: hm@hcs.de Subject: i4b 0.62 - diffs for -current Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 0.91.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 Hi ! Here my diffs, to get i4b 0.62 running on -current of "today-1". ---%--- snip ---%--- snip ---%--- snip ---%--- snip ---%--- snip --- i4b/driver/i4b_ctl.c.orig Thu Jun 25 19:54:31 1998 +++ i4b/driver/i4b_ctl.c Thu Jun 25 19:55:38 1998 @@ -57,6 +57,7 @@ #include #if defined(__FreeBSD__) && __FreeBSD__ >= 3 #include +#include #else #include #endif @@ -190,7 +191,11 @@ * i4bctlioctl - device driver ioctl routine *---------------------------------------------------------------------------*/ PDEVSTATIC int +#if defined (__FreeBSD_version) && __FreeBSD_version >= 300003 +i4bctlioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) +#else i4bctlioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) +#endif { ctl_debug_t *cdbg; int error = 0; --- i4b/driver/i4b_tel.c.orig Thu Jun 25 19:52:06 1998 +++ i4b/driver/i4b_tel.c Thu Jun 25 19:53:57 1998 @@ -259,7 +259,11 @@ * i4btelioctl - device driver ioctl routine *---------------------------------------------------------------------------*/ PDEVSTATIC int +#if defined (__FreeBSD_version) && __FreeBSD_version >= 300003 +i4btelioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) +#else i4btelioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) +#endif { int error = 0; tel_sc_t *sc = &tel_sc[minor(dev)]; --- i4b/driver/i4b_trace.c.orig Thu Jun 25 19:50:49 1998 +++ i4b/driver/i4b_trace.c Thu Jun 25 19:51:48 1998 @@ -410,7 +410,11 @@ * device driver ioctl routine *---------------------------------------------------------------------------*/ PDEVSTATIC int +#if defined (__FreeBSD_version) && __FreeBSD_version >= 300003 +i4btrcioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) +#else i4btrcioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) +#endif { int error = 0; int unit = minor(dev); --- i4b/layer4/i4b_i4bdrv.c.orig Thu Jun 25 19:56:32 1998 +++ i4b/layer4/i4b_i4bdrv.c Thu Jun 25 19:57:12 1998 @@ -248,7 +248,11 @@ * i4bioctl - device driver ioctl routine *---------------------------------------------------------------------------*/ PDEVSTATIC int +#if defined (__FreeBSD_version) && __FreeBSD_version >= 300003 +i4bioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) +#else i4bioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) +#endif { call_desc_t *cd; int error = 0; --- sys/i386/isa/isa_device.h.orig Thu Jun 25 20:26:18 1998 +++ sys/i386/isa/isa_device.h Thu Jun 25 20:27:08 1998 @@ -155,6 +155,7 @@ inthand2_t feintr; inthand2_t gusintr; inthand2_t ieintr; +inthand2_t isicintr; inthand2_t labpcintr; inthand2_t le_intr; inthand2_t lncintr; ---%--- snap ---%--- snap ---%--- snap ---%--- snap ---%--- snap -- 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 "NT = Not Today" (Maggie Biggs) ``powered by FreeBSD SMP'' To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message