diff options
| -rw-r--r-- | sys/dev/usb/umass.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/umass_quirks.c | 12 | ||||
| -rw-r--r-- | sys/dev/usb/umass_scsi.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/usb_port.h | 8 |
4 files changed, 12 insertions, 19 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 78a15580153..da2c83f13e0 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass.c,v 1.49 2007/06/10 14:49:01 mbalmer Exp $ */ +/* $OpenBSD: umass.c,v 1.50 2007/06/13 10:33:52 mbalmer Exp $ */ /* $NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $ */ /* @@ -601,8 +601,7 @@ umass_attach(struct device *parent, struct device *self, void *aux) #if (NATAPIBUS > 0) || (NATAPISCSI > 0) error = umass_atapi_attach(sc); #else - printf("%s: "UMASS_ATAPISTR" not configured\n", - sc->sc_dev.dv_xname); + printf("%s: atapiscsi not configured\n", sc->sc_dev.dv_xname); #endif break; diff --git a/sys/dev/usb/umass_quirks.c b/sys/dev/usb/umass_quirks.c index fb7682c0026..54df233b3fb 100644 --- a/sys/dev/usb/umass_quirks.c +++ b/sys/dev/usb/umass_quirks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass_quirks.c,v 1.28 2007/06/10 14:49:01 mbalmer Exp $ */ +/* $OpenBSD: umass_quirks.c,v 1.29 2007/06/13 10:33:52 mbalmer Exp $ */ /* $NetBSD: umass_quirks.c,v 1.67 2004/06/28 07:49:16 mycroft Exp $ */ /* @@ -86,7 +86,7 @@ const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100 }, UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, 0, - PQUIRK_NOSENSE, + ADEV_NOSENSE, UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO, NULL, NULL }, @@ -102,7 +102,7 @@ const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_HP, USB_PRODUCT_HP_CDWRITERPLUS }, UMASS_WPROTO_CBI, UMASS_CPROTO_ATAPI, 0, - PQUIRK_NOSENSE, + ADEV_NOSENSE, UMATCH_VENDOR_PRODUCT, NULL, NULL }, @@ -188,7 +188,7 @@ const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_1XX }, UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, 0, - PQUIRK_ONLYBIG, + SDEV_ONLYBIG, UMATCH_VENDOR_PRODUCT, NULL, NULL }, @@ -284,7 +284,7 @@ const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C700 }, UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, 0, - PQUIRK_ONLYBIG | SDEV_NOSYNCCACHE, + SDEV_ONLYBIG | SDEV_NOSYNCCACHE, UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO, NULL, NULL }, @@ -364,7 +364,7 @@ const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB }, UMASS_WPROTO_CBI_I, UMASS_CPROTO_ATAPI, 0, - PQUIRK_NOSENSE, + ADEV_NOSENSE, UMATCH_VENDOR_PRODUCT, umass_init_shuttle, NULL }, diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c index a8b0be85a16..2c0aa077089 100644 --- a/sys/dev/usb/umass_scsi.c +++ b/sys/dev/usb/umass_scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass_scsi.c,v 1.17 2007/06/10 14:49:01 mbalmer Exp $ */ +/* $OpenBSD: umass_scsi.c,v 1.18 2007/06/13 10:33:52 mbalmer Exp $ */ /* $NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -170,7 +170,7 @@ umass_scsi_setup(struct umass_softc *sc) scbus->sc_link.adapter = &scbus->sc_adapter; scbus->sc_link.adapter_softc = sc; scbus->sc_link.openings = 1; - scbus->sc_link.quirks |= PQUIRK_ONLYBIG | sc->sc_busquirks; + scbus->sc_link.quirks |= SDEV_ONLYBIG | sc->sc_busquirks; return (scbus); } @@ -329,7 +329,7 @@ umass_scsi_cb(struct umass_softc *sc, void *priv, int residue, int status) case STATUS_CMD_UNKNOWN: DPRINTF(UDMASS_CMD, ("umass_scsi_cb: status cmd unknown\n")); /* we can't issue REQUEST SENSE */ - if (xs->sc_link->quirks & PQUIRK_NOSENSE) { + if (xs->sc_link->quirks & ADEV_NOSENSE) { /* * If no residue and no other USB error, * command succeeded. diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index 275615cc801..ff7c3187f76 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_port.h,v 1.87 2007/06/13 10:10:30 mbalmer Exp $ */ +/* $OpenBSD: usb_port.h,v 1.88 2007/06/13 10:33:52 mbalmer Exp $ */ /* $NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -54,12 +54,6 @@ #undef USB_USE_SOFTINTR #endif -#define UMASS_ATAPISTR "atapiscsi" - -/* periph_quirks */ -#define PQUIRK_NOSENSE ADEV_NOSENSE /* can't REQUEST SENSE */ -#define PQUIRK_ONLYBIG SDEV_ONLYBIG - #define UCOMBUSCF_PORTNO 0 #define UCOMBUSCF_PORTNO_DEFAULT -1 #define UHIDBUSCF_REPORTID 0 |