sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct some cloned typos involving EHCI

Browse Source
This commit is contained in:
Gregory Nutt 2015-04-27 14:03:24 -06:00
parent d77a19f0a2
commit 40c1484848
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/sam34/sam_udp.c
View File

@ -598,7 +598,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
* Name: sam_printreg * Name: sam_printreg
* *
* Description: * Description:
* Print the contents of a SAM34 EHCI register * Print the contents of a SAM34 UDP registers
* *
*******************************************************************************/ *******************************************************************************/
@ -614,7 +614,7 @@ static void sam_printreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
* *
* Description: * Description:
* Check if it is time to output debug information for accesses to a SAM34 * Check if it is time to output debug information for accesses to a SAM34
* EHCI register * UDP registers
* *
*******************************************************************************/ *******************************************************************************/

10
arch/arm/src/sama5/sam_ohci.c
View File

@ -1677,10 +1677,10 @@ static int sam_ctrltd(struct sam_rhport_s *rhport, uint32_t dirpid,
sam_putreg(regval, SAM_USBHOST_CMDST); sam_putreg(regval, SAM_USBHOST_CMDST);
/* Release the OHCI semaphore while we wait. Other threads need the /* Release the OHCI semaphore while we wait. Other threads need the
* opportunity to access the EHCI resources while we wait. * opportunity to access the OHCI resources while we wait.
* *
* REVISIT: Is this safe? NO. This is a bug and needs rethinking. * REVISIT: Is this safe? NO. This is a bug and needs rethinking.
* We need to lock all of the port-resources (not EHCI common) until * We need to lock all of the port-resources (not OHCI common) until
* the transfer is complete. But we can't use the common OHCI exclsem * the transfer is complete. But we can't use the common OHCI exclsem
* or we will deadlock while waiting (because the working thread that * or we will deadlock while waiting (because the working thread that
* wakes this thread up needs the exclsem). * wakes this thread up needs the exclsem).
@ -1972,7 +1972,7 @@ static void sam_ohci_bottomhalf(void *arg)
{ {
uint32_t pending = (uint32_t)arg; uint32_t pending = (uint32_t)arg;
/* We need to have exclusive access to the EHCI data structures. Waiting here /* We need to have exclusive access to the OHCI data structures. Waiting here
* is not a good thing to do on the worker thread, but there is no real option * is not a good thing to do on the worker thread, but there is no real option
* (other than to reschedule and delay). * (other than to reschedule and delay).
*/ */
@ -2979,10 +2979,10 @@ static int sam_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
} }
/* Release the OHCI semaphore while we wait. Other threads need the /* Release the OHCI semaphore while we wait. Other threads need the
* opportunity to access the EHCI resources while we wait. * opportunity to access the OHCI resources while we wait.
* *
* REVISIT: Is this safe? NO. This is a bug and needs rethinking. * REVISIT: Is this safe? NO. This is a bug and needs rethinking.
* We need to lock all of the port-resources (not EHCI common) until * We need to lock all of the port-resources (not OHCI common) until
* the transfer is complete. But we can't use the common OHCI exclsem * the transfer is complete. But we can't use the common OHCI exclsem
* or we will deadlock while waiting (because the working thread that * or we will deadlock while waiting (because the working thread that
* wakes this thread up needs the exclsem). * wakes this thread up needs the exclsem).

8
arch/arm/src/sama5/sam_udphs.c
View File

@ -664,7 +664,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
* Name: sam_printreg * Name: sam_printreg
* *
* Description: * Description:
* Print the contents of a SAMA5 EHCI register * Print the contents of a SAMA5 UDPHS register
* *
*******************************************************************************/ *******************************************************************************/
@ -680,7 +680,7 @@ static void sam_printreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
* *
* Description: * Description:
* Check if it is time to output debug information for accesses to a SAMA5 * Check if it is time to output debug information for accesses to a SAMA5
* EHCI register * UDPHS register
* *
*******************************************************************************/ *******************************************************************************/
@ -4285,7 +4285,7 @@ static void sam_sw_setup(struct sam_usbdev_s *priv)
int epno; int epno;
#ifdef CONFIG_SAMA5_UDPHS_SCATTERGATHER #ifdef CONFIG_SAMA5_UDPHS_SCATTERGATHER
#ifndef CONFIG_SAMA5_EHCI_PREALLOCATE #ifndef CONFIG_SAMA5_UDPHS_PREALLOCATE
int i; int i;
/* Allocate a pool of free DMA transfer descriptors */ /* Allocate a pool of free DMA transfer descriptors */
@ -4318,7 +4318,7 @@ static void sam_sw_setup(struct sam_usbdev_s *priv)
sam_td_free(&g_dtdpool[i]); sam_td_free(&g_dtdpool[i]);
} }
#endif /* CONFIG_SAMA5_EHCI_PREALLOCATE */ #endif /* CONFIG_SAMA5_UDPHS_PREALLOCATE */
#endif /* CONFIG_SAMA5_UDPHS_SCATTERGATHER */ #endif /* CONFIG_SAMA5_UDPHS_SCATTERGATHER */
/* Initialize the device state structure. NOTE: many fields /* Initialize the device state structure. NOTE: many fields

8
arch/arm/src/samv7/sam_usbdevhs.c
View File

@ -677,7 +677,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
* Name: sam_printreg * Name: sam_printreg
* *
* Description: * Description:
* Print the contents of a SAMV7 EHCI register * Print the contents of a SAMV7 USBHS register
* *
*******************************************************************************/ *******************************************************************************/
@ -693,7 +693,7 @@ static void sam_printreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
* *
* Description: * Description:
* Check if it is time to output debug information for accesses to a SAMV7 * Check if it is time to output debug information for accesses to a SAMV7
* EHCI register * USBHS register
* *
*******************************************************************************/ *******************************************************************************/
@ -4445,7 +4445,7 @@ static void sam_sw_setup(struct sam_usbdev_s *priv)
int epno; int epno;
#ifdef CONFIG_SAMV7_USBDEVHS_SCATTERGATHER #ifdef CONFIG_SAMV7_USBDEVHS_SCATTERGATHER
#ifndef CONFIG_SAMV7_EHCI_PREALLOCATE #ifndef CONFIG_SAMV7_USBDEVHS_PREALLOCATE
int i; int i;
/* Allocate a pool of free DMA transfer descriptors */ /* Allocate a pool of free DMA transfer descriptors */
@ -4478,7 +4478,7 @@ static void sam_sw_setup(struct sam_usbdev_s *priv)
sam_td_free(&g_dtdpool[i]); sam_td_free(&g_dtdpool[i]);
} }
#endif /* CONFIG_SAMV7_EHCI_PREALLOCATE */ #endif /* CONFIG_SAMV7_USBDEVHS_PREALLOCATE */
#endif /* CONFIG_SAMV7_USBDEVHS_SCATTERGATHER */ #endif /* CONFIG_SAMV7_USBDEVHS_SCATTERGATHER */
/* Initialize the device state structure. NOTE: many fields /* Initialize the device state structure. NOTE: many fields