diff options
author | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 1999-07-25 07:09:21 +0000 |
---|---|---|
committer | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 1999-07-25 07:09:21 +0000 |
commit | c5091939f49bf18ce06780a7e49c968611317f11 (patch) | |
tree | 14ea0ba2b7d637c18fe007d908ef0886d939202f /sys/dev/atapiscsi | |
parent | 7c82046e621c85d85b87aaa0519535530e5c9d83 (diff) |
Merge sd stuff from NetBSD-current. Helps with LS-120, ZIP
More SCSI logic from NetBSD-current
Some tape fixes. ATAPI tapes do not work yet for most operations.
Diffstat (limited to 'sys/dev/atapiscsi')
-rw-r--r-- | sys/dev/atapiscsi/atapiscsi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c index 26729d95d18..33ad7cda82e 100644 --- a/sys/dev/atapiscsi/atapiscsi.c +++ b/sys/dev/atapiscsi/atapiscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atapiscsi.c,v 1.7 1999/07/23 16:23:39 csapuntz Exp $ */ +/* $OpenBSD: atapiscsi.c,v 1.8 1999/07/25 07:09:19 csapuntz Exp $ */ /* * This code is derived from code with the copyright below. @@ -110,8 +110,6 @@ static void atapiscsi_attach __P((struct device *, struct device *, void *)); int wdc_atapi_get_params __P((struct atapiscsi_softc *, u_int8_t, int, struct ataparams *)); -#define XS_SHORTSENSE XS_SENSE -#define XS_RESET XS_DRIVER_STUFFUP #define ATAPI_TO_SCSI_SENSE(sc, atapi_error) \ (sc)->error_code = XS_SHORTSENSE; (sc)->flags = (atapi_error) >> 4; |