Date: Wed, 28 Nov 2001 15:26:17 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Mike Smith <msmith@freebsd.org> Cc: current@FreeBSD.ORG, (Nickolay Dudorov) <nnd@mail.nsk.ru>, Warner Losh <imp@harmony.village.org> Subject: Re: cvs commit: src/sys/conf files src/sys/dev/ciss ciss.c cissi Message-ID: <XFMail.011128152617.jhb@FreeBSD.org> In-Reply-To: <200111282301.fASN1iA04620@mass.dis.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <jhb@FreeBSD.org> <>< 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?XFMail.011128152617.jhb>