summaryrefslogtreecommitdiff
path: root/nuttx/arch
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-03-21 15:40:22 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-03-21 15:40:22 -0600
commitabb3552efdb71675fbd14d59abd727aa35dbf078 (patch)
tree0e9b4c5d56580ee0b255262d82f148cc76480854 /nuttx/arch
parent9b32805b424ceeeefb55caab3d1f3dad46b2edef (diff)
downloadpx4-nuttx-abb3552efdb71675fbd14d59abd727aa35dbf078.tar.gz
px4-nuttx-abb3552efdb71675fbd14d59abd727aa35dbf078.tar.bz2
px4-nuttx-abb3552efdb71675fbd14d59abd727aa35dbf078.zip
PIC23MX Starter Kit: Looks like we need to use a different linker script with Pinguino
Diffstat (limited to 'nuttx/arch')
-rw-r--r--nuttx/arch/arm/src/samv7/Make.defs2
-rw-r--r--nuttx/arch/arm/src/samv7/chip/sam_usbhs.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/samv7/Make.defs b/nuttx/arch/arm/src/samv7/Make.defs
index f24089835..c0db38517 100644
--- a/nuttx/arch/arm/src/samv7/Make.defs
+++ b/nuttx/arch/arm/src/samv7/Make.defs
@@ -149,5 +149,5 @@ CHIP_CSRCS += sam_emac.c sam_ethernet.c
endif
ifeq ($(CONFIG_SAMV7_USBDEVHS),y)
-#CHIP_CSRCS += sam_usbdevhs.c
+CHIP_CSRCS += sam_usbdevhs.c
endif
diff --git a/nuttx/arch/arm/src/samv7/chip/sam_usbhs.h b/nuttx/arch/arm/src/samv7/chip/sam_usbhs.h
index 1562bacd3..b2e429870 100644
--- a/nuttx/arch/arm/src/samv7/chip/sam_usbhs.h
+++ b/nuttx/arch/arm/src/samv7/chip/sam_usbhs.h
@@ -352,7 +352,9 @@
#define USBHS_DEVEPTINT_DATAXI (1 << 9) /* Bit 9: DataX Interrupt (2) */
#define USBHS_DEVEPTINT_ERRORTRANSI (1 << 10) /* Bit 10: Transaction Error Interrupt (2) */
-/* Device Endpoint Set, Device Endpoint Mask, Device Endpoint Disable, and Device Endpoint Enable Registers only */
+/* Device Endpoint Set, Device Endpoint Mask, Device Endpoint Disable, and Device Endpoint Enable
+ * Registers only
+ */
#define USBHS_DEVEPTINT_NBUSYBKI (1 << 12) /* Bit 12: Number of Busy Banks Interrupt */