Correct logic that turns on USB host power
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3224 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
parent
e9c73d6e46
commit
58eeed82fe
@ -706,12 +706,6 @@ defconfig -- This is a configuration file similar to the Linux
|
||||
USB host controller driver
|
||||
CONFIG_USBHOST
|
||||
Enables USB host support
|
||||
CONFIG_USBHOST_HAVERHSC
|
||||
Define if the hardware is able to detect a root hub status change
|
||||
when a device is inserted. If CONFIG_USBHOST_HAVERHSC is not set,
|
||||
then it is assumed that the hardware cannot detect the presence
|
||||
of a USB device and that the application must periodically attempt
|
||||
to enumerate the device.
|
||||
CONFIG_USBHOST_NPREALLOC
|
||||
Number of pre-allocated class instances
|
||||
|
||||
|
@ -172,7 +172,6 @@ static int nsh_waiter(int argc, char *argv[])
|
||||
message("nsh_waiter: Running\n");
|
||||
for (;;)
|
||||
{
|
||||
#ifdef CONFIG_USBHOST_HAVERHSC
|
||||
/* Wait for the device to change state */
|
||||
|
||||
ret = DRVR_WAIT(g_drvr, connected);
|
||||
@ -189,39 +188,6 @@ static int nsh_waiter(int argc, char *argv[])
|
||||
|
||||
(void)DRVR_ENUMERATE(g_drvr);
|
||||
}
|
||||
#else
|
||||
/* Is the device connected? */
|
||||
|
||||
if (connected)
|
||||
{
|
||||
/* Yes.. wait for the disconnect event */
|
||||
|
||||
ret = DRVR_WAIT(g_drvr, false);
|
||||
DEBUGASSERT(ret == OK);
|
||||
|
||||
connected = false;
|
||||
message("nsh_waiter: Not connected\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Wait a bit */
|
||||
|
||||
sleep(2);
|
||||
|
||||
/* Try to enumerate the device */
|
||||
|
||||
uvdbg("nsh_usbhostinitialize: Enumerate device\n");
|
||||
ret = DRVR_ENUMERATE(g_drvr);
|
||||
if (ret != OK)
|
||||
{
|
||||
uvdbg("nsh_usbhostinitialize: Enumeration failed: %d\n", ret);
|
||||
}
|
||||
else
|
||||
{
|
||||
message("nsh_usbhostinitialize: Connected\n");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Keep the compiler from complaining */
|
||||
|
@ -165,7 +165,6 @@ static int nsh_waiter(int argc, char *argv[])
|
||||
message("nsh_waiter: Running\n");
|
||||
for (;;)
|
||||
{
|
||||
#ifdef CONFIG_USBHOST_HAVERHSC
|
||||
/* Wait for the device to change state */
|
||||
|
||||
ret = DRVR_WAIT(g_drvr, connected);
|
||||
@ -182,39 +181,6 @@ static int nsh_waiter(int argc, char *argv[])
|
||||
|
||||
(void)DRVR_ENUMERATE(g_drvr);
|
||||
}
|
||||
#else
|
||||
/* Is the device connected? */
|
||||
|
||||
if (connected)
|
||||
{
|
||||
/* Yes.. wait for the disconnect event */
|
||||
|
||||
ret = DRVR_WAIT(g_drvr, false);
|
||||
DEBUGASSERT(ret == OK);
|
||||
|
||||
connected = false;
|
||||
message("nsh_waiter: Not connected\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Wait a bit */
|
||||
|
||||
sleep(2);
|
||||
|
||||
/* Try to enumerate the device */
|
||||
|
||||
uvdbg("nsh_usbhostinitialize: Enumerate device\n");
|
||||
ret = DRVR_ENUMERATE(g_drvr);
|
||||
if (ret != OK)
|
||||
{
|
||||
uvdbg("nsh_usbhostinitialize: Enumeration failed: %d\n", ret);
|
||||
}
|
||||
else
|
||||
{
|
||||
message("nsh_usbhostinitialize: Connected\n");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Keep the compiler from complaining */
|
||||
|
Loading…
Reference in New Issue
Block a user