Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SAMV7: USBHS: make the last patch also working for non-control-endpoints

Browse Source
This commit is contained in:
Frank Benkert
2016-04-02 06:12:27 -06:00
committed by Gregory Nutt
parent 02978c797a
commit 2234d7d8e5
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/samv7/sam_usbdevhs.c
+17 -5
View File
@@ -96,6 +96,10 @@
# define CONFIG_SAMV7_USBDEVHS_NDTDS 8 # define CONFIG_SAMV7_USBDEVHS_NDTDS 8
#endif #endif
#ifndef CONFIG_USBDEV_DMA
# warning Currently CONFIG_USBDEV_DMA must be set to make all endpoints working
#endif
#if defined(CONFIG_USBDEV_DUALSPEED) && defined(CONFIG_SAMV7_USBDEVHS_LOWPOWER) #if defined(CONFIG_USBDEV_DUALSPEED) && defined(CONFIG_SAMV7_USBDEVHS_LOWPOWER)
# error CONFIG_USBDEV_DUALSPEED must not be defined with full-speed only support # error CONFIG_USBDEV_DUALSPEED must not be defined with full-speed only support
#endif #endif
@@ -1243,8 +1247,7 @@ static void sam_ep_fifocon(unsigned int epno)
* REVISIT: I don't think the USBHS_DEVEPTINT_NAKINI is necessary. * REVISIT: I don't think the USBHS_DEVEPTINT_NAKINI is necessary.
*/ */
sam_putreg((USBHS_DEVEPTINT_NAKINI | USBHS_DEVEPTINT_TXINI), sam_putreg(USBHS_DEVEPTINT_NAKINI, SAM_USBHS_DEVEPTICR(epno));
SAM_USBHS_DEVEPTICR(epno));
/* Enable the TXIN interrupt on the endpoint */ /* Enable the TXIN interrupt on the endpoint */
@@ -2724,13 +2727,22 @@ static void sam_ep_interrupt(struct sam_usbdev_s *priv, int epno)
if (privep->epstate == USBHS_EPSTATE_SENDING || if (privep->epstate == USBHS_EPSTATE_SENDING ||
privep->epstate == USBHS_EPSTATE_EP0STATUSIN) privep->epstate == USBHS_EPSTATE_EP0STATUSIN)
{ {
/* The interrupt is cleared inside the sam_req_write after /* A control endpoint clears the TXIN bit after new data is written
* new data is written to the fifo or it is cleared and disabled * to the fifo inside the function "sam_ctrlep_write"
* after all requests are processed. * (sam_req_write -> sam_req_wrsetup -> sam_ctrlep_write).
* All other Endpoints needs to clear the bit here.
*
* REVISIT: normally all other endpoints also have to reset the bit
* at a later point.
* *
* Continue/resume processing the write requests. * Continue/resume processing the write requests.
*/ */
if (eptype != USBHS_DEVEPTCFG_EPTYPE_CTRL)
{
sam_putreg(USBHS_DEVEPTINT_TXINI, SAM_USBHS_DEVEPTICR(epno));
}
privep->epstate = USBHS_EPSTATE_IDLE; privep->epstate = USBHS_EPSTATE_IDLE;
(void)sam_req_write(priv, privep); (void)sam_req_write(priv, privep);
} }