ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix kernel panics in fastboot on OS X." into kraken

Browse source
This commit is contained in:
Jeff Brown 2010-05-21 14:06:04 -07:00 • committed by Android (Google) Code Review
commit dc5942840e
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
fastboot/usb_osx.c
View file

@ -64,7 +64,7 @@ struct usb_handle
/** Try out all the interfaces and see if there's a match. Returns 0 on /** Try out all the interfaces and see if there's a match. Returns 0 on
* success, -1 on failure. */ * success, -1 on failure. */
static int try_interfaces(IOUSBDeviceInterface **dev, usb_handle *handle) { static int try_interfaces(IOUSBDeviceInterface182 **dev, usb_handle *handle) {
IOReturn kr; IOReturn kr;
IOUSBFindInterfaceRequest request; IOUSBFindInterfaceRequest request;
io_iterator_t iterator; io_iterator_t iterator;
@ -515,8 +515,29 @@ int usb_write(usb_handle *h, const void *data, int len) {
return -1; return -1;
} }
#if 0
result = (*h->interface)->WritePipe( result = (*h->interface)->WritePipe(
h->interface, h->bulkOut, (void *)data, len); h->interface, h->bulkOut, (void *)data, len);
#else
/* Attempt to work around crashes in the USB driver that may be caused
* by trying to write too much data at once. The kernel IOCopyMapper
* panics if a single iovmAlloc needs more than half of its mapper pages.
*/
const int maxLenToSend = 1048576; // 1 MiB
int lenRemaining = len;
result = 0;
while (lenRemaining > 0) {
int lenToSend = lenRemaining > maxLenToSend
? maxLenToSend : lenRemaining;
result = (*h->interface)->WritePipe(
h->interface, h->bulkOut, (void *)data, lenToSend);
if (result != 0) break;
lenRemaining -= lenToSend;
data = (const char*)data + lenToSend;
}
#endif
#if 0 #if 0
if ((result == 0) && (h->zero_mask)) { if ((result == 0) && (h->zero_mask)) {