Date: 01 Nov 2002 18:59:38 +0100 From: arno@heho.snv.jussieu.fr To: thomas@cuivre.fr.eu.org Cc: freebsd-stable@freebsd.org Subject: Re: SCSI emulation help and patching Message-ID: <wpadkt41dh.fsf@heho.snv.jussieu.fr> In-Reply-To: <20021031232242.GB13969@melusine.cuivre.fr.eu.org> References: <joe-dated-1036388286.4baa8e@dubium.com> <200210292136.40600.joe@dubium.com> <20021031005845.60B46114@CRWdog.demon.co.uk> <20021031232242.GB13969@melusine.cuivre.fr.eu.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Thomas,
> Le 2002-10-31, Andy Sparrow =E9crivait :
>=20
> > Yup, that's probably it. I just (re)patched my src tree after a fresh=20
> > cvsup, and this file fails to patch with atapicam-STABLE-config-2002082=
0.
> > diff. Here's sys/conf/files.rej:
>=20
> A patch is not needed anymore: I have MFCd ATAPI/CAM on the RELENG_4
> branch a few minutes ago.
thanx very much!
NB, I had to apply the following patch in order to compile
a kernel *without* ATAPICAM; I'm not 100% sure it's the
correct patch.
Have a nice weekend, Arno
Index: sys/dev/ata/ata-all.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/sys/dev/ata/ata-all.c,v
retrieving revision 1.50.2.41
diff -u -r1.50.2.41 ata-all.c
--- sys/dev/ata/ata-all.c 31 Oct 2002 23:10:33 -0000 1.50.2.41
+++ sys/dev/ata/ata-all.c 1 Nov 2002 17:50:12 -0000
@@ -595,7 +595,9 @@
#if NATAPICAM > 0
atapi_cam_attach_bus(ch);
#endif
+#if DEV_ATAPIALL
}
+#endif
splx(s);
}
--=20
Arno J. Klaassen
INSERM U483
UPMC, 9 quai St Bernard
75005 Paris, France
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?wpadkt41dh.fsf>