diff options
| -rwxr-xr-x | nuttx/COPYING | 37 | ||||
| -rw-r--r-- | nuttx/ChangeLog | 5 | ||||
| -rw-r--r-- | nuttx/Documentation/NuttX.html | 6 | ||||
| -rwxr-xr-x | nuttx/arch/arm/src/lpc17xx/lpc17_usb.h | 22 | ||||
| -rwxr-xr-x | nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c | 6 |
5 files changed, 72 insertions, 4 deletions
diff --git a/nuttx/COPYING b/nuttx/COPYING index 527c82c17..e5e6238ad 100755 --- a/nuttx/COPYING +++ b/nuttx/COPYING @@ -6,6 +6,9 @@ provided only that you repect the modest copyright notices as described in license (below). Please feel free to contact me if you
have any licensing concerns.
+NuttX
+^^^^^^
+
License for NuttX in general (authorship of individual files may vary):
/*************************************************************************
*
@@ -41,12 +44,18 @@ License for NuttX in general (authorship of individual files may vary): *
*************************************************************************/
-Some networking components of NuttX derive from uIP which has a similar
-BSD style license:
+uIP
+^^^
+
+Many lower-level networking components of NuttX derive from uIP which
+has a similar BSD style license:
Copyright (c) 2001-2003, Adam Dunkels.
All rights reserved.
+IGMP
+^^^^
+
IGMP support, if enabled in uIP, adds additional logic by Steve Reynolds:
Copyright (c) 2002 CITEL Technologies Ltd.
@@ -56,11 +65,14 @@ Certain functions in the NuttX C-library derive from other BSD-compatible sources:
strtod():
+^^^^^^^^
Copyright (C) 2002 Michael Ringgaard. All rights reserved.
Copyright (C) 2006-2007 H. Peter Anvin.
dtoa():
+^^^^^^
+
If you enable floating point conversions with CONFIG_LIBC_FLOATINGPOINT,
then some files with an unmodified BSD license will be included. That
license is similar to the above (modified) BSD license, but has an
@@ -68,3 +80,24 @@ dtoa(): "This product includes software developed by the University of
California, Berkeley and its contributors."
+
+Documents/rss.gif
+^^^^^^^^^^^^^^^^^
+
+ Licensed under Creative Commons Attribution-Share Alike 2.5 Generic
+ license:
+
+ You are free:
+
+ * to share – to copy, distribute and transmit the work
+ * to remix – to adapt the work
+
+ Under the following conditions:
+
+ * attribution – You must attribute the work in the manner specified
+ by the author or licensor (but not in any way that suggests that
+ they endorse you or your use of the work).
+ * share alike – If you alter, transform, or build upon this work,
+ you may distribute the resulting work only under the same or
+ similar license to this one.
+
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index d1f1b97fb..f363cb126 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1180,3 +1180,8 @@ * arch/arm/src/common/up_internal.h, cortexm3/up_assert.c, */*_vectors.S - Correct compilations errors when CONFIG_ARCH_INTERRUPTSTACK is enabled (feature still not tested) + +5.9 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> + + * examples/nsh/nsh_telnetd.c - Fix compilation errors that happen + when both DHCPC and TELNETD are enabled in the Nuttshell. diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 04d2cd461..879237f53 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -8,7 +8,7 @@ <tr align="center" bgcolor="#e4e4e4"> <td> <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1> - <p>Last Updated: July 18, 2010</p> + <p>Last Updated: August 5, 2010</p> </td> </tr> </table> @@ -1856,6 +1856,10 @@ buildroot-1.8 2009-12-21 <spudmonkey@racsa.co.cr> <ul><pre> nuttx-5.9 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> + * examples/nsh/nsh_telnetd.c - Fix compilation errors that happen + when both DHCPC and TELNETD are enabled in the Nuttshell. + + pascal-2.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> buildroot-1.9 2010-xx-xx <spudmonkey@racsa.co.cr> diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usb.h b/nuttx/arch/arm/src/lpc17xx/lpc17_usb.h index f9d9752e5..ec2331504 100755 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_usb.h +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usb.h @@ -679,6 +679,28 @@ #define CMD_USBDEV_CLRBUFFER_PO (0x00000001)
+/* SETMODE(0xf3) command */
+
+#define CMD_SETMODE_APCLK (1 << 0) /* Bit 0: Always PLL Clock */
+#define CMD_SETMODE_INAKCI (1 << 1) /* Bit 1: Interrupt on NAK for Control IN endpoint */
+#define CMD_SETMODE_INAKCO (1 << 2) /* Bit 2: Interrupt on NAK for Control OUT endpoint */
+#define CMD_SETMODE_INAKII (1 << 3) /* Bit 3: Interrupt on NAK for Interrupt IN endpoint */
+#define CMD_SETMODE_INAKIO (1 << 4) /* Bit 4: Interrupt on NAK for Interrupt OUT endpoints */
+#define CMD_SETMODE_INAKBI (1 << 5) /* Bit 5: Interrupt on NAK for Bulk IN endpoints */
+#define CMD_SETMODE_INAKBO (1 << 6) /* Bit 6: Interrupt on NAK for Bulk OUT endpoints */
+
+/* READERRORSTATUS (0xFb) command */
+
+#define CMD_READERRORSTATUS_PIDERR (1 << 0) /* Bit 0: PID encoding/unknown or Token CRC */
+#define CMD_READERRORSTATUS_UEPKT (1 << 1) /* Bit 1: Unexpected Packet */
+#define CMD_READERRORSTATUS_DCRC (1 << 2) /* Bit 2: Data CRC error */
+#define CMD_READERRORSTATUS_TIMEOUT (1 << 3) /* Bit 3: Time out error */
+#define CMD_READERRORSTATUS_EOP (1 << 4) /* Bit 4: End of packet error */
+#define CMD_READERRORSTATUS_BOVRN (1 << 5) /* Bit 5: Buffer Overrun */
+#define CMD_READERRORSTATUS_BTSTF (1 << 6) /* Bit 6: Bit stuff error */
+#define CMD_READERRORSTATUS_TGLERR (1 << 7) /* Bit 7: Wrong toggle in data PID */
+#define CMD_READERRORSTATUS_ALLERRS (0xff)
+
/* DMA ******************************************************************************/
/* The DMA descriptor */
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c b/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c index c5389813a..7faa7bd3c 100755 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c @@ -2080,7 +2080,7 @@ static int lpc17_usbinterrupt(int irq, FAR void *context) /* And show what error occurred */ - errcode = (uint8_t)lpc17_usbcmd(CMD_USBDEV_READERRORSTATUS, 0) & 0x0f; + errcode = (uint8_t)lpc17_usbcmd(CMD_USBDEV_READERRORSTATUS, 0) & CMD_READERRORSTATUS_ALLERRS; usbtrace(TRACE_INTDECODE(LPC17_TRACEINTID_ERRINT), (uint16_t)errcode); } #endif @@ -3245,6 +3245,10 @@ void up_usbinitialize(void) lpc17_putreg(0xffffffff, LPC17_USBDEV_EPINTCLR); lpc17_putreg(0, LPC17_USBDEV_EPINTPRI); + /* Interrupt only on ACKs */ + + lpc17_usbcmd(CMD_USBDEV_SETMODE, 0); + /* Attach USB controller interrupt handler */ if (irq_attach(LPC17_IRQ_USB, lpc17_usbinterrupt) != 0) |