| libusb10.c (302080) | libusb10.c (302125) |
|---|---|
| 1/* $FreeBSD: head/lib/libusb/libusb10.c 302080 2016-06-22 10:38:41Z hselasky $ */ | 1/* $FreeBSD: head/lib/libusb/libusb10.c 302125 2016-06-23 07:12:22Z hselasky $ */ |
| 2/*- 3 * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. 4 * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: 9 * 1. Redistributions of source code must retain the above copyright --- 1388 unchanged lines hidden (view full) --- 1398 default: 1399 goto failure; 1400 } 1401 1402 buffsize = libusb10_get_buffsize(pdev, uxfer); 1403 maxframe = libusb10_get_maxframe(pdev, uxfer); 1404 1405 /* make sure the transfer is opened */ | 2/*- 3 * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. 4 * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: 9 * 1. Redistributions of source code must retain the above copyright --- 1388 unchanged lines hidden (view full) --- 1398 default: 1399 goto failure; 1400 } 1401 1402 buffsize = libusb10_get_buffsize(pdev, uxfer); 1403 maxframe = libusb10_get_maxframe(pdev, uxfer); 1404 1405 /* make sure the transfer is opened */ |
| 1406 err = libusb20_tr_open(pxfer0, buffsize, maxframe, endpoint); | 1406 err = libusb20_tr_open_stream(pxfer0, buffsize, maxframe, 1407 endpoint, sxfer->stream_id); |
| 1407 if (err && (err != LIBUSB20_ERROR_BUSY)) { 1408 goto failure; 1409 } 1410 libusb20_tr_start(pxfer0); 1411 return; 1412 1413failure: 1414 libusb10_complete_transfer(pxfer0, sxfer, LIBUSB_TRANSFER_ERROR); --- 241 unchanged lines hidden --- | 1408 if (err && (err != LIBUSB20_ERROR_BUSY)) { 1409 goto failure; 1410 } 1411 libusb20_tr_start(pxfer0); 1412 return; 1413 1414failure: 1415 libusb10_complete_transfer(pxfer0, sxfer, LIBUSB_TRANSFER_ERROR); --- 241 unchanged lines hidden --- |