diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-12-31 17:25:24 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-12-31 17:25:24 +0000 |
| commit | 5751e45593cda88f1d260dbfe158b1f077268d2d (patch) | |
| tree | b001e783cb1cbd61404651e645864cb96ccaa188 /nuttx/include | |
| parent | 96d6082aedb303a830c5ec6e81be21edc43cde3e (diff) | |
| download | px4-nuttx-5751e45593cda88f1d260dbfe158b1f077268d2d.tar.gz px4-nuttx-5751e45593cda88f1d260dbfe158b1f077268d2d.tar.bz2 px4-nuttx-5751e45593cda88f1d260dbfe158b1f077268d2d.zip | |
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
Diffstat (limited to 'nuttx/include')
| -rwxr-xr-x | nuttx/include/nuttx/usb/ohci.h | 15 | ||||
| -rw-r--r-- | nuttx/include/nuttx/usb/usbhost.h | 2 |
2 files changed, 5 insertions, 12 deletions
diff --git a/nuttx/include/nuttx/usb/ohci.h b/nuttx/include/nuttx/usb/ohci.h index cb96bc2c3..f24e97811 100755 --- a/nuttx/include/nuttx/usb/ohci.h +++ b/nuttx/include/nuttx/usb/ohci.h @@ -226,26 +226,19 @@ /* HcRhStatus: Root hub status (7.4.3) */ -#define OHCI_RHSTATUS_LPS (1 << 0) /* Bit 0: Local power status */ +#define OHCI_RHSTATUS_LPS (1 << 0) /* Bit 0: Local power status (read)*/ +#define OHCI_RHSTATUS_CGP (1 << 0) /* Bit 0: Clear global power (write)*/ #define OHCI_RHSTATUS_OCI (1 << 1) /* Bit 1: Over current indicator */ /* Bits 2-14: Reserved */ #define OHCI_RHSTATUS_DRWE (1 << 15) /* Bit 15: Device remote wakeup enable */ -#define OHCI_RHSTATUS_LPSC (1 << 16) /* Bit 16: Local power status change */ +#define OHCI_RHSTATUS_LPSC (1 << 16) /* Bit 16: Local power status change (read) */ +#define OHCI_RHSTATUS_SGP (1 << 16) /* Bit 16: Set global power (write) */ #define OHCI_RHSTATUS_OCIC (1 << 17) /* Bit 17: Overcurrent indicator change */ /* Bits 18-30: Reserved */ #define OHCI_RHSTATUS_CRWE (1 << 31) /* Bit 31: Clear remote wakeup enable */ /* HcRhPortStatus: Root hub port status (7.4.4) */ -#define OHCI_RHPORTST_LPS (1 << 0) /* Bit 0: Local power status */ -#define OHCI_RHPORTST_OCI (1 << 1) /* Bit 1: Over current indicator */ - /* Bits 2-14: Reserved */ -#define OHCI_RHPORTST_DRWE (1 << 15) /* Bit 15: Device remote wakeup enable */ -#define OHCI_RHPORTST_LPSC (1 << 16) /* Bit 16: Local power status change */ -#define OHCI_RHPORTST_OCIC (1 << 17) /* Bit 17: Overcurrent indicator change */ - /* Bits 18-30: Reserved */ -#define OHCI_RHPORTST_CRWE (1 << 31) /* Bit 31: Clear remote wakeup enable */ - #define OHCI_RHPORTST_CCS (1 << 0) /* Bit 0: Current connect status */ #define OHCI_RHPORTST_PES (1 << 1) /* Bit 1: Port enable status*/ #define OHCI_RHPORTST_PSS (1 << 2) /* Bit 2: Port suspend status */ diff --git a/nuttx/include/nuttx/usb/usbhost.h b/nuttx/include/nuttx/usb/usbhost.h index b1c211cc4..18753e1b8 100644 --- a/nuttx/include/nuttx/usb/usbhost.h +++ b/nuttx/include/nuttx/usb/usbhost.h @@ -444,7 +444,7 @@ struct usbhost_class_s struct usbhost_epdesc_s; struct usbhost_driver_s { - /* Wait for a device to connect or disconnect (see CONFIG_USBHOST_HAVERHSC). */ + /* Wait for a device to connect or disconnect. */ int (*wait)(FAR struct usbhost_driver_s *drvr, bool connected); |