jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

USB: st_usbfs : fix USB_COUNTn_RX buffer size calculation:

Browse Source 
Fixes https://github.com/libopencm3/libopencm3/issues/476

Sets USB_COUNTn_RX reg fields : bits <14:10> are NUM_BLOCK; bit 15 is BL_SIZE.
 - When (size <= 62), BL_SIZE must be 0 and NUM_BLOCK set to (size / 2).
 - When (size > 62), BL_SIZE must be 1 and NUM_BLOCK=((size / 32) - 1).

Previous code improperly set NUM_BLOCK and assumed the requested size was set.
Now, we use the next largest legal buffer size. Examples:
size BL_SIZE NUM_BLOCK => Actual bufsize
0    0       0         ??? (illegal !)
1    0       1         2
63   1       1         64
Algo is valid for F102, F103 and F0 devices (USB_FS peripheral).
In addition, the new usb_set_ep_rx_bufsize() function returns the actual
size set.

Tested-by: Karl Palsson <karlp@tweak.net.au>
This commit is contained in:
fenugrec 2015-07-20 21:42:58 -04:00 committed by Karl Palsson
parent 144911a25b
commit 01f33f47b7
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/stm32/common/st_usbfs_core.c
View File

@ -41,22 +41,39 @@ void st_usbfs_set_address(usbd_device *dev, uint8_t addr)
* Set the receive buffer size for a given USB endpoint. * Set the receive buffer size for a given USB endpoint.
* *
* @param ep Index of endpoint to configure. * @param ep Index of endpoint to configure.
* @param size Size in bytes of the RX buffer. * @param size Size in bytes of the RX buffer. Legal sizes : {2,4,6...62}; {64,96,128...992}.
* @returns (uint16) Actual size set
*/ */
void st_usbfs_set_ep_rx_bufsize(usbd_device *dev, uint8_t ep, uint32_t size) uint16_t st_usbfs_set_ep_rx_bufsize(usbd_device *dev, uint8_t ep, uint32_t size)
{ {
uint16_t realsize;
(void)dev; (void)dev;
/*
* Writes USB_COUNTn_RX reg fields : bits <14:10> are NUM_BLOCK; bit 15 is BL_SIZE
* - When (size <= 62), BL_SIZE is set to 0 and NUM_BLOCK set to (size / 2).
* - When (size > 62), BL_SIZE is set to 1 and NUM_BLOCK=((size / 32) - 1).
*
* This algo rounds to the next largest legal buffer size, except 0. Examples:
* size => BL_SIZE, NUM_BLOCK => Actual bufsize
* 0 0 0 ??? "Not allowed" according to RM0091, RM0008
* 1 0 1 2
* 61 0 31 62
* 63 1 1 64
*/
if (size > 62) { if (size > 62) {
if (size & 0x1f) { /* Round up, div by 32 and sub 1 == (size + 31)/32 - 1 == (size-1)/32)*/
size -= 32; size = ((size - 1) >> 5) & 0x1F;
} realsize = (size + 1) << 5;
USB_SET_EP_RX_COUNT(ep, (size << 5) | 0x8000); /* Set BL_SIZE bit (no macro for this) */
size |= (1<<5);
} else { } else {
if (size & 1) { /* round up and div by 2 */
size++; size = (size + 1) >> 1;
} realsize = size << 1;
USB_SET_EP_RX_COUNT(ep, size << 10);
} }
/* write to the BL_SIZE and NUM_BLOCK fields */
USB_SET_EP_RX_COUNT(ep, size << 10);
return realsize;
} }
void st_usbfs_ep_setup(usbd_device *dev, uint8_t addr, uint8_t type, void st_usbfs_ep_setup(usbd_device *dev, uint8_t addr, uint8_t type,
@ -90,15 +107,16 @@ void st_usbfs_ep_setup(usbd_device *dev, uint8_t addr, uint8_t type,
} }
if (!dir) { if (!dir) {
uint16_t realsize;
USB_SET_EP_RX_ADDR(addr, dev->pm_top); USB_SET_EP_RX_ADDR(addr, dev->pm_top);
st_usbfs_set_ep_rx_bufsize(dev, addr, max_size); realsize = st_usbfs_set_ep_rx_bufsize(dev, addr, max_size);
if (callback) { if (callback) {
dev->user_callback_ctr[addr][USB_TRANSACTION_OUT] = dev->user_callback_ctr[addr][USB_TRANSACTION_OUT] =
(void *)callback; (void *)callback;
} }
USB_CLR_EP_RX_DTOG(addr); USB_CLR_EP_RX_DTOG(addr);
USB_SET_EP_RX_STAT(addr, USB_EP_RX_STAT_VALID); USB_SET_EP_RX_STAT(addr, USB_EP_RX_STAT_VALID);
dev->pm_top += max_size; dev->pm_top += realsize;
} }
} }

2
lib/stm32/common/st_usbfs_core.h
View File

@ -33,7 +33,7 @@
#define USBD_PM_TOP 0x40 #define USBD_PM_TOP 0x40
void st_usbfs_set_address(usbd_device *dev, uint8_t addr); void st_usbfs_set_address(usbd_device *dev, uint8_t addr);
void st_usbfs_set_ep_rx_bufsize(usbd_device *dev, uint8_t ep, uint32_t size); uint16_t st_usbfs_set_ep_rx_bufsize(usbd_device *dev, uint8_t ep, uint32_t size);
void st_usbfs_ep_setup(usbd_device *usbd_dev, uint8_t addr, void st_usbfs_ep_setup(usbd_device *usbd_dev, uint8_t addr,
uint8_t type, uint16_t max_size, uint8_t type, uint16_t max_size,