Deleted Added
full compact
umass.c (213439) umass.c (213931)
1#include <sys/cdefs.h>
1#include <sys/cdefs.h>
2__FBSDID("$FreeBSD: head/sys/dev/usb/storage/umass.c 213439 2010-10-04 23:30:44Z hselasky $");
2__FBSDID("$FreeBSD: head/sys/dev/usb/storage/umass.c 213931 2010-10-16 19:29:37Z mav $");
3
4/*-
5 * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
6 * Nick Hibma <n_hibma@FreeBSD.org>
7 * All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions

--- 11 unchanged lines hidden (view full) ---

22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
3
4/*-
5 * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
6 * Nick Hibma <n_hibma@FreeBSD.org>
7 * All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions

--- 11 unchanged lines hidden (view full) ---

22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 *
30 * $FreeBSD: head/sys/dev/usb/storage/umass.c 213439 2010-10-04 23:30:44Z hselasky $
30 * $FreeBSD: head/sys/dev/usb/storage/umass.c 213931 2010-10-16 19:29:37Z mav $
31 * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
32 */
33
34/* Also already merged from NetBSD:
35 * $NetBSD: umass.c,v 1.67 2001/11/25 19:05:22 augustss Exp $
36 * $NetBSD: umass.c,v 1.90 2002/11/04 19:17:33 pooka Exp $
37 * $NetBSD: umass.c,v 1.108 2003/11/07 17:03:25 wiz Exp $
38 * $NetBSD: umass.c,v 1.109 2003/12/04 13:57:31 keihan Exp $

--- 2374 unchanged lines hidden (view full) ---

2413 if (sc->sc_quirks & FLOPPY_SPEED) {
2414 cpi->base_transfer_speed =
2415 UMASS_FLOPPY_TRANSFER_SPEED;
2416 } else {
2417 switch (usbd_get_speed(sc->sc_udev)) {
2418 case USB_SPEED_SUPER:
2419 cpi->base_transfer_speed =
2420 UMASS_SUPER_TRANSFER_SPEED;
31 * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
32 */
33
34/* Also already merged from NetBSD:
35 * $NetBSD: umass.c,v 1.67 2001/11/25 19:05:22 augustss Exp $
36 * $NetBSD: umass.c,v 1.90 2002/11/04 19:17:33 pooka Exp $
37 * $NetBSD: umass.c,v 1.108 2003/11/07 17:03:25 wiz Exp $
38 * $NetBSD: umass.c,v 1.109 2003/12/04 13:57:31 keihan Exp $

--- 2374 unchanged lines hidden (view full) ---

2413 if (sc->sc_quirks & FLOPPY_SPEED) {
2414 cpi->base_transfer_speed =
2415 UMASS_FLOPPY_TRANSFER_SPEED;
2416 } else {
2417 switch (usbd_get_speed(sc->sc_udev)) {
2418 case USB_SPEED_SUPER:
2419 cpi->base_transfer_speed =
2420 UMASS_SUPER_TRANSFER_SPEED;
2421 cpi->maxio = MAXPHYS;
2421 break;
2422 case USB_SPEED_HIGH:
2423 cpi->base_transfer_speed =
2424 UMASS_HIGH_TRANSFER_SPEED;
2425 break;
2426 default:
2427 cpi->base_transfer_speed =
2428 UMASS_FULL_TRANSFER_SPEED;

--- 680 unchanged lines hidden ---
2422 break;
2423 case USB_SPEED_HIGH:
2424 cpi->base_transfer_speed =
2425 UMASS_HIGH_TRANSFER_SPEED;
2426 break;
2427 default:
2428 cpi->base_transfer_speed =
2429 UMASS_FULL_TRANSFER_SPEED;

--- 680 unchanged lines hidden ---