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

SAMA4 EHCI: Correct some backward conditional compilation; fix some warnings

Browse Source
This commit is contained in:
Gregory Nutt 2013-08-26 17:03:52 -06:00
parent 56f2b3b963
commit f69688422f
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/src/sama5/sam_ehci.c
View File

@ -2657,7 +2657,9 @@ static int sam_wait(FAR struct usbhost_connection_s *conn,
if (g_ehci.rhport[rhpndx].connected != connected[rhpndx]) if (g_ehci.rhport[rhpndx].connected != connected[rhpndx])
{ {
/* Yes.. Return the RH port number */ /* Yes.. Return the RH port number to inform the caller which
* port has the connection change.
*/
irqrestore(flags); irqrestore(flags);
@ -2784,7 +2786,7 @@ static int sam_enumerate(FAR struct usbhost_connection_s *conn, int rhpndx)
regval |= EHCI_PORTSC_OWNER; regval |= EHCI_PORTSC_OWNER;
sam_putreg(regval, &HCOR->portsc[rhpndx]); sam_putreg(regval, &HCOR->portsc[rhpndx]);
#ifndef CONFIG_SAMA5_OHCI #ifdef CONFIG_SAMA5_OHCI
/* Give the port to the OHCI controller. Zero is the reset value for /* Give the port to the OHCI controller. Zero is the reset value for
* all ports; one makes the corresponding port available to OHCI. * all ports; one makes the corresponding port available to OHCI.
*/ */
@ -2905,7 +2907,7 @@ static int sam_enumerate(FAR struct usbhost_connection_s *conn, int rhpndx)
regval |= EHCI_PORTSC_OWNER; regval |= EHCI_PORTSC_OWNER;
sam_putreg(regval, &HCOR->portsc[rhpndx]); sam_putreg(regval, &HCOR->portsc[rhpndx]);
#ifndef CONFIG_SAMA5_OHCI #ifdef CONFIG_SAMA5_OHCI
/* Give the port to the OHCI controller. Zero is the reset value for /* Give the port to the OHCI controller. Zero is the reset value for
* all ports; one makes the corresponding port available to OHCI. * all ports; one makes the corresponding port available to OHCI.
*/ */
@ -3007,6 +3009,7 @@ static int sam_ep0configure(FAR struct usbhost_driver_s *drvr, uint8_t funcaddr,
static int sam_getdevinfo(FAR struct usbhost_driver_s *drvr, static int sam_getdevinfo(FAR struct usbhost_driver_s *drvr,
FAR struct usbhost_devinfo_s *devinfo) FAR struct usbhost_devinfo_s *devinfo)
{ {
#if 0
struct sam_rhport_s *rhport = (struct sam_rhport_s *)drvr; struct sam_rhport_s *rhport = (struct sam_rhport_s *)drvr;
struct sam_epinfo_s *epinfo; struct sam_epinfo_s *epinfo;
@ -3017,7 +3020,6 @@ static int sam_getdevinfo(FAR struct usbhost_driver_s *drvr,
* low or full speed devices are handed off to the OHCI driver. * low or full speed devices are handed off to the OHCI driver.
*/ */
#if 0
switch (epinfo->speed) switch (epinfo->speed)
{ {
case EHCI_LOW_SPEED: case EHCI_LOW_SPEED:
@ -3035,6 +3037,8 @@ static int sam_getdevinfo(FAR struct usbhost_driver_s *drvr,
} }
#else #else
DEBUGASSERT(drvr && devinfo);
devinfo->speed = DEVINFO_SPEED_HIGH; devinfo->speed = DEVINFO_SPEED_HIGH;
#endif #endif

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

@ -2085,7 +2085,9 @@ static int sam_wait(FAR struct usbhost_connection_s *conn,
if (g_ohci.rhport[rhpndx].connected != connected[rhpndx]) if (g_ohci.rhport[rhpndx].connected != connected[rhpndx])
{ {
/* Yes.. Return the RH port number ;to inform the call which */ /* Yes.. Return the RH port number to inform the caller which
* port has the connection change.
*/
irqrestore(flags); irqrestore(flags);