vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge Aleš' latest patch

Browse source
This commit is contained in:
Aleš Nesrsta 2010-06-01 02:10:19 +02:00 • committed by Vladimir 'phcoder' Serbinenko
parent 778ff32476
commit 7d4873c26a
8 changed files with 206 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bus/usb/usbtrans.c
View file

@ -213,6 +213,7 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
transfer->type = GRUB_USB_TRANSACTION_TYPE_BULK;
transfer->max = max;
transfer->dev = dev;
transfer->last_trans = -1; /* Reset index of last processed transaction (TD) */
/* Allocate an array of transfer data structures. */
transfer->transactions = grub_malloc (transfer->transcnt
@ -240,6 +241,13 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
}
err = dev->controller.dev->transfer (&dev->controller, transfer);
/* We must remember proper toggle value even if some transactions
* were not processed - correct value should be inversion of last
* processed transaction (TD). */
if (transfer->last_trans >= 0)
toggle = transfer->transactions[transfer->last_trans].toggle ? 0 : 1;
else
toggle = dev->toggle[endpoint]; /* Nothing done, take original */
grub_dprintf ("usb", "toggle=%d\n", toggle);
dev->toggle[endpoint] = toggle;