summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2009-06-10 12:27:44 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2009-06-10 12:27:44 +0000
commit978c420ca77473f1256d2226afea6d99748dcb78 (patch)
tree73bbe09bef3e0c0b4bae700f4a0fbb9b22fcad55
parentc91049651eb0bdcdc3ac7247c23a3619136adac7 (diff)
downloadpx4-nuttx-978c420ca77473f1256d2226afea6d99748dcb78.tar.gz
px4-nuttx-978c420ca77473f1256d2226afea6d99748dcb78.tar.bz2
px4-nuttx-978c420ca77473f1256d2226afea6d99748dcb78.zip
misc updates
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1869 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--nuttx/arch/arm/src/str71x/str71x_usb.h7
-rw-r--r--nuttx/configs/eagle100/README.txt7
2 files changed, 10 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/str71x/str71x_usb.h b/nuttx/arch/arm/src/str71x/str71x_usb.h
index 1a3f75d19..de32637b9 100644
--- a/nuttx/arch/arm/src/str71x/str71x_usb.h
+++ b/nuttx/arch/arm/src/str71x/str71x_usb.h
@@ -157,9 +157,14 @@
/* Endpoint register mask (no toggle fields) */
-#define USB_EPR_MASK (USB_EPR_CTRRX|USB_EPR_SETUP|USB_EPR_TFIELD|\
+#define USB_EPR_NOTOGGLE_MASK (USB_EPR_CTRRX|USB_EPR_SETUP|USB_EPR_TFIELD|\
USB_EPR_KIND|USB_EPR_CTRTX|USB_EPR_ADDRFIELD)
+/* Toggles only */
+
+#define USB_EPR_TXDTOG_MASK (USB_EPR_TXSTAT_MASK|USB_EPR_NOTOGGLE_MASK)
+#define USB_EPR_RXDTOG_MASK (USB_EPR_RXSTAT_MASK|USB_EPR_NOTOGGLE_MASK)
+
/************************************************************************************
* Public Types
************************************************************************************/
diff --git a/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt
index c0219a25a..f7af42c71 100644
--- a/nuttx/configs/eagle100/README.txt
+++ b/nuttx/configs/eagle100/README.txt
@@ -40,7 +40,7 @@ GNU Toolchain Options
NOTE: the CodeSourcery and devkitARM toolchains are Windows native toolchains.
The NuttX buildroot toolchain is a Cygwin toolchain. There are several limitations
- to using a Windows based toolchain in a Cygwin environment. The two biggestg are:
+ to using a Windows based toolchain in a Cygwin environment. The two biggest are:
1. The Windows toolchain cannot follow Cygwin paths. Path conversions are
performed automatically in the Cygwin makefiles using the 'cygpath' utility
@@ -54,11 +54,11 @@ GNU Toolchain Options
That is because you are building the copy of the file in the "fake" symbolic
directory. If you use a Windows toolchain, you should get in the habit of
making like this:
-
+
make clean_context; make CROSSDEV=arm-none-eabi-
An alias in your .bashrc file might make that less painful.
-
+
NuttX buildroot Toolchain
^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -68,6 +68,7 @@ NuttX buildroot Toolchain
If you have no Cortex-M3 toolchain, one can be downloaded from the NuttX
SourceForge download site (https://sourceforge.net/project/showfiles.php?group_id=189573).
+ This GNU toolchain builds and executes in the Cygwin environment.
1. You must have already configured Nuttx in <some-dir>/nuttx.