*BSD News Article 50100


Return to BSD News archive

Path: euryale.cc.adfa.oz.au!newshost.anu.edu.au!harbinger.cc.monash.edu.au!simtel!pravda.aa.msen.com!spool.mu.edu!bloom-beacon.mit.edu!panix!news.mathworks.com!tank.news.pipex.net!pipex!news.sprintlink.net!in2.uu.net!demos!news.glas.apc.org!glas!vega
From: Vlad D. Nebolsin <vega@glas.apc.org>
Newsgroups: comp.unix.bsd.freebsd.misc
Subject: Re: IDE CDROM DRIVER BETA TEST?
Message-ID: <APC&63'0'18d7dd10'377@glas.apc.org>
References: <4126ro$991@uwm.edu>
Date: Mon, 28 Aug 1995 02:13:55 +0400
X-Gateway: notes@glas.apc.org
Lines: 63

I'm trying to patch my FreeBSD 2.0.5-R kernel and some system files for
support IDE CD-ROM (as Serge Vakulenko described in wcd11.tgz), but I have 
problems with conf.c file...

Does somebody be so kind to prompt me, why I've the next message and what
shall I do next (I'm afraid I need to change some major numbers, but I'm not 
a guru and know nothing about these major numbers):

>patch <conf.c.pch
>
>Hmm...  Looks like a unified diff to me...
>The text leading up to this was:
>--------------------------
>|--- conf20.c	Mon Jul  3 20:16:25 1995
>|+++ conf.c	Mon Jul  3 20:15:38 1995
>--------------------------
>Patching file conf.c using Plan A...
>Hunk #1 succeeded at 346 with fuzz 1 (offset 86 lines).
>Hunk #2 failed at 468.
>Hunk #3 failed at 1261.
>2 out of 3 hunks failed--saving rejects to conf.c.rej
>done

and this is conf.c.rej file:

>***************
>*** 468,473 ****
>  	  scddump,	scdsize,	0 },
>  	{ matcdopen,	matcdclose,	matcdstrategy,	matcdioctl,	/*17*/
>  	  matcddump,	matcdsize,	0 },
>  /*
>   * If you need a bdev major number for a driver that you intend to donate
>   * back to the group or release publically, please contact the FreeBSD team
>--- 481,488 ----
>  	  scddump,	scdsize,	0 },
>  	{ matcdopen,	matcdclose,	matcdstrategy,	matcdioctl,	/*17*/
>  	  matcddump,	matcdsize,	0 },
>+ 	{ wcdopen,	wcdclose,	wcdstrategy,	wcdioctl,	/*18*/
>+ 	  nxdump,	zerosize,	0 },
>  /*
>   * If you need a bdev major number for a driver that you intend to donate
>   * back to the group or release publically, please contact the FreeBSD team
>***************
>*** 1259,1264 ****
>  	  nxwrite, nxioctl, nxstop,				   /* Talisman*/
>  	  nxreset, nxdevtotty, nxselect,
>  	  nxmmap, NULL },
>  };
>  int	nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
>  
>--- 1274,1282 ----
>  	  nxwrite, nxioctl, nxstop,				   /* Talisman*/
>  	  nxreset, nxdevtotty, nxselect,
>  	  nxmmap, NULL },
>+ 	{ wcdopen,	wcdclose,	rawread,	nowrite,	/*64*/
>+ 	  wcdioctl,	nostop,		nullreset,	nodevtotty,/* atapi cd */
>+ 	  seltrue,	nommap,		wcdstrategy },
>  };
>  int	nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
>

Vlad.