Deleted Added
full compact
usb_transfer.c (218475) usb_transfer.c (219100)
1/* $FreeBSD: head/sys/dev/usb/usb_transfer.c 218475 2011-02-09 08:01:45Z hselasky $ */
1/* $FreeBSD: head/sys/dev/usb/usb_transfer.c 219100 2011-02-28 17:23:15Z hselasky $ */
2/*-
3 * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.

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

466 break;
467 default:
468 frame_limit = USB_MAX_HS_ISOC_FRAMES_PER_XFER;
469 xfer->fps_shift = edesc->bInterval;
470 if (xfer->fps_shift > 0)
471 xfer->fps_shift--;
472 if (xfer->fps_shift > 3)
473 xfer->fps_shift = 3;
2/*-
3 * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.

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

466 break;
467 default:
468 frame_limit = USB_MAX_HS_ISOC_FRAMES_PER_XFER;
469 xfer->fps_shift = edesc->bInterval;
470 if (xfer->fps_shift > 0)
471 xfer->fps_shift--;
472 if (xfer->fps_shift > 3)
473 xfer->fps_shift = 3;
474 if (xfer->flags.pre_scale_frames != 0)
475 xfer->nframes <<= (3 - xfer->fps_shift);
474 break;
475 }
476
477 if (xfer->nframes > frame_limit) {
478 /*
479 * this is not going to work
480 * cross hardware
481 */

--- 2806 unchanged lines hidden ---
476 break;
477 }
478
479 if (xfer->nframes > frame_limit) {
480 /*
481 * this is not going to work
482 * cross hardware
483 */

--- 2806 unchanged lines hidden ---