| OLD | NEW |
|---|
| 1 /** | 1 /** |
| 2 * \file libusb-glue.h | 2 * \file libusb-glue.h |
| 3 * Low-level USB interface glue towards libusb. | 3 * Low-level USB interface glue towards libusb. |
| 4 * | 4 * |
| 5 * Copyright (C) 2005-2007 Richard A. Low <richard@wentnet.com> | 5 * Copyright (C) 2005-2007 Richard A. Low <richard@wentnet.com> |
| 6 * Copyright (C) 2005-2011 Linus Walleij <triad@df.lth.se> | 6 * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se> |
| 7 * Copyright (C) 2006-2011 Marcus Meissner | 7 * Copyright (C) 2006-2011 Marcus Meissner |
| 8 * Copyright (C) 2007 Ted Bullock | 8 * Copyright (C) 2007 Ted Bullock |
| 9 * Copyright (C) 2008 Chris Bagwell <chris@cnpbagwell.com> | 9 * Copyright (C) 2008 Chris Bagwell <chris@cnpbagwell.com> |
| 10 * | 10 * |
| 11 * This library is free software; you can redistribute it and/or | 11 * This library is free software; you can redistribute it and/or |
| 12 * modify it under the terms of the GNU Lesser General Public | 12 * modify it under the terms of the GNU Lesser General Public |
| 13 * License as published by the Free Software Foundation; either | 13 * License as published by the Free Software Foundation; either |
| 14 * version 2 of the License, or (at your option) any later version. | 14 * version 2 of the License, or (at your option) any later version. |
| 15 * | 15 * |
| 16 * This library is distributed in the hope that it will be useful, | 16 * This library is distributed in the hope that it will be useful, |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 PTPParams *params; | 84 PTPParams *params; |
| 85 #ifdef HAVE_LIBUSB1 | 85 #ifdef HAVE_LIBUSB1 |
| 86 libusb_device_handle* handle; | 86 libusb_device_handle* handle; |
| 87 #endif | 87 #endif |
| 88 #ifdef HAVE_LIBUSB0 | 88 #ifdef HAVE_LIBUSB0 |
| 89 usb_dev_handle* handle; | 89 usb_dev_handle* handle; |
| 90 #endif | 90 #endif |
| 91 #ifdef HAVE_LIBOPENUSB | 91 #ifdef HAVE_LIBOPENUSB |
| 92 openusb_dev_handle_t* handle; | 92 openusb_dev_handle_t* handle; |
| 93 #endif | 93 #endif |
| 94 uint8_t config; |
| 94 uint8_t interface; | 95 uint8_t interface; |
| 96 uint8_t altsetting; |
| 95 int inep; | 97 int inep; |
| 96 int inep_maxpacket; | 98 int inep_maxpacket; |
| 97 int outep; | 99 int outep; |
| 98 int outep_maxpacket; | 100 int outep_maxpacket; |
| 99 int intep; | 101 int intep; |
| 100 /** File transfer callbacks and counters */ | 102 /** File transfer callbacks and counters */ |
| 101 int callback_active; | 103 int callback_active; |
| 102 int timeout; | 104 int timeout; |
| 103 uint16_t bcdusb; | 105 uint16_t bcdusb; |
| 104 uint64_t current_transfer_total; | 106 uint64_t current_transfer_total; |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 /* connect_first_device return codes */ | 174 /* connect_first_device return codes */ |
| 173 #define PTP_CD_RC_CONNECTED 0 | 175 #define PTP_CD_RC_CONNECTED 0 |
| 174 #define PTP_CD_RC_NO_DEVICES 1 | 176 #define PTP_CD_RC_NO_DEVICES 1 |
| 175 #define PTP_CD_RC_ERROR_CONNECTING 2 | 177 #define PTP_CD_RC_ERROR_CONNECTING 2 |
| 176 | 178 |
| 177 #ifdef __cplusplus | 179 #ifdef __cplusplus |
| 178 } | 180 } |
| 179 #endif /* __cplusplus */ | 181 #endif /* __cplusplus */ |
| 180 | 182 |
| 181 #endif // LIBUSB-GLUE_H | 183 #endif // LIBUSB-GLUE_H |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 11183017:
libmtp: Cherrypick upstream commit 15d18e31458be5006eb229df68869df2fff9 to fix device detection for… (Closed)
Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libmtp/