Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update doc URLs and fix a typo in umass_bulk_get_max_lun().

Browse Source
This commit is contained in:
augustss 1999-09-09 17:12:03 +00:00
parent 1de19dc293
commit 6b9aae738e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/usb/umass.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: umass.c,v 1.13 1999/09/09 12:26:46 augustss Exp $ */ /* $NetBSD: umass.c,v 1.14 1999/09/09 17:12:03 augustss Exp $ */
/*- /*-
* Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -69,11 +69,11 @@
* Universal Serial Bus Mass Storage Class Control/Interrupt/Bulk (CBI) * Universal Serial Bus Mass Storage Class Control/Interrupt/Bulk (CBI)
* Specification: * Specification:
* *
* http://www.usb.org/developers/usbmass-cbi10.pdf * http://www.usb.org/developers/data/usbmass-cbi10.pdf
* *
* Universal Serial Bus Mass Storage Bulk Only 1.0rc4 Specification: * Universal Serial Bus Mass Storage Bulk Only 1.0rc4 Specification:
* *
* http://www.usb.org/developers/usbmassbulk_10rc4.pdf * http://www.usb.org/developers/data/usbmassbulk_10rc4.pdf
* *
* Relevant parts of the old spec (Bulk-only 0.9) have been quoted * Relevant parts of the old spec (Bulk-only 0.9) have been quoted
* in the source. * in the source.
@ -298,14 +298,14 @@ USB_ATTACH(umass)
err = usbd_open_pipe(sc->sc_iface, sc->sc_bulkout, err = usbd_open_pipe(sc->sc_iface, sc->sc_bulkout,
USBD_EXCLUSIVE_USE, &sc->sc_bulkout_pipe); USBD_EXCLUSIVE_USE, &sc->sc_bulkout_pipe);
if (err) { if (err) {
DPRINTF(UDMASS_USB, ("cannot open bulk out pipe (address %d)\n", DPRINTF(UDMASS_USB,("cannot open bulk out pipe (address %d)\n",
sc->sc_bulkout)); sc->sc_bulkout));
USB_ATTACH_ERROR_RETURN; USB_ATTACH_ERROR_RETURN;
} }
err = usbd_open_pipe(sc->sc_iface, sc->sc_bulkin, err = usbd_open_pipe(sc->sc_iface, sc->sc_bulkin,
USBD_EXCLUSIVE_USE, &sc->sc_bulkin_pipe); USBD_EXCLUSIVE_USE, &sc->sc_bulkin_pipe);
if (err) { if (err) {
DPRINTF(UDMASS_USB, ("cannot open bulk in pipe (address %d)\n", DPRINTF(UDMASS_USB,("cannot open bulk in pipe (address %d)\n",
sc->sc_bulkin)); sc->sc_bulkin));
usbd_close_pipe(sc->sc_bulkout_pipe); usbd_close_pipe(sc->sc_bulkout_pipe);
USB_ATTACH_ERROR_RETURN; USB_ATTACH_ERROR_RETURN;
@ -450,7 +450,7 @@ umass_bulk_get_max_lun(umass_softc_t *sc, u_int8_t *maxlun)
id = usbd_get_interface_descriptor(sc->sc_iface); id = usbd_get_interface_descriptor(sc->sc_iface);
/* The Get Max Lun command is a class-specific request. */ /* The Get Max Lun command is a class-specific request. */
req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bmRequestType = UT_READ_CLASS_INTERFACE;
req.bRequest = UR_GET_MAX_LUN; req.bRequest = UR_GET_MAX_LUN;
USETW(req.wValue, 0); USETW(req.wValue, 0);
USETW(req.wIndex, id->bInterfaceNumber); USETW(req.wIndex, id->bInterfaceNumber);
@ -478,6 +478,7 @@ umass_bulk_get_max_lun(umass_softc_t *sc, u_int8_t *maxlun)
printf("%s: Get Max Lun failed: %s\n", printf("%s: Get Max Lun failed: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err)); USBDEVNAME(sc->sc_dev), usbd_errstr(err));
/* XXX Should we port_reset the device? */ /* XXX Should we port_reset the device? */
break;
} }
return (err); return (err);