From owner-freebsd-current  Wed May  7 00:21:34 1997
Return-Path: <owner-current>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id AAA07410
          for current-outgoing; Wed, 7 May 1997 00:21:34 -0700 (PDT)
Received: from sax.sax.de (sax.sax.de [193.175.26.33])
          by hub.freebsd.org (8.8.5/8.8.5) with SMTP id AAA07394
          for <current@FreeBSD.ORG>; Wed, 7 May 1997 00:21:31 -0700 (PDT)
Received: (from uucp@localhost) by sax.sax.de (8.6.12/8.6.12-s1) with UUCP id JAA23191; Wed, 7 May 1997 09:21:29 +0200
Received: (from j@localhost)
	by uriah.heep.sax.de (8.8.5/8.8.5) id JAA18277;
	Wed, 7 May 1997 09:07:51 +0200 (MET DST)
Message-ID: <19970507090750.KE29190@uriah.heep.sax.de>
Date: Wed, 7 May 1997 09:07:50 +0200
From: j@uriah.heep.sax.de (J Wunsch)
To: current@FreeBSD.ORG
Cc: paulo@isr.uc.pt (Paulo Menezes)
Subject: Re: Worm problems
References: <Pine.BSF.3.95.970506220106.573A-100000@lapa.isr.uc.pt>
X-Mailer: Mutt 0.60_p2-3,5,8-9
Mime-Version: 1.0
X-Phone: +49-351-2012 669
X-PGP-Fingerprint: DC 47 E6 E4 FF A6 E9 8F  93 21 E0 7D F9 12 D6 4E
Reply-To: joerg_wunsch@uriah.heep.sax.de (Joerg Wunsch)
In-Reply-To: <Pine.BSF.3.95.970506220106.573A-100000@lapa.isr.uc.pt>; from Paulo Menezes on May 6, 1997 22:04:10 +0100
Sender: owner-current@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

As Paulo Menezes wrote:

> ../../scsi/worm.c: In function `worm_ioctl':
> ../../scsi/worm.c:769: `CDIOREADTOCENTRY' undeclared (first use this
> function)

Umm, sorry.  That's what i've got for working on different branches...

Apply this patch, please.  I'll commit it to the tree ASAP.

Index: /sys/sys/cdio.h
===================================================================
RCS file: /home/cvs/src/sys/sys/cdio.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -u -r1.16 -r1.17
--- cdio.h	1997/02/22 09:44:53	1.16
+++ cdio.h	1997/05/04 15:24:23	1.17
@@ -158,6 +158,14 @@
 #define CDIOREADTOCENTRYS _IOWR('c',5,struct ioc_read_toc_entry)
 
 
+struct ioc_read_toc_single_entry {
+	u_char	address_format;
+	u_char	track;
+	struct  cd_toc_entry entry;
+};
+#define CDIOREADTOCENTRY _IOWR('c',6,struct ioc_read_toc_single_entry)
+
+
 struct	ioc_patch
 {
 	u_char	patch[4];	/* one for each channel */

-- 
cheers, J"org

joerg_wunsch@uriah.heep.sax.de -- http://www.sax.de/~joerg/ -- NIC: JW11-RIPE
Never trust an operating system you don't have sources for. ;-)