Date: Fri, 19 Jun 1998 11:00:25 +0200 From: Gary Jennejohn <garyj@muc.de> To: freebsd-isdn@FreeBSD.ORG Subject: Diffs required for FreeBSD-current Message-ID: <199806190900.LAA05082@peedub.muc.de>
next in thread | raw e-mail | index | archive | help
changes in the way that interrupts are handled make the following
modifications necessary to compile using i4b. Note that the diff for
i4b_ctl.c may contain some already applied diffs (I sent out a diff
earlier which contained some of this stuff).
This compiles and links OK but I haven't done a reboot to test it out. You
need a really up-to-date -current for this !!!
*** /sys/i386/isa/isa_device.h.ctm Fri Jun 19 10:47:40 1998
--- /sys/i386/isa/isa_device.h Fri Jun 19 10:48:27 1998
***************
*** 143,148 ****
--- 143,149 ----
inthand2_t feintr;
inthand2_t gusintr;
inthand2_t ieintr;
+ inthand2_t isicintr;
inthand2_t labpcintr;
inthand2_t le_intr;
inthand2_t lncintr;
*** driver/i4b_ctl.c.orig Tue May 19 17:02:43 1998
--- driver/i4b_ctl.c Fri Jun 19 10:45:54 1998
***************
*** 57,62 ****
--- 57,63 ----
#include <sys/param.h>
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
#include <sys/ioccom.h>
+ #include <i386/isa/isa_device.h>
#else
#include <sys/ioctl.h>
#endif
***************
*** 190,196 ****
--- 191,201 ----
* 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;
*** layer1/i4b_isic.c.orig Fri Jun 19 10:49:43 1998
--- layer1/i4b_isic.c Fri Jun 19 10:52:07 1998
***************
*** 97,103 ****
--- 97,107 ----
#ifdef __FreeBSD__
+ #if defined(__FreeBSD_version) && __FreeBSD_version >= 300003
+ /* do nothing, isicintr is now declared in <i386/isa/isa_device.h> */
+ #else
void isicintr ( int unit );
+ #endif
struct isa_driver isicdriver = {
isicprobe,
--------
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199806190900.LAA05082>