Unused after last scsi commit.

2 files changed, 0 insertions, 136 deletions

diff --git a/sys/scsi/atapi_all.h b/sys/scsi/atapi_all.h
deleted file mode 100644
index 9cccc3ea398..00000000000
--- a/sys/scsi/atapi_all.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$OpenBSD: atapi_all.h,v 1.3 2005/04/16 16:41:46 krw Exp $	*/
-/*	$NetBSD: atapi_all.h,v 1.3 1998/02/13 08:28:16 enami Exp $	*/
-
-/*
- * Copyright (c) 1996 Manuel Bouyer.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-struct scsi_link;
-
-int	atapi_mode_select(struct scsi_link *,
-	    struct scsi_mode_header_big *, int, int, int, int);
-int	atapi_mode_sense(struct scsi_link *, int,
-	    struct scsi_mode_header_big *, int, int, int, int);
diff --git a/sys/scsi/atapi_base.c b/sys/scsi/atapi_base.c
deleted file mode 100644
index b7cd9deb952..00000000000
--- a/sys/scsi/atapi_base.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$OpenBSD: atapi_base.c,v 1.3 2005/04/16 16:41:46 krw Exp $	*/
-/*	$NetBSD: atapi_base.c,v 1.12 1999/06/25 18:58:54 thorpej Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/buf.h>
-#include <sys/uio.h>
-#include <sys/malloc.h>
-#include <sys/errno.h>
-#include <sys/device.h>
-#include <sys/proc.h>
-
-#include <scsi/scsi_all.h>
-#include <scsi/atapi_all.h>
-#include <scsi/scsiconf.h>
-
-int
-atapi_mode_select(l, data, len, flags, retries, timeout)
-	struct scsi_link *l;
-	struct scsi_mode_header_big *data;
-	int len, flags, retries, timeout;
-{
-	struct scsi_mode_select_big scsi_cmd;
-	int error;
-
-	bzero(&scsi_cmd, sizeof(scsi_cmd));
-	scsi_cmd.opcode = MODE_SELECT_BIG;
-	scsi_cmd.byte2 = SMS_PF;
-	_lto2b(len, scsi_cmd.length);
-
-	/* length is reserved when doing mode select; zero it */
-	_lto2l(0, data->data_length);
-
-	error = scsi_scsi_cmd(l, (struct scsi_generic *)&scsi_cmd,
-	    sizeof(scsi_cmd), (void *)data, len, retries, timeout, NULL,
-	    flags | SCSI_DATA_OUT);
-	SC_DEBUG(l, SDEV_DB2, ("atapi_mode_select: error=%d\n", error));
-	return (error);
-}
-
-int
-atapi_mode_sense(l, page, data, len, flags, retries, timeout)
-	struct scsi_link *l;
-	int page, len, flags, retries, timeout;
-	struct scsi_mode_header_big *data;
-{
-	struct scsi_mode_sense_big scsi_cmd;
-	int error;
-
-	bzero(&scsi_cmd, sizeof(scsi_cmd));
-	scsi_cmd.opcode = MODE_SENSE_BIG;
-	scsi_cmd.page = page;
-	_lto2b(len, scsi_cmd.length);
-
-	error = scsi_scsi_cmd(l, (struct scsi_generic *)&scsi_cmd,
-	    sizeof(scsi_cmd), (void *)data, len, retries, timeout, NULL,
-	    flags | SCSI_DATA_IN);
-	SC_DEBUG(l, SDEV_DB2, ("atapi_mode_sense: error=%d\n", error));
-	return (error);
-}