Module Name: src
Committed By: jdolecek
Date: Mon Apr 13 09:26:43 UTC 2020
Modified Files:
src/sys/dev/usb: FILES files.usb umass.c umass_quirks.c
Removed Files:
src/sys/dev/usb: umass_isdata.c umass_isdata.h
Log Message:
remove obsolete support for ISD-ATA umass(4) adapters
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/FILES
cvs rdiff -u -r1.173 -r1.174 src/sys/dev/usb/files.usb
cvs rdiff -u -r1.183 -r1.184 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.44 -r0 src/sys/dev/usb/umass_isdata.c
cvs rdiff -u -r1.4 -r0 src/sys/dev/usb/umass_isdata.h
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/usb/umass_quirks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/FILES
diff -u src/sys/dev/usb/FILES:1.14 src/sys/dev/usb/FILES:1.15
--- src/sys/dev/usb/FILES:1.14 Wed Jan 29 18:39:04 2020
+++ src/sys/dev/usb/FILES Mon Apr 13 09:26:43 2020
@@ -45,8 +45,6 @@ ukbdmap.c wscons key mapping for ukbd
ukbdvar.h API for ukbd.c
ulpt.c USB printer class driver
umass.c USB mass storage wire protocol driver
-umass_isdata.c In-System Design ATA over bulk-only driver
-umass_isdata.h and definitions for it
umass_quirks.c Table of strange umass devices
umass_quirks.h and definitions for it
umass_scsipi.c umass command protocol driver
Index: src/sys/dev/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.173 src/sys/dev/usb/files.usb:1.174
--- src/sys/dev/usb/files.usb:1.173 Sun Apr 12 01:10:54 2020
+++ src/sys/dev/usb/files.usb Mon Apr 13 09:26:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.173 2020/04/12 01:10:54 simonb Exp $
+# $NetBSD: files.usb,v 1.174 2020/04/13 09:26:43 jdolecek Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -54,7 +54,6 @@ defflag opt_usb.h UHSO_DEBUG: USB_DEBUG
defflag opt_usb.h UIPAD_DEBUG: USB_DEBUG
defflag opt_usb.h UIPAQ_DEBUG: USB_DEBUG
defflag opt_usb.h UIRDA_DEBUG: USB_DEBUG
-defflag opt_usb.h UISDATA_DEBUG: USB_DEBUG
defflag opt_usb.h UKBD_DEBUG: USB_DEBUG
defflag opt_usb.h UKYOPON_DEBUG: USB_DEBUG
defflag opt_usb.h ULPT_DEBUG: USB_DEBUG
@@ -199,10 +198,9 @@ file dev/usb/ulpt.c ulpt needs-flag
# Mass storage
-device umass: scsi, atapi, ata_hl
+device umass: scsi, atapi
attach umass at usbifif
file dev/usb/umass.c umass
-file dev/usb/umass_isdata.c umass & wd & atabus
file dev/usb/umass_quirks.c umass
file dev/usb/umass_scsipi.c umass & (scsibus | atapibus)
Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.183 src/sys/dev/usb/umass.c:1.184
--- src/sys/dev/usb/umass.c:1.183 Sat Mar 14 03:01:36 2020
+++ src/sys/dev/usb/umass.c Mon Apr 13 09:26:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.183 2020/03/14 03:01:36 christos Exp $ */
+/* $NetBSD: umass.c,v 1.184 2020/04/13 09:26:43 jdolecek Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.183 2020/03/14 03:01:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.184 2020/04/13 09:26:43 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -132,7 +132,6 @@ __KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.
#include "atapibus.h"
#include "scsibus.h"
-#include "wd.h"
#include <sys/param.h>
#include <sys/buf.h>
@@ -153,7 +152,6 @@ __KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.
#include <dev/usb/umassvar.h>
#include <dev/usb/umass_quirks.h>
#include <dev/usb/umass_scsipi.h>
-#include <dev/usb/umass_isdata.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsipiconf.h>
@@ -814,14 +812,6 @@ umass_attach(device_t parent, device_t s
#endif
break;
- case UMASS_CPROTO_ISD_ATA:
-#if NWD > 0 && NATABUS > 0
- error = umass_isdata_attach(sc);
-#else
- aprint_error_dev(self, "isdata not configured\n");
-#endif
- break;
-
default:
aprint_error_dev(self, "command protocol=%#x not supported\n",
sc->sc_cmd);
@@ -918,14 +908,6 @@ umass_detach(device_t self, int flags)
#endif
break;
- case UMASS_CPROTO_ISD_ATA:
-#if NWD > 0
- umass_isdata_detach(sc);
-#else
- aprint_error_dev(self, "isdata not configured\n");
-#endif
- break;
-
default:
/* nothing to do */
break;
Index: src/sys/dev/usb/umass_quirks.c
diff -u src/sys/dev/usb/umass_quirks.c:1.100 src/sys/dev/usb/umass_quirks.c:1.101
--- src/sys/dev/usb/umass_quirks.c:1.100 Sat Oct 28 00:37:12 2017
+++ src/sys/dev/usb/umass_quirks.c Mon Apr 13 09:26:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_quirks.c,v 1.100 2017/10/28 00:37:12 pgoyette Exp $ */
+/* $NetBSD: umass_quirks.c,v 1.101 2020/04/13 09:26:43 jdolecek Exp $ */
/*
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.100 2017/10/28 00:37:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.101 2020/04/13 09:26:43 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -73,32 +73,6 @@ Static void umass_fixup_sony(struct umas
* - mycroft
*/
Static const struct umass_quirk umass_quirks[] = {
- /*
- * The following 3 In-System Design adapters use a non-standard ATA
- * over BBB protocol. Force this protocol by quirk entries.
- */
- { { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ADAPTERV2 },
- UMASS_WPROTO_BBB, UMASS_CPROTO_ISD_ATA,
- 0,
- 0,
- UMATCH_VENDOR_PRODUCT,
- NULL, NULL
- },
- { { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ATAPI },
- UMASS_WPROTO_BBB, UMASS_CPROTO_ISD_ATA,
- 0,
- 0,
- UMATCH_VENDOR_PRODUCT,
- NULL, NULL
- },
- { { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_DRIVEV2_5 },
- UMASS_WPROTO_BBB, UMASS_CPROTO_ISD_ATA,
- 0,
- 0,
- UMATCH_VENDOR_PRODUCT,
- NULL, NULL
- },
-
{ { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_USBCABLE },
UMASS_WPROTO_CBI, UMASS_CPROTO_ATAPI,
0,
