From owner-freebsd-hackers Fri Dec 22 15:28:34 1995 Return-Path: owner-hackers Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id PAA26349 for hackers-outgoing; Fri, 22 Dec 1995 15:28:34 -0800 (PST) Received: from rmurphy.slip.bcm.tmc.edu (root@RMURPHY.SLIP.BCM.TMC.EDU [128.249.250.138]) by freefall.freebsd.org (8.7.3/8.7.3) with SMTP id PAA26343 Fri, 22 Dec 1995 15:28:26 -0800 (PST) Received: (from rich@localhost) by rmurphy.slip.bcm.tmc.edu (8.6.12/8.6.9) id RAA02541; Fri, 22 Dec 1995 17:28:19 -0600 Date: Fri, 22 Dec 1995 17:28:19 -0600 Message-Id: <199512222328.RAA02541@rmurphy.slip.bcm.tmc.edu> From: Rich Murphey To: jmb@freebsd.org CC: freebsd-hackers@freebsd.org, freebsd-scsi@freebsd.org, dufault@hda.com, bde@zeta.org.au, hm@altona.hamburg.com, se@mi.uni-koeln.de In-reply-to: (jmb@freebsd.org) Subject: Re: NAKAMICHI cdrom changer Reply-to: rich@lamprey.utmb.edu Sender: owner-hackers@freebsd.org Precedence: bulk I'm using the Nakamichi MBR-7 connected to an adaptek 1742. Julian E. suggested these chages. These are diffs v.s. the 2.1-current code. I still got a panic during this morning's sup which I'm still trying to debug. Rich diff -rub /sys/scsi/scsiconf.c ./scsiconf.c --- /sys/scsi/scsiconf.c Mon Oct 9 21:49:13 1995 +++ ./scsiconf.c Fri Dec 22 00:04:18 1995 @@ -276,6 +276,10 @@ "cd", SC_MORE_LUS }, { + T_READONLY, T_REMOV, "NRC", "MBR-7", "*", + "cd", SC_MORE_LUS + }, + { T_READONLY, T_REMOV, "CHINON", "CD-ROM CDS-535","*", "cd", SC_ONE_LU }, @@ -331,6 +335,10 @@ }, { T_READONLY, T_REMOV, "PIONEER", "CD-ROM DRM-602X" + ,"any", "cd", SC_MORE_LUS + }, + { + T_READONLY, T_REMOV, "NRC", "MBR-7" ,"any", "cd", SC_MORE_LUS }, { diff -rub /sys/scsi/cd.c ./cd.c --- /sys/scsi/cd.c Tue May 30 03:13:20 1995 +++ ./cd.c Fri Dec 22 00:02:51 1995 @@ -533,7 +533,7 @@ return; } cdqueues++; - if(cd->dkunit) { + if(cd->dkunit >= 0) { dk_xfer[cd->dkunit]++; dk_seek[cd->dkunit]++; /* don't know */ dk_wds[cd->dkunit] += bp->b_bcount >> 6;