deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix long standing bug of RxCount setting for buffer bound (was bug in STmicro's software)

Browse Source
This commit is contained in:
NIIBE Yutaka
2011-12-28 22:16:14 +09:00
parent 48d89973c6
commit 121df70044
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,5 +1,12 @@
2011-12-28 Niibe Yutaka <gniibe@fsij.org> 2011-12-28 Niibe Yutaka <gniibe@fsij.org>
* src/usb_prop.c (SetEPRxCount_allocated_size): New.
(gnuk_device_reset): Use SetEPRxCount_allocated_size.
* src/usb_msc.c (usb_start_receive): Don't set RxCount register
here.
* STM32_USB-FS-Device_Driver/src/usb_core.c (Standard_ClearFeature)
(Post0_Process): Don't need to set RxCount register.
* src/usb_prop.c (msc_lun_info) [PINPAD_DND_SUPPORT]: ifdef-out. * src/usb_prop.c (msc_lun_info) [PINPAD_DND_SUPPORT]: ifdef-out.
* src/usb-icc.c (EP2_OUT_Callback): Fix apdu size == 49 bug, * src/usb-icc.c (EP2_OUT_Callback): Fix apdu size == 49 bug,

3
STM32_USB-FS-Device_Driver/src/usb_core.c
View File

@@ -308,7 +308,6 @@ RESULT Standard_ClearFeature(void)
if (Related_Endpoint == ENDP0) if (Related_Endpoint == ENDP0)
{ {
/* After clear the STALL, enable the default endpoint receiver */ /* After clear the STALL, enable the default endpoint receiver */
SetEPRxCount(Related_Endpoint, Device_Property.MaxPacketSize);
_SetEPRxStatus(Related_Endpoint, EP_RX_VALID); _SetEPRxStatus(Related_Endpoint, EP_RX_VALID);
} }
else else
@@ -1019,8 +1018,6 @@ uint8_t Post0_Process(void)
USB_OTG_EP *ep; USB_OTG_EP *ep;
#endif /* STM32F10X_CL */ #endif /* STM32F10X_CL */
SetEPRxCount(ENDP0, Device_Property.MaxPacketSize);
if (pInformation->ControlState == STALLED) if (pInformation->ControlState == STALLED)
{ {
vSetEPRxStatus(EP_RX_STALL); vSetEPRxStatus(EP_RX_STALL);

4
src/usb_msc.c
View File

@@ -118,10 +118,6 @@ static void usb_start_receive (uint8_t *p, size_t n)
ep7_out.rxbuf = p; ep7_out.rxbuf = p;
ep7_out.rxsize = n; ep7_out.rxsize = n;
ep7_out.rxcnt = 0; ep7_out.rxcnt = 0;
if (n < ENDP_MAX_SIZE)
SetEPRxCount (ENDP7, n);
else
SetEPRxCount (ENDP7, ENDP_MAX_SIZE);
SetEPRxValid (ENDP7); SetEPRxValid (ENDP7);
} }

20
src/usb_prop.c
View File

@@ -41,6 +41,19 @@
#endif #endif
void
SetEPRxCount_allocated_size (uint8_t bEpNum, uint16_t wCount)
{ /* Assume wCount is even */
uint16_t value;
if (wCount < 62)
value = (wCount & 0x3e) << 9;
else
value = 0x8000 | (((wCount >> 5) - 1) << 10);
SetEPRxCount (bEpNum, value);
}
static void static void
gnuk_device_init (void) gnuk_device_init (void)
{ {
@@ -75,7 +88,7 @@ gnuk_device_reset (void)
SetEPRxAddr (ENDP0, ENDP0_RXADDR); SetEPRxAddr (ENDP0, ENDP0_RXADDR);
SetEPTxAddr (ENDP0, ENDP0_TXADDR); SetEPTxAddr (ENDP0, ENDP0_TXADDR);
Clear_Status_Out (ENDP0); Clear_Status_Out (ENDP0);
SetEPRxCount (ENDP0, GNUK_MAX_PACKET_SIZE); SetEPRxCount_allocated_size (ENDP0, GNUK_MAX_PACKET_SIZE);
SetEPRxValid (ENDP0); SetEPRxValid (ENDP0);
/* Initialize Endpoint 1 */ /* Initialize Endpoint 1 */
@@ -87,7 +100,7 @@ gnuk_device_reset (void)
/* Initialize Endpoint 2 */ /* Initialize Endpoint 2 */
SetEPType (ENDP2, EP_BULK); SetEPType (ENDP2, EP_BULK);
SetEPRxAddr (ENDP2, ENDP2_RXADDR); SetEPRxAddr (ENDP2, ENDP2_RXADDR);
SetEPRxCount (ENDP2, GNUK_MAX_PACKET_SIZE); SetEPRxCount_allocated_size (ENDP2, GNUK_MAX_PACKET_SIZE);
SetEPRxStatus (ENDP2, EP_RX_VALID); SetEPRxStatus (ENDP2, EP_RX_VALID);
SetEPTxStatus (ENDP2, EP_TX_DIS); SetEPTxStatus (ENDP2, EP_TX_DIS);
@@ -107,7 +120,7 @@ gnuk_device_reset (void)
/* Initialize Endpoint 5 */ /* Initialize Endpoint 5 */
SetEPType (ENDP5, EP_BULK); SetEPType (ENDP5, EP_BULK);
SetEPRxAddr (ENDP5, ENDP5_RXADDR); SetEPRxAddr (ENDP5, ENDP5_RXADDR);
SetEPRxCount (ENDP5, VIRTUAL_COM_PORT_DATA_SIZE); SetEPRxCount_allocated_size (ENDP5, VIRTUAL_COM_PORT_DATA_SIZE);
SetEPRxStatus (ENDP5, EP_RX_VALID); SetEPRxStatus (ENDP5, EP_RX_VALID);
SetEPTxStatus (ENDP5, EP_TX_DIS); SetEPTxStatus (ENDP5, EP_TX_DIS);
#endif #endif
@@ -122,6 +135,7 @@ gnuk_device_reset (void)
/* Initialize Endpoint 7 */ /* Initialize Endpoint 7 */
SetEPType (ENDP7, EP_BULK); SetEPType (ENDP7, EP_BULK);
SetEPRxAddr (ENDP7, ENDP7_RXADDR); SetEPRxAddr (ENDP7, ENDP7_RXADDR);
SetEPRxCount_allocated_size (ENDP7, 64);
SetEPRxStatus (ENDP7, EP_RX_STALL); SetEPRxStatus (ENDP7, EP_RX_STALL);
SetEPTxStatus (ENDP7, EP_TX_DIS); SetEPTxStatus (ENDP7, EP_TX_DIS);
#endif #endif