From b24f9df7ec3ec16be1cd52c9189217ab9af11311 Mon Sep 17 00:00:00 2001
From: Constantine Sapuntzakis <csapuntz@cvs.openbsd.org>
Date: Tue, 24 Aug 1999 01:20:23 +0000
Subject: Added type field to scsi_addr to reflect bus/device type (ATAPI or
 SCSI). Updated ioctls to match

Minor patches in anticipation of wd->sd translation layer
---
 sys/scsi/sd.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'sys/scsi/sd.c')

diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index b1c8cb3fa3b..f2dcaffee9c 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.39 1999/08/10 23:09:49 deraadt Exp $	*/
+/*	$OpenBSD: sd.c,v 1.40 1999/08/24 01:20:22 csapuntz Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*-
@@ -184,7 +184,8 @@ sdattach(parent, self, aux)
 
 	dk_establish(&sd->sc_dk, &sd->sc_dev);
 
-	if (sc_link->flags & SDEV_ATAPI) {
+	if (sc_link->flags & SDEV_ATAPI &&
+	    (sc_link->flags & SDEV_REMOVABLE)) {
 		sd->sc_ops = &sd_atapibus_ops;
 	} else {
 		sd->sc_ops = &sd_scsibus_ops;
@@ -772,6 +773,7 @@ sdioctl(dev, cmd, addr, flag, p)
 		case DIOCLOCK:
 		case DIOCEJECT:
 		case SCIOCIDENTIFY:
+		case OSCIOCIDENTIFY:
 		case SCIOCCOMMAND:
 		case SCIOCDEBUG:
 			if (part == RAW_PART)
-- 
cgit v1.2.3