From owner-freebsd-isdn Thu Oct 29 03:22:08 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id DAA10958 for freebsd-isdn-outgoing; Thu, 29 Oct 1998 03:22:08 -0800 (PST) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from peedub.muc.de (newpc.muc.ditec.de [194.120.126.33]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id DAA10842 for ; Thu, 29 Oct 1998 03:21:55 -0800 (PST) (envelope-from garyj@peedub.muc.de) Received: from peedub.muc.de (localhost [127.0.0.1]) by peedub.muc.de (8.9.1/8.6.9) with ESMTP id MAA11578; Thu, 29 Oct 1998 12:09:22 +0100 (CET) Message-Id: <199810291109.MAA11578@peedub.muc.de> X-Mailer: exmh version 2.0.2 2/24/98 To: Alexander Leidinger cc: freebsd-isdn@FreeBSD.ORG Subject: Re: patch for i4b under 3.0-current? Reply-To: Gary Jennejohn In-reply-to: Your message of "Thu, 29 Oct 1998 10:44:26 +0100." <199810290944.KAA24156@wurzelausix.cs.uni-sb.de> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Date: Thu, 29 Oct 1998 12:09:22 +0100 From: Gary Jennejohn Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by hub.freebsd.org id DAA10922 Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Alexander Leidinger writes: >Hi, > >after a cvsup I noticed, that /sys/i386/isa/isa_device.h has changed in >an incompatible way for i4b, so I´m not able to compile a new kernel >with isdn support. >Unfortunaly I´m not familiar with the isdn sources, so I can´t do it >myself (I´ve looked how other devices do it, but I don´t know which >file of i4b to alter). > >Does someone have a patch ready, or is working on it? > the change is trivial. I just happen to have sent a patch for this to the developers list last week. Here's a patch relative to 0.63 (I assume you're all using that :) BTW you should delete the "vector isicintr" from your kernel config file (ONLY for a really current -current) since it's no longer required. Actually this might even work for older versions of -current, but I can't check that. --- i4b_isic.c.orig Thu Oct 29 11:56:47 1998 +++ i4b_isic.c Thu Oct 29 12:04:44 1998 @@ -97,10 +97,14 @@ #ifdef __FreeBSD__ -#if defined(__FreeBSD_version) && __FreeBSD_version >= 300003 +#if defined(__FreeBSD_version) && __FreeBSD_version == 300003 /* do nothing, isicintr is now declared in */ #else +#if defined(__FreeBSD_version) && __FreeBSD_version >= 300004 +ointhand2_t isicintr; +#else void isicintr ( int unit ); +#endif /* __FreeBSD_version >= 300004 */ #endif struct isa_driver isicdriver = { @@ -616,6 +620,10 @@ #ifdef __FreeBSD__ printf("(AddrA=0x%lx, AddrB=0x%lx)\n", (u_long)HSCX_A_BASE, (u_long)HSCX_B_BASE); +#endif + +#if defined(__FreeBSD_version) && __FreeBSD_version >= 300004 + dev->id_ointr = isicintr; #endif return(1); --- Gary Jennejohn Home - garyj@muc.de Work - garyj@fkr.dec.com To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message