Add David Hewson's corrections to the LPC214x USB device driver; Add LPC214x configuration to test the USB composite device

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4359 7fd9a85b-ad96-42d3-883c-3090e2eb8679
2026-09-15 04:20:49 +08:00 · 2012-02-02 04:35:35 +00:00
parent a1646787df
commit bede2bcc72
23 changed files with 1575 additions and 58 deletions
@@ -139,8 +139,8 @@ examples/composite

  CONFIG_NSH_BUILTIN_APPS
    This example can be built as two NSH "built-in" commands if this option
-    is selected: 'msconn' will connect the USB mass storage device; 'msdis'
-    will disconnect the USB storage device.
+    is selected: 'conn' will connect the USB composite device; 'msdis'
+    will disconnect the USB composite device.

  Configuration options unique to this example:

@@ -970,11 +970,11 @@ examples/thttpd
    CONFIG_EXAMPLE_THTTPD_NETMASK  - Network mask

  Applications using this example will need to provide an appconfig
-  file in the configuration driver with instruction to build applications
+  file in the configuration directory with instruction to build applications
  like:

-  CONFIGURED_APPS += uiplib
-  CONFIGURED_APPS += thttpd
+    CONFIGURED_APPS += uiplib
+    CONFIGURED_APPS += thttpd

 examples/tiff
 ^^^^^^^^^^^^^
@@ -373,6 +373,9 @@ static int dumptrace(void)
 static int open_serial(void)
 {
  int errcode;
+#ifdef CONFIG_USBDEV_TRACE
+  int ret;
+#endif

  /* Open the USB serial device for writing (blocking) */

@@ -402,13 +405,15 @@ static int open_serial(void)
            }
        }

-      /* If USB tracing is enabled, then dump all collected trace data to stdout */
+      /* If USB tracing is enabled, then dump all collected trace data to
+       * stdout.
+       */

 #ifdef CONFIG_USBDEV_TRACE
      ret = dumptrace();
      if (ret < 0)
        {
-          goto errout;
+          return ret;
        }
 #endif
    }
@@ -1,34 +1,88 @@
 netutils
 ^^^^^^^^

+Contents
+--------
+
+  - uIP Applications
+  - Other Network Applications
+  - Tips for Using Telnetd
+  - Tips for Using DHCPC
+
+uIP Applications
+^^^^^^^^^^^^^^^^
+
 This directory contains most of the network applications contained
 under the uIP-1.0 apps directory.  As the uIP apps/README says,
 these applications "are not all heavily tested."  These uIP apps
 include:

-  dhcpc     - Dynamic Host Configuration Protocol (DHCP) client
-  resolv    - uIP DNS resolver
-  smtp      - Simple Mail Transfer Protocol (SMTP) client
-  webclient - HTTP web client
-  webserver - HTTP web server
+  dhcpc     - Dynamic Host Configuration Protocol (DHCP) client.  See
+              apps/include/netutils/dhcpc.h for interface information.
+  resolv    - uIP DNS resolver.  See apps/include/netutils/resolv.h
+              for interface information.
+  smtp      - Simple Mail Transfer Protocol (SMTP) client.  See
+              apps/include/netutils/smtp.h for interface information.
+  webclient - HTTP web client.  See apps/include/netutils/webclient.h
+              for interface information.
+  webserver - HTTP web server.  See apps/include/netutils/httpd.h
+              for interface information.

 You may find additional information on these apps in the uIP forum
 accessible through: http://www.sics.se/~adam/uip/index.php/Main_Page 

+Other Network Applications
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 Additional applications that were not part of uIP (but which are
 highly influenced by uIP) include:

-  dhcpd     - Dynamic Host Configuration Protocol (DHCP) server
-  tftpc     - TFTP client
+  dhcpd     - Dynamic Host Configuration Protocol (DHCP) server.  See
+              apps/include/netutils/dhcpd.h for interface information.
+  tftpc     - TFTP client.  See apps/include/netutils/tftp.h
+              for interface information.
  telnetd   - TELNET server.  This is the Telnet logic adapted from
              uIP and generalized for use as the front end to any
              shell.  The telnet daemon creates sessions that are
              "wrapped" as character devices and mapped to stdin,
              stdout, and stderr.  Now the telnet session can be
              inherited by spawned tasks.
-  ftpc      - FTP client
+  ftpc      - FTP client.  See apps/include/ftpc.h for interface
+              information.
  thttpd    - This is a port of Jef Poskanzer's THTTPD HTPPD server.
-              See http://acme.com/software/thttpd/.
+              See http://acme.com/software/thttpd/ for general THTTPD
+              information.  See apps/include/netutils/thttpd.h
+              for interface information. Applications using this thttpd
+              will need to provide an appconfig file in the configuration
+              directory with instruction to build applications like:
+
+               CONFIGURED_APPS += uiplib
+               CONFIGURED_APPS += thttpd
+
+Tips for Using Telnetd
+^^^^^^^^^^^^^^^^^^^^^^
+
+Telnetd is set up to be the front end for a shell.  The primary use of
+Telnetd in NuttX is to support the NuttShell (NSH) Telnet front end.  See
+apps/include/netutils/telnetd.h for information about how to incorporate
+Telnetd into your custom applications.
+
+To enable and link the Telnetd daemon, you need to include the following in 
+in your appconfig (apps/.config) file:
+
+  CONFIGURED_APPS += uiplib
+  CONFIGURED_APPS += netutils/telnetd
+
+Also if the Telnet console is enabled, make sure that you have the following
+set in the NuttX configuration file or else the performance will be very bad
+(because there will be only one character per TCP transfer):
+  
+  CONFIG_STDIO_BUFFER_SIZE   Some value >= 64
+  CONFIG_STDIO_LINEBUFFER=y  Since Telnetd is line oriented, line buffering
+                             is optimal.
+
+Tips for Using DHCPC
+^^^^^^^^^^^^^^^^^^^^

 If you use DHCPC/D, then some special configuration network options are
 required.  These include:
@@ -43,3 +97,4 @@ required.  These include:
  CONFIG_NET_BUFSIZE=650     The client must be prepared to receive
  (or larger)                DHCP messages of up to 576 bytes (excluding
                             Ethernet, IP, or UDP headers and FCS).
+
@@ -2431,3 +2431,7 @@
 	  was renamed readline() and moved to apps/system/readline.  The version
 	  of fgets() in lib/stdio was them simplified and stripped down so that it
 	  *only* gets a string -- as its description implies.
+	* arch/arm/src/lpc214x/lpc214x_usbdev.c:  Add corrections suggested by
+	  David Hewson many, many months ago.
+	* configs/mcu123-lpc214x/composite and configs/mcu123-lpc214x/src/up_composite.c:
+	  Add a configuration to test the USB composite device.
@@ -27,7 +27,7 @@ nuttx/
  (3)  ARM/DM320 (arch/arm/src/dm320/)
  (2)  ARM/i.MX (arch/arm/src/imx/)
  (3)  ARM/LPC17xx (arch/arm/src/lpc17xx/)
-  (7)  ARM/LPC214x (arch/arm/src/lpc214x/)
+  (6)  ARM/LPC214x (arch/arm/src/lpc214x/)
  (2)  ARM/LPC313x (arch/arm/src/lpc313x/)
  (3)  ARM/STR71x (arch/arm/src/str71x/)
  (3)  ARM/LM3S6918 (arch/arm/src/lm3s/)
@@ -1011,15 +1011,6 @@ o ARM/LPC214x (arch/arm/src/lpc214x/)
  Status:      Open
  Priority:    Uncertain

-  Title:       USB DEVICE DRIVER ISSUES?
-  Description: Possible errors in USB device driver reported "I suspect there's a few
-               issues in the lpc214x USB driver - in particular it doesn't stall both
-               in/out endpoints for unsupported setup requests and it doesn't call
-               CLASS_DISCONNCET on a USB reset - I don't have any access to that hardware
-               so can't pursue it really."
-  Status:      Open
-  Priority:    Medium
-
 o ARM/LPC313x (arch/arm/src/lpc313x/)
  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@@ -1,8 +1,8 @@
 /*******************************************************************************
 * arch/arm/src/lpc214x/lpc214x_usbdev.c
 *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2008-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -1393,6 +1393,8 @@ static inline void lpc214x_dmareset(uint32_t enable)

 static void lpc214x_usbreset(struct lpc214x_usbdev_s *priv)
 {
+  int epphy;
+
  /* Disable all endpoint interrupts */

  lpc214x_putreg(0, LPC214X_USBDEV_EPINTEN);
@@ -1410,6 +1412,28 @@ static void lpc214x_usbreset(struct lpc214x_usbdev_s *priv)

  priv->paddrset = 0;

+  /* Reset endpoints */
+
+  for (epphy = 0; epphy < LPC214X_NPHYSENDPOINTS; epphy++)
+    {
+      struct lpc214x_ep_s *privep = &priv->eplist[epphy];
+
+      lpc214x_cancelrequests(privep);
+
+      /* Reset endpoint status */
+
+      privep->stalled = false;
+    }
+
+  /* Tell the class driver that we are disconnected. The class
+   * driver should then accept any new configurations.
+   */
+
+  if (priv->driver)
+    {
+      CLASS_DISCONNECT(priv->driver, &priv->usbdev);
+    }
+
  /* Endpoints not yet configured */

  lpc214x_usbcmd(CMD_USB_DEV_CONFIG, 0);
@@ -1418,13 +1442,12 @@ static void lpc214x_usbreset(struct lpc214x_usbdev_s *priv)

  lpc214x_ep0configure(priv);

-#ifdef CONFIG_LPC214X_USBDEV_DMA
  /* Enable End_of_Transfer_Interrupt and System_Error_Interrupt USB DMA
   * interrupts
   */

+#ifdef CONFIG_LPC214X_USBDEV_DMA
  lpc214x_dmareset(CONFIG_LPC214X_USBDEV_DMAINTMASK);
-
 #endif

  /* Enable Device interrupts */
@@ -1839,7 +1862,9 @@ static inline void lpc214x_ep0setup(struct lpc214x_usbdev_s *priv)
  if (priv->stalled)
    {
      usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_EP0SETUPSTALLED), priv->ep0state);
+      ep0 = &priv->eplist[LPC214X_EP0_OUT];
      lpc214x_epstall(&ep0->ep, false);
+      ep0 = &priv->eplist[LPC214X_EP0_IN];
      lpc214x_epstall(&ep0->ep, false);
    }
 }
@@ -1903,6 +1928,7 @@ static inline void lpc214x_ep0dataoutinterrupt(struct lpc214x_usbdev_s *priv)
      usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_EP0OUTSTALLED), priv->ep0state);
      ep0 = &priv->eplist[LPC214X_EP0_OUT];
      lpc214x_epstall(&ep0->ep, false);
+      ep0 = &priv->eplist[LPC214X_EP0_IN];
      lpc214x_epstall(&ep0->ep, false);
    }
  return;
@@ -1968,8 +1994,9 @@ static inline void lpc214x_ep0dataininterrupt(struct lpc214x_usbdev_s *priv)
  if (priv->stalled)
    {
      usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_EP0INSTALLED), priv->ep0state);
-      ep0 = &priv->eplist[LPC214X_EP0_IN];
+      ep0 = &priv->eplist[LPC214X_EP0_OUT];
      lpc214x_epstall(&ep0->ep, false);
+      ep0 = &priv->eplist[LPC214X_EP0_IN];
      lpc214x_epstall(&ep0->ep, false);
    }
 }
@@ -137,10 +137,9 @@ Here are the detailed steps I use:
   changed from high to low, the LPC214x will enter ISP (In System Programming) 
   state.

-3. start lpc21isp.sh
-
-4. reset the board
+3. Start lpc21isp.sh

+4. Reset the board

 ARM/LPC214X-specific Configuration Options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -0,0 +1,160 @@
+##############################################################################
+# configs/mcu123-lpc214x/composite/Make.defs
+#
+#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+##############################################################################
+
+include ${TOPDIR}/.config
+
+# The default value for CROSSDEV can be overridden from the make command line:
+#   make                         -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-eabi-      -- Will build for the devkitARM toolchain
+#   make CROSSDEV=arm-none-eabi- -- Will build for the CodeSourcery toolchain
+#   make CROSSDEV=arm-elf-       -- Will build for the NuttX buildroot toolchain
+
+CROSSDEV		= arm-elf-
+CC			= $(CROSSDEV)gcc
+CXX			= $(CROSSDEV)g++
+CPP			= $(CROSSDEV)gcc -E
+LD			= $(CROSSDEV)ld
+AR			= $(CROSSDEV)ar rcs
+NM			= $(CROSSDEV)nm
+OBJCOPY			= $(CROSSDEV)objcopy
+OBJDUMP			= $(CROSSDEV)objdump
+
+HOSTOS			=  ${shell uname -o 2>/dev/null || echo "Other"}
+
+ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
+ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+
+ifeq ($(ARCHCCMAJOR),4)
+ifneq ($(HOSTOS),Cygwin)
+OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
+endif
+endif
+
+ifeq ($(CROSSDEV),arm-elf-)
+  MKDEP			= $(TOPDIR)/tools/mkdeps.sh
+  ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
+  ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+  ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/composite/ld.script
+  MAXOPTIMIZATION	= -Os
+else
+  WINTOOL		= y
+  DIRLINK		= $(TOPDIR)/tools/winlink.sh
+  DIRUNLINK		= $(TOPDIR)/tools/unlink.sh
+  MKDEP			= $(TOPDIR)/tools/mknulldeps.sh
+  ARCHINCLUDES		= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
+  ARCHXXINCLUDES	= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
+  ARCHSCRIPT		= -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/composite/ld.script}"
+  MAXOPTIMIZATION	= -O2
+endif
+
+ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
+  ARCHOPTIMIZATION	= -g
+else
+  ARCHOPTIMIZATION	= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+endif
+
+ifeq ($(ARCHCCMAJOR),4)
+  ARCHCPUFLAGS		= -mcpu=arm7tdmi -mfloat-abi=soft
+else
+  ARCHCPUFLAGS		= -mapcs-32 -mcpu=arm7tdmi -msoft-float
+endif
+
+ARCHCFLAGS		= -fno-builtin
+ARCHCXXFLAGS		= -fno-builtin -fno-exceptions
+ARCHPICFLAGS		= -fpic -msingle-pic-base -mpic-register=r10
+ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
+ARCHWARNINGSXX		= -Wall -Wshadow
+ARCHDEFINES		=
+
+CFLAGS			= $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPICFLAGS		= $(ARCHPICFLAGS) $(CFLAGS)
+CXXFLAGS		= $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
+			  $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CXXPICFLAGS		= $(ARCHPICFLAGS) $(CXXFLAGS)
+CPPFLAGS		= $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
+
+NXFLATLDFLAGS1		= -r -d -warn-common
+NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
+			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld \
+			  -no-check-sections
+LDNXFLATFLAGS		= -e main -s 2048
+
+OBJEXT			= .o
+LIBEXT			= .a
+EXEEXT			=
+
+ifneq ($(CROSSDEV),arm-elf-)
+  LDFLAGS		+= -nostartfiles -nodefaultlibs
+endif
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  LDFLAGS		+= -g
+endif
+
+define PREPROCESS
+	@echo "CPP: $1->$2"
+	@$(CPP) $(CPPFLAGS) $1 -o $2
+endef
+
+define COMPILE
+	@echo "CC: $1"
+	@$(CC) -c $(CFLAGS) $1 -o $2
+endef
+
+define COMPILEXX
+	@echo "CXX: $1"
+	@$(CXX) -c $(CXXFLAGS) $1 -o $2
+endef
+
+define ASSEMBLE
+	@echo "AS: $1"
+	@$(CC) -c $(AFLAGS) $1 -o $2
+endef
+
+define ARCHIVE
+	echo "AR: $2"; \
+	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
+endef
+
+define CLEAN
+	@rm -f *.o *.a
+endef
+
+HOSTCC			= gcc
+HOSTINCLUDES		= -I.
+HOSTCFLAGS		= -Wall -Wstrict-prototypes -Wshadow -g -pipe
+HOSTLDFLAGS		=
+
@@ -0,0 +1,39 @@
+############################################################################
+# configs/mcu123-lpc214x/composite/appconfig
+#
+#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+# Path to example in apps/examples containing the user_start entry point
+
+CONFIGURED_APPS += examples/composite
+
@@ -0,0 +1,119 @@
+/****************************************************************************
+ * configs/mcu123-lpc214x/composite/ld.script
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/* FLASH:
+ *   The lpc2148 has 512Kb of non-volatile memory beginning at address
+ *   0x00000000.  The OS entry point is via the reset vector at address
+ *   0x00000000 (default MEMMAP mode assumed)
+ *
+ * SRAM:
+ *   The lpc2148 has 32Kb of on-chip static RAM beginning at address
+ *   0x40000000.  The .data section will be relocated from _eronly
+ *   to _sdata at boot time.
+ */
+
+MEMORY
+{
+	flash (rx) : ORIGIN = 0x00000000, LENGTH = 500K
+	sram  (rw) : ORIGIN = 0x40000000, LENGTH = 32K - 32
+}
+
+OUTPUT_ARCH(arm)
+ENTRY(_stext)
+SECTIONS
+{
+	.text : {
+		_stext = ABSOLUTE(.);
+		*(.vectors)
+		*(.text .text.*)
+		*(.fixup)
+		*(.gnu.warning)
+		*(.rodata .rodata.*)
+		*(.gnu.linkonce.t.*)
+		*(.glue_7)
+		*(.glue_7t)
+		*(.got)
+		*(.gcc_except_table)
+		*(.gnu.linkonce.r.*)
+		_etext = ABSOLUTE(.);
+	} > flash
+
+	/* This is where the .data section is relocated for execution out
+	 * FLASH.  The .data section will be relocated from _eronly
+	 * to _sdata at boot time.
+	 */
+
+	_eronly = ABSOLUTE(.);	
+	
+	.data : {
+		_sdata = ABSOLUTE(.);
+		*(.data .data.*)
+		*(.gnu.linkonce.d.*)
+		CONSTRUCTORS
+		_edata = ABSOLUTE(.);
+	} > sram AT > flash
+
+	.ARM.extab : {
+		*(.ARM.extab*)
+	} >sram
+
+	__exidx_start = ABSOLUTE(.);
+	.ARM.exidx : {
+		*(.ARM.exidx*)
+	} >sram
+	__exidx_end = ABSOLUTE(.);
+
+	.bss : {
+		_sbss = ABSOLUTE(.);
+		*(.bss .bss.*)
+		*(.gnu.linkonce.b.*)
+		*(COMMON)
+		_ebss = ABSOLUTE(.);
+	} > sram
+
+	/* Stabs debugging sections.	*/
+	.stab 0 : { *(.stab) }
+	.stabstr 0 : { *(.stabstr) }
+	.stab.excl 0 : { *(.stab.excl) }
+	.stab.exclstr 0 : { *(.stab.exclstr) }
+	.stab.index 0 : { *(.stab.index) }
+	.stab.indexstr 0 : { *(.stab.indexstr) }
+	.comment 0 : { *(.comment) }
+	.debug_abbrev 0 : { *(.debug_abbrev) }
+	.debug_info 0 : { *(.debug_info) }
+	.debug_line 0 : { *(.debug_line) }
+	.debug_pubnames 0 : { *(.debug_pubnames) }
+	.debug_aranges 0 : { *(.debug_aranges) }
+}
@@ -0,0 +1,66 @@
+#!/bin/bash
+# configs/mcu123-lpc2148/composite/setenv.sh
+#
+#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+if [ "$_" = "$0" ] ; then
+  echo "You must source this script, not run it!" 1>&2
+  exit 1
+fi
+
+WD=`pwd`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This the Cygwin path to the location where I installed the CodeSourcery
+# toolchain under windows.  You will also have to edit this if you install
+# the CodeSourcery toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+
+# This the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# This is the Cygwin path to the configuration scripts directory
+
+export LPC214XSCRIPTS="$WD/configs/mcu123-lpc214x/scripts"
+
+# Add the path to the toolchain to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+echo "PATH : ${PATH}"
@@ -1,8 +1,8 @@
 /****************************************************************************
 * configs/mcu123-lpc214x/nsh/ld.script
 *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -89,11 +89,11 @@ SECTIONS
 		*(.ARM.extab*)
 	} >sram

+	__exidx_start = ABSOLUTE(.);
 	.ARM.exidx : {
-		__exidx_start = ABSOLUTE(.);
 		*(.ARM.exidx*)
-		__exidx_end = ABSOLUTE(.);
 	} >sram
+	__exidx_end = ABSOLUTE(.);

 	.bss : {
 		_sbss = ABSOLUTE(.);
@@ -1,8 +1,8 @@
 /****************************************************************************
 * configs/mcu123-lpc214x/ostest/ld.script
 *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -89,11 +89,11 @@ SECTIONS
 		*(.ARM.extab*)
 	} >sram

+	__exidx_start = ABSOLUTE(.);
 	.ARM.exidx : {
-		__exidx_start = ABSOLUTE(.);
 		*(.ARM.exidx*)
-		__exidx_end = ABSOLUTE(.);
 	} >sram
+	__exidx_end = ABSOLUTE(.);

 	.bss : {
 		_sbss = ABSOLUTE(.);
@@ -1,8 +1,8 @@
 ############################################################################
 # configs/mcu123-lpc214x/src/Makefile
 #
-#   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2007-2010, 2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -48,13 +48,19 @@ endif
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_spi.c up_leds.c
+
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
+
 ifeq ($(CONFIG_USBMSC),y)
 CSRCS		+= up_usbmsc.c
 endif

+ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
+CSRCS		+= up_composite.c
+endif
+
 COBJS		= $(CSRCS:.c=$(OBJEXT))

 SRCS		= $(ASRCS) $(CSRCS)
@@ -0,0 +1,155 @@
+/****************************************************************************
+ * configs/mcu123-lpc214x/src/up_composite.c
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Configure and register the LPC214x MMC/SD SPI block driver.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <debug.h>
+#include <errno.h>
+
+#include <nuttx/spi.h>
+#include <nuttx/mmcsd.h>
+#include <nuttx/usb/composite.h>
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/* Configuration ************************************************************/
+
+#ifndef CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1
+#  define CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1 0
+#endif
+
+/* PORT and SLOT number probably depend on the board configuration */
+
+#ifdef CONFIG_ARCH_BOARD_MCU123
+#  undef LPC214X_MMCSDSPIPORTNO
+#  define LPC214X_MMCSDSPIPORTNO 1
+#  undef LPC214X_MMCSDSLOTNO
+#  define LPC214X_MMCSDSLOTNO 0
+#else
+   /* Add configuration for new LPC214x boards here */
+#  error "Unrecognized LPC214x board"
+#endif
+
+/* Debug ********************************************************************/
+
+#ifdef CONFIG_CPP_HAVE_VARARGS
+#  ifdef CONFIG_DEBUG
+#    define message(...) lib_lowprintf(__VA_ARGS__)
+#    define msgflush()
+#  else
+#    define message(...) printf(__VA_ARGS__)
+#    define msgflush() fflush(stdout)
+#  endif
+#else
+#  ifdef CONFIG_DEBUG
+#    define message lib_lowprintf
+#    define msgflush()
+#  else
+#    define message printf
+#    define msgflush() fflush(stdout)
+#  endif
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: composite_archinitialize
+ *
+ * Description:
+ *   Perform architecture specific initialization
+ *
+ ****************************************************************************/
+
+int composite_archinitialize(void)
+{
+  /* If examples/composite is built as an NSH command, then SD slot should
+   * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
+   * this case, there is nothing further to be done here.
+   *
+   * NOTE: CONFIG_NSH_BUILTIN_APPS is not a fool-proof indication that NSH
+   * was built.
+   */
+
+#ifndef CONFIG_NSH_BUILTIN_APPS
+  FAR struct spi_dev_s *spi;
+  int ret;
+
+  /* Get the SPI port */
+
+  message("composite_archinitialize: Initializing SPI port %d\n",
+          LPC214X_MMCSDSPIPORTNO);
+
+  spi = up_spiinitialize(LPC214X_MMCSDSPIPORTNO);
+  if (!spi)
+    {
+      message("composite_archinitialize: Failed to initialize SPI port %d\n",
+              LPC214X_MMCSDSPIPORTNO);
+      return -ENODEV;
+    }
+
+  message("composite_archinitialize: Successfully initialized SPI port %d\n",
+          LPC214X_MMCSDSPIPORTNO);
+
+  /* Bind the SPI port to the slot */
+
+  message("composite_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
+          LPC214X_MMCSDSPIPORTNO, LPC214X_MMCSDSLOTNO);
+
+  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1, LPC214X_MMCSDSLOTNO, spi);
+  if (ret < 0)
+    {
+      message("composite_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
+              LPC214X_MMCSDSPIPORTNO, LPC214X_MMCSDSLOTNO, ret);
+      return ret;
+    }
+
+  message("composite_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n",
+          LPC214X_MMCSDSPIPORTNO, LPC214X_MMCSDSLOTNO);
+
+#endif /* CONFIG_NSH_BUILTIN_APPS */
+
+  return OK;
+}
@@ -2,8 +2,8 @@
 * config/mcu123-lpc214x/src/up_spi.c
 * arch/arm/src/board/up_spi.c
 *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2008-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -66,6 +66,7 @@
 #include <sys/types.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <errno.h>
 #include <debug.h>

 #include <arch/board/board.h>
@@ -1,8 +1,8 @@
 /****************************************************************************
 * configs/mcu123-lpc214x/usbserial/ld.script
 *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -89,11 +89,11 @@ SECTIONS
 		*(.ARM.extab*)
 	} >sram

+	__exidx_start = ABSOLUTE(.);
 	.ARM.exidx : {
-		__exidx_start = ABSOLUTE(.);
 		*(.ARM.exidx*)
-		__exidx_end = ABSOLUTE(.);
 	} >sram
+	__exidx_end = ABSOLUTE(.);

 	.bss : {
 		_sbss = ABSOLUTE(.);
@@ -1,8 +1,8 @@
 ##############################################################################
 # configs/mcu123-lpc214x/usbstorage/Make.defs
 #
-#   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -1,8 +1,8 @@
 /****************************************************************************
 * configs/mcu123-lpc214x/usbstorage/ld.script
 *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -89,11 +89,11 @@ SECTIONS
 		*(.ARM.extab*)
 	} >sram

+	__exidx_start = ABSOLUTE(.);
 	.ARM.exidx : {
-		__exidx_start = ABSOLUTE(.);
 		*(.ARM.exidx*)
-		__exidx_end = ABSOLUTE(.);
 	} >sram
+	__exidx_end = ABSOLUTE(.);

 	.bss : {
 		_sbss = ABSOLUTE(.);
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm3210e-eval/composite/Make.defs
 #
-#   Copyright (C) 2023 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -119,4 +119,4 @@ int tcsetattr(int fd, int options, FAR const struct termios *termiosp)
      return ioctl(fd, TCSETS, (unsigned long)termiosp);
    }
  return -ENOSYS;
-}
+}