From owner-freebsd-current Wed Nov 28 15:26:30 2001 Delivered-To: freebsd-current@freebsd.org Received: from mail5.speakeasy.net (mail5.speakeasy.net [216.254.0.205]) by hub.freebsd.org (Postfix) with ESMTP id 09A5737B419 for ; Wed, 28 Nov 2001 15:26:21 -0800 (PST) Received: (qmail 13386 invoked from network); 28 Nov 2001 23:26:20 -0000 Received: from unknown (HELO laptop.baldwin.cx) ([64.81.54.73]) (envelope-sender ) by mail5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 28 Nov 2001 23:26:20 -0000 Message-ID: X-Mailer: XFMail 1.4.0 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200111282301.fASN1iA04620@mass.dis.org> Date: Wed, 28 Nov 2001 15:26:17 -0800 (PST) From: John Baldwin To: Mike Smith Subject: Re: cvs commit: src/sys/conf files src/sys/dev/ciss ciss.c cissi Cc: current@FreeBSD.ORG, (Nickolay Dudorov) , Warner Losh Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 28-Nov-01 Mike Smith wrote: >> In message <200111280657.fAS6v4F09881@wint.itfs.nsk.su> Nickolay Dudorov >> writ >> es: >> : And I can buildkernel only after the next patch: >> >> I just removed this from build until Mike can fix the ciss driver >> itself. > > Sorry about this; I got distracted last night, and my last -current > test build was too long ago. 8( I'll try to fix it tonight; in the > meantime, where's that hat? I've got a patch that I think will work for both 4.x and 5.0. It compiles on -current at least. It is at www.freebsd.org/~jhb/patches/ciss.patch and below (note, my mailer destroys patches, so the version below is just for viewing): Index: ciss.c =================================================================== RCS file: /usr/cvs/src/sys/dev/ciss/ciss.c,v retrieving revision 1.1 diff -u -r1.1 ciss.c --- ciss.c 27 Nov 2001 23:08:36 -0000 1.1 +++ ciss.c 28 Nov 2001 23:23:45 -0000 @@ -216,7 +216,7 @@ static struct cdevsw ciss_cdevsw = { ciss_open, ciss_close, noread, nowrite, ciss_ioctl, nopoll, nommap, nostrategy, "ciss", CISS_CDEV_MAJOR, - nodump, nopsize, 0, -1 + nodump, nopsize, 0, nokqfilter }; /************************************************************************ @@ -3210,7 +3210,7 @@ * Handle an open on the control device. */ static int -ciss_open(dev_t dev, int flags, int fmt, struct proc *p) +ciss_open(dev_t dev, int flags, int fmt, d_thread_t *p) { struct ciss_softc *sc; @@ -3228,7 +3228,7 @@ * Handle the last close on the control device. */ static int -ciss_close(dev_t dev, int flags, int fmt, struct proc *p) +ciss_close(dev_t dev, int flags, int fmt, d_thread_t *p) { struct ciss_softc *sc; @@ -3247,7 +3247,7 @@ * simplify the porting of Compaq's userland tools. */ static int -ciss_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p) +ciss_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, d_thread_t *p) { struct ciss_softc *sc; int error; -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message