diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-04-06 13:00:48 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-04-06 13:00:48 -0600 |
| commit | 33e5d30f60bbee207173c641541ceec3d57d200f (patch) | |
| tree | a2bfa4e63030f8679ad779a1b8bd96ec48534759 | |
| parent | 583a7ce64b4a5099ed32dbf5b7ef0328e7944599 (diff) | |
| download | px4-nuttx-33e5d30f60bbee207173c641541ceec3d57d200f.tar.gz px4-nuttx-33e5d30f60bbee207173c641541ceec3d57d200f.tar.bz2 px4-nuttx-33e5d30f60bbee207173c641541ceec3d57d200f.zip | |
Minor changes to SAMV7 USB register definition file from review
| -rw-r--r-- | apps/modbus/tcp/mbtcp.h | 3 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/samv7/chip/sam_usbhs.h | 11 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/modbus/tcp/mbtcp.h b/apps/modbus/tcp/mbtcp.h index 421896dee..3650ca422 100644 --- a/apps/modbus/tcp/mbtcp.h +++ b/apps/modbus/tcp/mbtcp.h @@ -25,8 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * File: $Id: mbtcp.h,v 1.2 2006/12/07 22:10:34 wolti Exp $ - */ + ****************************************************************************/ #ifndef __APPS_MODBUS_TCP_MBTCP_H #define __APPS_MODBUS_TCP_MBTCP_H diff --git a/nuttx/arch/arm/src/samv7/chip/sam_usbhs.h b/nuttx/arch/arm/src/samv7/chip/sam_usbhs.h index 73edf6f7a..be18693b4 100644 --- a/nuttx/arch/arm/src/samv7/chip/sam_usbhs.h +++ b/nuttx/arch/arm/src/samv7/chip/sam_usbhs.h @@ -711,7 +711,6 @@ /* Host DMA Channel Address Register (32-bit address) */ /* Host DMA Channel Control Register */ -#define USBHS_HSTDMACTRL_ #define USBHS_HSTDMACTRL_CMD_SHIFT (0) /* Bits 0-1: Command */ #define USBHS_HSTDMACTRL_CMD_MASK (3 << USBHS_HSTDMACTRL_CMD_SHIFT) @@ -754,21 +753,23 @@ /* General Status Register */ #define USBHS_SR_RDERRI (1 << 4) /* Bit 4: Remote Device Connection Error Interrupt (host mode) */ +#defien USBHS_SR_VBUSRQ (1 << 9) /* Bit 9: VBus Request (host mode) */ #define USBHS_SR_SPEED_SHIFT (12) /* Bits 12-13: Speed Status (device mode) */ #define USBHS_SR_SPEED_MASK (3 << USBHS_SR_SPEED_SHIFT) - -#define USBHS_SR_SPEED_FULL (0 << USBHS_SR_SPEED_SHIFT) /* Full-Speed mode */ -#define USBHS_SR_SPEED_HIGH (1 << USBHS_SR_SPEED_SHIFT) /* High-Speed mode */ -#define USBHS_SR_SPEED_LOW (2 << USBHS_SR_SPEED_SHIFT) /* Low-Speed mode */ +# define USBHS_SR_SPEED_FULL (0 << USBHS_SR_SPEED_SHIFT) /* Full-Speed mode */ +# define USBHS_SR_SPEED_HIGH (1 << USBHS_SR_SPEED_SHIFT) /* High-Speed mode */ +# define USBHS_SR_SPEED_LOW (2 << USBHS_SR_SPEED_SHIFT) /* Low-Speed mode */ #define USBHS_SR_CLKUSABLE (1 << 14) /* Bit 14: UTMI Clock Usable */ /* General Status Clear Register */ #define USBHS_SCR_RDERRIC (1 << 4) /* Bit 4: Remote Device Connection Error Interrupt Clear */ +#define USBHS_SCR_VBUSRQC (1 << 9) /* Bit 9: VBus Request Clear */ /* General Status Set Register */ #define USBHS_SFR_RDERRIS (1 << 4) /* Bit 4: Remote Device Connection Error Interrupt Set */ +#define USBHS_SFR_VBUSRQS (1 << 9) /* Bit 9: VBus Request Set */ /************************************************************************************************************ * Public Types |