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

STM32 OTGFS Host: Additional trace points from Leo

Browse Source
This commit is contained in:
Gregory Nutt 2014-04-16 12:56:21 -06:00
parent 80cded4e3e
commit d62455b0b8
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/src/stm32/stm32_otgfshost.c
View File

@ -2649,6 +2649,7 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
uint32_t newhprt;
uint32_t hcfg;
usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT, 0);
/* Read the port status and control register (HPRT) */
hprt = stm32_getreg(STM32_OTGFS_HPRT);
@ -2667,6 +2668,7 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
{
/* Set up to clear the POCCHNG status in the new HPRT contents. */
usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_POCCHNG, 0);
newhprt |= OTGFS_HPRT_POCCHNG;
}
@ -2680,6 +2682,7 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
* process the new connection event.
*/
usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_PCDET, 0);
newhprt |= OTGFS_HPRT_PCDET;
stm32_gint_connected(priv);
}
@ -2690,6 +2693,7 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
{
/* Set up to clear the PENCHNG status in the new HPRT contents. */
usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_PENCHNG, 0);
newhprt |= OTGFS_HPRT_PENCHNG;
/* Was the port enabled? */
@ -2712,12 +2716,15 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
{
/* Set the Host Frame Interval Register for the 6KHz speed */
usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_LSDEV, 0);
stm32_putreg(STM32_OTGFS_HFIR, 6000);
/* Are we switching from FS to LS? */
if ((hcfg & OTGFS_HCFG_FSLSPCS_MASK) != OTGFS_HCFG_FSLSPCS_LS6MHz)
{
usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_FSLSSW, 0);
/* Yes... configure for LS */
hcfg &= ~OTGFS_HCFG_FSLSPCS_MASK;
@ -2731,12 +2738,16 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
}
else /* if ((hprt & OTGFS_HPRT_PSPD_MASK) == OTGFS_HPRT_PSPD_FS) */
{
usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_FSDEV, 0);
stm32_putreg(STM32_OTGFS_HFIR, 48000);
/* Are we switching from LS to FS? */
if ((hcfg & OTGFS_HCFG_FSLSPCS_MASK) != OTGFS_HCFG_FSLSPCS_FS48MHz)
{
usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_LSFSSW, 0);
/* Yes... configure for FS */
hcfg &= ~OTGFS_HCFG_FSLSPCS_MASK;
@ -2846,7 +2857,6 @@ static int stm32_gint_isr(int irq, FAR void *context)
/* Otherwise, process each pending, unmasked GINT interrupts */
usbhost_vtrace1(OTGFS_VTRACE1_GINT, 0);
/* Handle the start of frame interrupt */
@ -2894,7 +2904,6 @@ static int stm32_gint_isr(int irq, FAR void *context)
if ((pending & OTGFS_GINT_HPRT) != 0)
{
usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT, 0);
stm32_gint_hprtisr(priv);
}
@ -2910,7 +2919,7 @@ static int stm32_gint_isr(int irq, FAR void *context)
if ((pending & OTGFS_GINT_IPXFR) != 0)
{
usbhost_vtrace1(OTGFS_VTRACE1_GINT_IISOOXFR, 0);
usbhost_vtrace1(OTGFS_VTRACE1_GINT_IPXFR, 0);
stm32_gint_ipxfrisr(priv);
}
}

8
arch/arm/src/stm32/stm32_usbhost.c
View File

@ -43,7 +43,6 @@
#include <stdbool.h>
#include <assert.h>
#include <nuttx/usb/usbhost_trace.h>
#include "stm32_usbhost.h"
@ -101,6 +100,13 @@ static const struct stm32_usbhost_trace_s g_trace1[TRACE1_NSTRINGS] =
TRENTRY(OTGFS_VTRACE1_GINT_PTXFE, TR_FMT1, "OTGFS Handle the periodic TxFIFO empty interrupt.\n"),
TRENTRY(OTGFS_VTRACE1_GINT_HC, TR_FMT1, "OTGFS Handle the host channels interrupt.\n"),
TRENTRY(OTGFS_VTRACE1_GINT_HPRT, TR_FMT1, "OTGFS Handle the host port interrupt.\n"),
TRENTRY(OTGFS_VTRACE1_GINT_HPRT_POCCHNG, TR_FMT1, "OTGFS HPRT: Port Over-Current Change.\n"),
TRENTRY(OTGFS_VTRACE1_GINT_HPRT_PCDET, TR_FMT1, "OTGFS HPRT: Port Connect Detect.\n"),
TRENTRY(OTGFS_VTRACE1_GINT_HPRT_PENCHNG, TR_FMT1, "OTGFS HPRT: Port Enable Changed.\n"),
TRENTRY(OTGFS_VTRACE1_GINT_HPRT_LSDEV, TR_FMT1, "OTGFS HPRT: Low Speed Device Connected.\n"),
TRENTRY(OTGFS_VTRACE1_GINT_HPRT_FSDEV, TR_FMT1, "OTGFS HPRT: Full Speed Device Connected.\n"),
TRENTRY(OTGFS_VTRACE1_GINT_HPRT_LSFSSW, TR_FMT1, "OTGFS HPRT: Host Switch: LS -> FS.\n"),
TRENTRY(OTGFS_VTRACE1_GINT_HPRT_FSLSSW, TR_FMT1, "OTGFS HPRT: Host Switch: FS -> LS.\n"),
TRENTRY(OTGFS_VTRACE1_GINT_DISC, TR_FMT1, "OTGFS Handle the disconnect detected interrupt.\n"),
TRENTRY(OTGFS_VTRACE1_GINT_IPXFR, TR_FMT1, "OTGFS Handle the incomplete periodic transfer.\n"),

8
arch/arm/src/stm32/stm32_usbhost.h
View File

@ -42,6 +42,7 @@
#include <nuttx/config.h>
#include <nuttx/usb/usbhost.h>
#include <nuttx/usb/usbhost_trace.h>
#include <stdint.h>
#include "chip.h"
@ -74,6 +75,13 @@ enum usbhost_trace1codes_e
OTGFS_VTRACE1_GINT_PTXFE, /* OTGFS Handle the periodic TxFIFO empty interrupt */
OTGFS_VTRACE1_GINT_HC, /* OTGFS Handle the host channels interrupt */
OTGFS_VTRACE1_GINT_HPRT, /* OTGFS Handle the host port interrupt */
OTGFS_VTRACE1_GINT_HPRT_POCCHNG, /* OTGFS HPRT: Port Over-Current Change*/
OTGFS_VTRACE1_GINT_HPRT_PCDET, /* OTGFS HPRT: Port Connect Detect */
OTGFS_VTRACE1_GINT_HPRT_PENCHNG, /* OTGFS HPRT: Port Enable Changed */
OTGFS_VTRACE1_GINT_HPRT_LSDEV, /* OTGFS HPRT: Low Speed Device Connected */
OTGFS_VTRACE1_GINT_HPRT_FSDEV, /* OTGFS HPRT: Full Speed Device Connected */
OTGFS_VTRACE1_GINT_HPRT_LSFSSW, /* OTGFS HPRT: Host Switch: LS -> FS */
OTGFS_VTRACE1_GINT_HPRT_FSLSSW, /* OTGFS HPRT: Host Switch: FS -> LS */
OTGFS_VTRACE1_GINT_DISC, /* OTGFS Handle the disconnect detected interrupt */
OTGFS_VTRACE1_GINT_IPXFR, /* OTGFS Handle the incomplete periodic transfer */